lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bridge: Add br_multicast_start_querier

Browse Source 
This patch adds the helper br_multicast_start_querier so that
the code which starts the queriers in br_multicast_toggle can
be reused elsewhere.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu
2012-04-13 02:37:42 +00:00
committed by David S. Miller
parent 95c9617472
commit 748572162a
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
net/bridge/br_multicast.c
View File

@@ -1689,9 +1689,23 @@ unlock:
return err; return err;
} }
int br_multicast_toggle(struct net_bridge *br, unsigned long val) static void br_multicast_start_querier(struct net_bridge *br)
{ {
struct net_bridge_port *port; struct net_bridge_port *port;
br_multicast_open(br);
list_for_each_entry(port, &br->port_list, list) {
if (port->state == BR_STATE_DISABLED ||
port->state == BR_STATE_BLOCKING)
continue;
__br_multicast_enable_port(port);
}
}
int br_multicast_toggle(struct net_bridge *br, unsigned long val)
{
int err = 0; int err = 0;
struct net_bridge_mdb_htable *mdb; struct net_bridge_mdb_htable *mdb;
@@ -1721,14 +1735,7 @@ rollback:
goto rollback; goto rollback;
} }
br_multicast_open(br); br_multicast_start_querier(br);
list_for_each_entry(port, &br->port_list, list) {
if (port->state == BR_STATE_DISABLED ||
port->state == BR_STATE_BLOCKING)
continue;
__br_multicast_enable_port(port);
}
unlock: unlock:
spin_unlock_bh(&br->multicast_lock); spin_unlock_bh(&br->multicast_lock);