Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / net / bridge / br_input.c

diff --git a/net/bridge/br_input.c b/net/bridge/br_input.c
index b7766562d72c0aaaa7727d80e3db1cc31043406b..bfa4d8c333f7b727946e40c4c33e159d4fdbfe2f 100644 (file)
--- a/net/bridge/br_input.c
+++ b/net/bridge/br_input.c
@@ -66,6 +66,7 @@ int br_handle_frame_finish(struct sk_buff *skb)
        }
 
        if (is_multicast_ether_addr(dest)) {
+               br->statistics.multicast++;
                br_flood_forward(br, skb, !passedup);
                if (!passedup)
                        br_pass_frame_up(br, skb);
@@ -125,9 +126,6 @@ int br_handle_frame(struct net_bridge_port *p, struct sk_buff **pskb)
        struct sk_buff *skb = *pskb;
        const unsigned char *dest = eth_hdr(skb)->h_dest;
 
-       if (p->state == BR_STATE_DISABLED)
-               goto err;
-
        if (!is_valid_ether_addr(eth_hdr(skb)->h_source))
                goto err;