X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=net%2Fbridge%2Fbr_multicast.c;h=ef66365b7354da9f2fe2c4d87d2056d9a781f3c8;hb=a1a3b3efc45518233a4d4738a68a2edd7671efb3;hp=4c214b2b88efa01d81be93a8b8d77e57229c1fa4;hpb=60e53a6701ca55b3399275d805d223834819d9ce;p=~andy%2Flinux

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 4c214b2b88e..ef66365b735 100644
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -1998,7 +1998,7 @@ int br_multicast_set_hash_max(struct net_bridge *br, unsigned long val)
 	u32 old;
 	struct net_bridge_mdb_htable *mdb;
 
-	spin_lock(&br->multicast_lock);
+	spin_lock_bh(&br->multicast_lock);
 	if (!netif_running(br->dev))
 		goto unlock;
 
@@ -2030,7 +2030,7 @@ rollback:
 	}
 
 unlock:
-	spin_unlock(&br->multicast_lock);
+	spin_unlock_bh(&br->multicast_lock);
 
 	return err;
 }