bridge: handle process all link-local frames

Any frame addressed to link-local addresses should be processed by local
receive path. The earlier code would process them only if STP was enabled.
Since there are other frames like LACP for bonding, we should always
process them.

Signed-off-by: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 0145e94..30b8877 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -134,14 +134,11 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
                if (skb->protocol == htons(ETH_P_PAUSE))
                        goto drop;
 
-               /* Process STP BPDU's through normal netif_receive_skb() path */
-               if (p->br->stp_enabled != BR_NO_STP) {
-                       if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
-                                   NULL, br_handle_local_finish))
-                               return NULL;
-                       else
-                               return skb;
-               }
+               if (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
+                           NULL, br_handle_local_finish))
+                       return NULL;    /* frame consumed by filter */
+               else
+                       return skb;     /* continue processing */
        }
 
        switch (p->state) {