Skip to content

Commit

Permalink
bridge: Allow multicast snooping to be disabled before ifup
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Herbert Xu authored and David S. Miller committed Jul 31, 2010
1 parent de140b0 commit 3a7fda0
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions net/bridge/br_multicast.c
Original file line number Diff line number Diff line change
Expand Up @@ -1728,20 +1728,19 @@ int br_multicast_set_port_router(struct net_bridge_port *p, unsigned long val)
int br_multicast_toggle(struct net_bridge *br, unsigned long val)
{
struct net_bridge_port *port;
int err = -ENOENT;
int err = 0;

spin_lock(&br->multicast_lock);
if (!netif_running(br->dev))
goto unlock;

err = 0;
if (br->multicast_disabled == !val)
goto unlock;

br->multicast_disabled = !val;
if (br->multicast_disabled)
goto unlock;

if (!netif_running(br->dev))
goto unlock;

if (br->mdb) {
if (br->mdb->old) {
err = -EEXIST;
Expand Down

0 comments on commit 3a7fda0

Please sign in to comment.