diff options
Diffstat (limited to 'net')
-rw-r--r-- | net/bridge/br_multicast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c index 995cbe0ac0b2..2eefe275b338 100644 --- a/net/bridge/br_multicast.c +++ b/net/bridge/br_multicast.c | |||
@@ -1770,7 +1770,7 @@ int br_multicast_toggle(struct net_bridge *br, unsigned long val) | |||
1770 | int err = 0; | 1770 | int err = 0; |
1771 | struct net_bridge_mdb_htable *mdb; | 1771 | struct net_bridge_mdb_htable *mdb; |
1772 | 1772 | ||
1773 | spin_lock(&br->multicast_lock); | 1773 | spin_lock_bh(&br->multicast_lock); |
1774 | if (br->multicast_disabled == !val) | 1774 | if (br->multicast_disabled == !val) |
1775 | goto unlock; | 1775 | goto unlock; |
1776 | 1776 | ||
@@ -1806,7 +1806,7 @@ rollback: | |||
1806 | } | 1806 | } |
1807 | 1807 | ||
1808 | unlock: | 1808 | unlock: |
1809 | spin_unlock(&br->multicast_lock); | 1809 | spin_unlock_bh(&br->multicast_lock); |
1810 | 1810 | ||
1811 | return err; | 1811 | return err; |
1812 | } | 1812 | } |