Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 30 insertions, 18 deletions

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index 826cd5221536..f06ee39c73fd 100644
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -21,6 +21,10 @@
 /* Bridge group multicast address 802.1d (pg 51). */
 const u8 br_group_address[ETH_ALEN] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 };
 
+/* Hook for brouter */
+br_should_route_hook_t __rcu *br_should_route_hook __read_mostly;
+EXPORT_SYMBOL(br_should_route_hook);
+
 static int br_pass_frame_up(struct sk_buff *skb)
 {
         struct net_device *indev, *brdev = BR_INPUT_SKB_CB(skb)->brdev;
@@ -56,7 +60,7 @@ 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) &&
+        if (!is_broadcast_ether_addr(dest) && is_multicast_ether_addr(dest) &&
             br_multicast_rcv(br, p, skb))
                 goto drop;
 
@@ -73,10 +77,12 @@ int br_handle_frame_finish(struct sk_buff *skb)
 
         dst = NULL;
 
-        if (is_multicast_ether_addr(dest)) {
+        if (is_broadcast_ether_addr(dest))
+                skb2 = skb;
+        else 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)) ||
+                        if ((mdst && mdst->mglist) ||
                             br_multicast_is_router(br))
                                 skb2 = skb;
                         br_multicast_forward(mdst, skb, skb2);
@@ -94,9 +100,10 @@ int br_handle_frame_finish(struct sk_buff *skb)
         }
 
         if (skb) {
-                if (dst)
+                if (dst) {
+                        dst->used = jiffies;
                         br_forward(dst->dst, skb, skb2);
-                else
+                } else
                         br_flood_forward(br, skb, skb2);
         }
 
@@ -135,21 +142,22 @@ static inline int is_link_local(const unsigned char *dest)
  * Return NULL if skb is handled
  * note: already called with rcu_read_lock
  */
-struct sk_buff *br_handle_frame(struct sk_buff *skb)
+rx_handler_result_t br_handle_frame(struct sk_buff **pskb)
 {
         struct net_bridge_port *p;
+        struct sk_buff *skb = *pskb;
         const unsigned char *dest = eth_hdr(skb)->h_dest;
-        int (*rhook)(struct sk_buff *skb);
+        br_should_route_hook_t *rhook;
 
-        if (skb->pkt_type == PACKET_LOOPBACK)
-                return skb;
+        if (unlikely(skb->pkt_type == PACKET_LOOPBACK))
+                return RX_HANDLER_PASS;
 
         if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
                 goto drop;
 
         skb = skb_share_check(skb, GFP_ATOMIC);
         if (!skb)
-                return NULL;
+                return RX_HANDLER_CONSUMED;
 
         p = br_port_get_rcu(skb->dev);
 
@@ -163,19 +171,23 @@ struct sk_buff *br_handle_frame(struct sk_buff *skb)
                         goto forward;
 
                 if (NF_HOOK(NFPROTO_BRIDGE, NF_BR_LOCAL_IN, skb, skb->dev,
-                            NULL, br_handle_local_finish))
-                        return NULL;    /* frame consumed by filter */
-                else
-                        return skb;     /* continue processing */
+                            NULL, br_handle_local_finish)) {
+                        return RX_HANDLER_CONSUMED; /* consumed by filter */
+                } else {
+                        *pskb = skb;
+                        return RX_HANDLER_PASS; /* continue processing */
+                }
         }
 
 forward:
         switch (p->state) {
         case BR_STATE_FORWARDING:
                 rhook = rcu_dereference(br_should_route_hook);
-                if (rhook != NULL) {
-                        if (rhook(skb))
-                                return skb;
+                if (rhook) {
+                        if ((*rhook)(skb)) {
+                                *pskb = skb;
+                                return RX_HANDLER_PASS;
+                        }
                         dest = eth_hdr(skb)->h_dest;
                 }
                 /* fall through */
@@ -190,5 +202,5 @@ forward:
 drop:
                 kfree_skb(skb);
         }
-        return NULL;
+        return RX_HANDLER_CONSUMED;
 }