Pull mem-attribute into release branch

[linux-2.6] / net / bridge / br_input.c

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 364e0ba4415824df9b5e2141c56b96c4b530cbac..420bbb9955e93fa2480393292e7b2705d1cc7a28 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -131,9 +131,20 @@ struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
        if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
                goto drop;
 
-       if (unlikely(is_link_local(dest)))
-               return (NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
-                               NULL, br_handle_local_finish) == 0) ? skb : NULL;
+       if (unlikely(is_link_local(dest))) {
+               /* Pause frames shouldn't be passed up by driver anyway */
+               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;
+               }
+       }
 
        switch (p->state) {
        case BR_STATE_FORWARDING: