1 files changed, 32 insertions, 19 deletions

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 35b94f9a1ac5..420bbb9955e9 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -112,46 +112,59 @@ static int br_handle_local_finish(struct sk_buff *skb)
  */
 static inline int is_link_local(const unsigned char *dest)
 {
-        return memcmp(dest, br_group_address, 5) == 0 && (dest[5] & 0xf0) == 0;
+        const u16 *a = (const u16 *) dest;
+        static const u16 *const b = (const u16 *const ) br_group_address;
+        static const u16 m = __constant_cpu_to_be16(0xfff0);
+
+        return ((a[0] ^ b[0]) | (a[1] ^ b[1]) | ((a[2] ^ b[2]) & m)) == 0;
 }
 
 /*
  * Called via br_handle_frame_hook.
- * Return 0 if *pskb should be processed furthur
- *        1 if *pskb is handled
+ * Return NULL if skb is handled
  * note: already called with rcu_read_lock (preempt_disabled)
  */
-int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
+struct sk_buff *br_handle_frame(struct net_bridge_port *p, struct sk_buff *skb)
 {
-        struct sk_buff *skb = *pskb;
         const unsigned char *dest = eth_hdr(skb)->h_dest;
 
         if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
-                goto err;
+                goto drop;
 
         if (unlikely(is_link_local(dest))) {
-                skb->pkt_type = PACKET_HOST;
-                return NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
-                               NULL, br_handle_local_finish) != 0;
+                /* 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;
+                }
         }
 
-        if (p->state == BR_STATE_FORWARDING || p->state == BR_STATE_LEARNING) {
+        switch (p->state) {
+        case BR_STATE_FORWARDING:
+
                 if (br_should_route_hook) {
-                        if (br_should_route_hook(pskb))
-                                return 0;
-                        skb = *pskb;
+                        if (br_should_route_hook(&skb))
+                                return skb;
                         dest = eth_hdr(skb)->h_dest;
                 }
-
+                /* fall through */
+        case BR_STATE_LEARNING:
                 if (!compare_ether_addr(p->br->dev->dev_addr, dest))
                         skb->pkt_type = PACKET_HOST;
 
                 NF_HOOK(PF_BRIDGE, NF_BR_PRE_ROUTING, skb, skb->dev, NULL,
                         br_handle_frame_finish);
-                return 1;
+                break;
+        default:
+drop:
+                kfree_skb(skb);
         }
-
-err:
-        kfree_skb(skb);
-        return 1;
+        return NULL;
 }