Merge branch 'misc.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[linux-2.6-microblaze.git] / net / bridge / br_multicast.c

diff --git a/net/bridge/br_multicast.c b/net/bridge/br_multicast.c
index 9231617..3523c8c 100644 (file)
--- a/net/bridge/br_multicast.c
+++ b/net/bridge/br_multicast.c
@@ -4255,7 +4255,7 @@ int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,
        bool del = false;
 
        brmctx = br_multicast_port_ctx_get_global(pmctx);
-       spin_lock(&brmctx->br->multicast_lock);
+       spin_lock_bh(&brmctx->br->multicast_lock);
        if (pmctx->multicast_router == val) {
                /* Refresh the temp router port timer */
                if (pmctx->multicast_router == MDB_RTR_TYPE_TEMP) {
@@ -4305,7 +4305,7 @@ int br_multicast_set_port_router(struct net_bridge_mcast_port *pmctx,
        }
        err = 0;
 unlock:
-       spin_unlock(&brmctx->br->multicast_lock);
+       spin_unlock_bh(&brmctx->br->multicast_lock);
 
        return err;
 }