summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2011-06-23 02:39:12 +0000
committerDavid S. Miller <davem@davemloft.net>2011-06-24 17:52:51 -0700
commitbd4265fe365c0f3945dd5ff1527e52bbe2bedfa2 (patch)
tree462be6140e8ef35ae3797d31d365df08b01f9b16 /net
parentb997d79a91f7b6be952b98cf9d9585b124558f5b (diff)
downloadlinux-3.10-bd4265fe365c0f3945dd5ff1527e52bbe2bedfa2.tar.gz
linux-3.10-bd4265fe365c0f3945dd5ff1527e52bbe2bedfa2.tar.bz2
linux-3.10-bd4265fe365c0f3945dd5ff1527e52bbe2bedfa2.zip
bridge: Only flood unregistered groups to routers
The bridge currently floods packets to groups that we have never seen before to all ports. This is not required by RFC4541 and in fact it is not desirable in environment where traffic to unregistered group is always present. This patch changes the behaviour so that we only send traffic to unregistered groups to ports marked as routers. The user can always force flooding behaviour to any given port by marking it as a router. Note that this change does not apply to traffic to 224.0.0.X as traffic to those groups must always be flooded to all ports. Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/bridge/br_multicast.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 29b9812c8da..2d85ca7111d 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1379,8 +1379,11 @@ static int br_multicast_ipv4_rcv(struct net_bridge *br,
if (unlikely(ip_fast_csum((u8 *)iph, iph->ihl)))
return -EINVAL;
- if (iph->protocol != IPPROTO_IGMP)
+ if (iph->protocol != IPPROTO_IGMP) {
+ if ((iph->daddr & IGMP_LOCAL_GROUP_MASK) != IGMP_LOCAL_GROUP)
+ BR_INPUT_SKB_CB(skb)->mrouters_only = 1;
return 0;
+ }
len = ntohs(iph->tot_len);
if (skb->len < len || len < ip_hdrlen(skb))