diff options
| author | Amerigo Wang <amwang@redhat.com> | 2012-12-03 23:56:40 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-12-05 16:01:27 -0500 |
| commit | 50426b5925ff0d7f47c20e6886047f1bb6245901 (patch) | |
| tree | 9a30b4f743be503bcd192784c0e52178d29f3734 /net/bridge/br_multicast.c | |
| parent | a573ea56a9b014e3ab09c44ccb659ba6d538b81e (diff) | |
| download | lwn-50426b5925ff0d7f47c20e6886047f1bb6245901.tar.gz lwn-50426b5925ff0d7f47c20e6886047f1bb6245901.zip | |
bridge: implement multicast fast leave
V2: make the toggle per-port
Fast leave allows bridge to immediately stops the multicast
traffic on the port receives IGMP Leave when IGMP snooping is enabled,
no timeouts are observed.
Cc: Herbert Xu <herbert@gondor.apana.org.au>
Cc: Stephen Hemminger <shemminger@vyatta.com>
Cc: "David S. Miller" <davem@davemloft.net>
Signed-off-by: Cong Wang <amwang@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_multicast.c')
| -rw-r--r-- | net/bridge/br_multicast.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 241743417f49..2391bae4f733 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c @@ -1225,6 +1225,27 @@ static void br_multicast_leave_group(struct net_bridge *br, if (!mp) goto out; + if (port && port->multicast_fast_leave) { + struct net_bridge_port_group __rcu **pp; + + for (pp = &mp->ports; + (p = mlock_dereference(*pp, br)) != NULL; + pp = &p->next) { + if (p->port != port) + continue; + + rcu_assign_pointer(*pp, p->next); + hlist_del_init(&p->mglist); + del_timer(&p->timer); + call_rcu_bh(&p->rcu, br_multicast_free_pg); + + if (!mp->ports && !mp->mglist && + netif_running(br->dev)) + mod_timer(&mp->timer, jiffies); + } + goto out; + } + now = jiffies; time = now + br->multicast_last_member_count * br->multicast_last_member_interval; |