summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@osdl.org>2006-04-10 16:38:47 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-04-11 17:21:05 -0700
commitb7595b4955b5178e28906838cc3e8efa62d8caee (patch)
tree533f93e34858a0da298418197e02b9ad8d4f95b6 /net
parentf6596f9d2b4f0255f6cd68c76b85fe4cec6352af (diff)
downloadlinux-3.10-b7595b4955b5178e28906838cc3e8efa62d8caee.tar.gz
linux-3.10-b7595b4955b5178e28906838cc3e8efa62d8caee.tar.bz2
linux-3.10-b7595b4955b5178e28906838cc3e8efa62d8caee.zip
[BRIDGE]: receive link-local on disabled ports.
This change allows link local packets (like 802.3ad and Spanning Tree Protocol) to be processed even when the bridge is not using the port. It fixes the chicken-egg problem for bridging a bonded device, and may also fix problems with spanning tree failover. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_input.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index b7766562d72..b0b7f55c1ed 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -125,9 +125,6 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
struct sk_buff *skb = *pskb;
const unsigned char *dest = eth_hdr(skb)->h_dest;
- if (p->state == BR_STATE_DISABLED)
- goto err;
-
if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
goto err;