]> err.no Git - linux-2.6/commitdiff
[BRIDGE]: receive link-local on disabled ports.
authorStephen Hemminger <shemminger@osdl.org>
Mon, 10 Apr 2006 23:38:47 +0000 (16:38 -0700)
committerDavid S. Miller <davem@sunset.davemloft.net>
Wed, 12 Apr 2006 00:21:05 +0000 (17:21 -0700)
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>
net/bridge/br_input.c

index b7766562d72c0aaaa7727d80e3db1cc31043406b..b0b7f55c1edd38f2901cfc450ac638ca6589dd80 100644 (file)
@@ -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;