1 files changed, 4 insertions, 2 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index ec41c8f46c72..216471fa01cc 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -820,7 +820,8 @@ void ipoib_mcast_restart_task(void *dev_ptr)
 
         ipoib_mcast_stop_thread(dev, 0);
 
-        spin_lock_irqsave(&dev->xmit_lock, flags);
+        local_irq_save(flags);
+        netif_tx_lock(dev);
         spin_lock(&priv->lock);
 
         /*
@@ -895,7 +896,8 @@ void ipoib_mcast_restart_task(void *dev_ptr)
         }
 
         spin_unlock(&priv->lock);
-        spin_unlock_irqrestore(&dev->xmit_lock, flags);
+        netif_tx_unlock(dev);
+        local_irq_restore(flags);
 
         /* We have to cancel outside of the spinlock */
         list_for_each_entry_safe(mcast, tmcast, &remove_list, list) {