bridge: Add br_multicast_start_querier

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>

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 020e463f2225d7a5e6ec5ff5f85127b68dd295e8..ecabf210d0d2aaab15a07966b68396a4b2abf12d 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1689,9 +1689,23 @@ unlock:
        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;
+
+       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;
        struct net_bridge_mdb_htable *mdb;
 
@@ -1721,14 +1735,7 @@ rollback:
                        goto rollback;
        }
 
-       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);
-       }
+       br_multicast_start_querier(br);
 
 unlock:
        spin_unlock_bh(&br->multicast_lock);