diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-11-23 02:00:47 +0000 |
| commit | 06615f62b17d7de6e12d2f5ec6b88cf30af08413 (patch) | |
| tree | 8766f208847d4876a6db619aebbf54d53b76eb44 /net/bridge | |
| parent | fa9bdb574f4febb751848a685d9a9017e04e1d53 (diff) | |
Merge with Linux 2.4.0-test10.
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/br.c | 4 | ||||
| -rw-r--r-- | net/bridge/br_if.c | 5 | ||||
| -rw-r--r-- | net/bridge/br_ioctl.c | 4 | ||||
| -rw-r--r-- | net/bridge/br_private_stp.h | 4 |
4 files changed, 9 insertions, 8 deletions
diff --git a/net/bridge/br.c b/net/bridge/br.c index 3c6c9b72d..cda2e570a 100644 --- a/net/bridge/br.c +++ b/net/bridge/br.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek <buytenh@gnu.org> * - * $Id: br.c,v 1.44 2000/08/04 06:08:32 davem Exp $ + * $Id: br.c,v 1.45 2000/10/22 18:26:07 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -38,7 +38,7 @@ void br_inc_use_count() MOD_INC_USE_COUNT; } -int __init br_init(void) +static int __init br_init(void) { printk(KERN_INFO "NET4: Ethernet Bridge 008 for NET4.0\n"); diff --git a/net/bridge/br_if.c b/net/bridge/br_if.c index 86355509d..295cfc973 100644 --- a/net/bridge/br_if.c +++ b/net/bridge/br_if.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek <buytenh@gnu.org> * - * $Id: br_if.c,v 1.3 2000/05/05 02:17:17 davem Exp $ + * $Id: br_if.c,v 1.4 2000/10/05 01:58:16 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -14,6 +14,7 @@ */ #include <linux/kernel.h> +#include <linux/if_arp.h> #include <linux/if_bridge.h> #include <linux/inetdevice.h> #include <linux/rtnetlink.h> @@ -222,7 +223,7 @@ int br_add_if(struct net_bridge *br, struct net_device *dev) if (dev->br_port != NULL) return -EBUSY; - if (dev->flags & IFF_LOOPBACK) + if (dev->flags & IFF_LOOPBACK || dev->type != ARPHRD_ETHER) return -EINVAL; dev_hold(dev); diff --git a/net/bridge/br_ioctl.c b/net/bridge/br_ioctl.c index dad96fb99..4d04aec66 100644 --- a/net/bridge/br_ioctl.c +++ b/net/bridge/br_ioctl.c @@ -5,7 +5,7 @@ * Authors: * Lennert Buytenhek <buytenh@gnu.org> * - * $Id: br_ioctl.c,v 1.2 2000/02/21 15:51:34 davem Exp $ + * $Id: br_ioctl.c,v 1.3 2000/10/05 01:58:16 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -138,7 +138,7 @@ static int br_ioctl_device(struct net_bridge *br, p.hold_timer_value = br_timer_get_residue(&pt->hold_timer); if (copy_to_user((void *)arg0, &p, sizeof(p))) - return -EINVAL; + return -EFAULT; return 0; } diff --git a/net/bridge/br_private_stp.h b/net/bridge/br_private_stp.h index 91faafff5..2857d5c91 100644 --- a/net/bridge/br_private_stp.h +++ b/net/bridge/br_private_stp.h @@ -4,7 +4,7 @@ * Authors: * Lennert Buytenhek <buytenh@gnu.org> * - * $Id: br_private_stp.h,v 1.1 2000/02/18 16:47:13 davem Exp $ + * $Id: br_private_stp.h,v 1.2 2000/10/30 22:03:20 davem Exp $ * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -16,7 +16,7 @@ #define _BR_PRIVATE_STP_H #define BPDU_TYPE_CONFIG 0 -#define BPDU_TYPE_TCN 1 +#define BPDU_TYPE_TCN 0x80 struct br_config_bpdu { |