diff options
| author | Herbert Xu <herbert@gondor.apana.org.au> | 2012-04-04 01:01:20 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2012-05-11 13:14:18 +0100 |
| commit | d30dd36de48371f56bedcd1ac90e96e6a9d235c8 (patch) | |
| tree | f616e3d307b758488252d906bfac78e1fab73b09 /net/bridge/br_private.h | |
| parent | a13e640b8d17e0a5ab4b388431f877e2feef7abf (diff) | |
| download | linux-stable-d30dd36de48371f56bedcd1ac90e96e6a9d235c8.tar.gz linux-stable-d30dd36de48371f56bedcd1ac90e96e6a9d235c8.tar.bz2 linux-stable-d30dd36de48371f56bedcd1ac90e96e6a9d235c8.zip | |
bridge: Do not send queries on multicast group leaves
[ Upstream commit 996304bbea3d2a094b7ba54c3bd65d3fffeac57b ]
As it stands the bridge IGMP snooping system will respond to
group leave messages with queries for remaining membership.
This is both unnecessary and undesirable. First of all any
multicast routers present should be doing this rather than us.
What's more the queries that we send may end up upsetting other
multicast snooping swithces in the system that are buggy.
In fact, we can simply remove the code that send these queries
because the existing membership expiry mechanism doesn't rely
on them anyway.
So this patch simply removes all code associated with group
queries in response to group leave messages.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index d7d6fb05411f..93264dfd1da3 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -82,9 +82,7 @@ struct net_bridge_port_group { struct hlist_node mglist; struct rcu_head rcu; struct timer_list timer; - struct timer_list query_timer; struct br_ip addr; - u32 queries_sent; }; struct net_bridge_mdb_entry @@ -94,10 +92,8 @@ struct net_bridge_mdb_entry struct net_bridge_port_group __rcu *ports; struct rcu_head rcu; struct timer_list timer; - struct timer_list query_timer; struct br_ip addr; bool mglist; - u32 queries_sent; }; struct net_bridge_mdb_htable |