Merge branch 'for-linus/samsung-fixes' of git://git.fluff.org/bjdooks/linux

[cascardo/linux.git] / net / bridge / br_input.c

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 5ee1a36..d74d570 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -20,9 +20,9 @@
 /* Bridge group multicast address 802.1d (pg 51). */
 const u8 br_group_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 
-static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
+static int br_pass_frame_up(struct sk_buff *skb)
 {
-       struct net_device *indev, *brdev = br->dev;
+       struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
 
        brdev->stats.rx_packets++;
        brdev->stats.rx_bytes += skb->len;
@@ -30,8 +30,8 @@ static void br_pass_frame_up(struct net_bridge *br, struct sk_buff *skb)
        indev = skb->dev;
        skb->dev = brdev;
 
-       NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
-               netif_receive_skb);
+       return NF_HOOK(PF_BRIDGE, NF_BR_LOCAL_IN, skb, indev, NULL,
+                      netif_receive_skb);
 }
 
 /* note: already called with rcu_read_lock (preempt_disabled) */
@@ -41,6 +41,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
        struct net_bridge_port *p = rcu_dereference(skb->dev->br_port);
        struct net_bridge *br;
        struct net_bridge_fdb_entry *dst;
+       struct net_bridge_mdb_entry *mdst;
        struct sk_buff *skb2;
 
        if (!p || p->state == BR_STATE_DISABLED)
@@ -50,9 +51,15 @@ int br_handle_frame_finish(struct sk_buff *skb)
        br = p->br;
        br_fdb_update(br, p, eth_hdr(skb)->h_source);
 
+       if (is_multicast_ether_addr(dest) &&
+           br_multicast_rcv(br, p, skb))
+               goto drop;
+
        if (p->state == BR_STATE_LEARNING)
                goto drop;
 
+       BR_INPUT_SKB_CB(skb)->brdev = br->dev;
+
        /* The packet skb2 goes to the local host (NULL to skip). */
        skb2 = NULL;
 
@@ -62,27 +69,35 @@ int br_handle_frame_finish(struct sk_buff *skb)
        dst = NULL;
 
        if (is_multicast_ether_addr(dest)) {
+               mdst = br_mdb_get(br, skb);
+               if (mdst || BR_INPUT_SKB_CB_MROUTERS_ONLY(skb)) {
+                       if ((mdst && !hlist_unhashed(&mdst->mglist)) ||
+                           br_multicast_is_router(br))
+                               skb2 = skb;
+                       br_multicast_forward(mdst, skb, skb2);
+                       skb = NULL;
+                       if (!skb2)
+                               goto out;
+               } else
+                       skb2 = skb;
+
                br->dev->stats.multicast++;
-               skb2 = skb;
        } else if ((dst = __br_fdb_get(br, dest)) && dst->is_local) {
                skb2 = skb;
                /* Do not forward the packet since it's local. */
                skb = NULL;
        }
 
-       if (skb2 == skb)
-               skb2 = skb_clone(skb, GFP_ATOMIC);
-
-       if (skb2)
-               br_pass_frame_up(br, skb2);
-
        if (skb) {
                if (dst)
-                       br_forward(dst->dst, skb);
+                       br_forward(dst->dst, skb, skb2);
                else
-                       br_flood_forward(br, skb);
+                       br_flood_forward(br, skb, skb2);
        }
 
+       if (skb2)
+               return br_pass_frame_up(skb2);
+
 out:
        return 0;
 drop: