Prechádzať zdrojové kódy

bridge: Allow multicast snooping to be disabled before ifup

Currently you cannot disable multicast snooping while a device is
down.  There is no good reason for this restriction and this patch
removes it.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Herbert Xu 15 rokov pred
rodič
commit
3a7fda06ba
1 zmenil súbory, kde vykonal 4 pridanie a 5 odobranie
  1. 4 5
      net/bridge/br_multicast.c

+ 4 - 5
net/bridge/br_multicast.c

@@ -1728,13 +1728,9 @@ unlock:
 int br_multicast_toggle(struct net_bridge *br, unsigned long val)
 int br_multicast_toggle(struct net_bridge *br, unsigned long val)
 {
 {
 	struct net_bridge_port *port;
 	struct net_bridge_port *port;
-	int err = -ENOENT;
+	int err = 0;
 
 
 	spin_lock(&br->multicast_lock);
 	spin_lock(&br->multicast_lock);
-	if (!netif_running(br->dev))
-		goto unlock;
-
-	err = 0;
 	if (br->multicast_disabled == !val)
 	if (br->multicast_disabled == !val)
 		goto unlock;
 		goto unlock;
 
 
@@ -1742,6 +1738,9 @@ int br_multicast_toggle(struct net_bridge *br, unsigned long val)
 	if (br->multicast_disabled)
 	if (br->multicast_disabled)
 		goto unlock;
 		goto unlock;
 
 
+	if (!netif_running(br->dev))
+		goto unlock;
+
 	if (br->mdb) {
 	if (br->mdb) {
 		if (br->mdb->old) {
 		if (br->mdb->old) {
 			err = -EEXIST;
 			err = -EEXIST;