aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/infiniband')
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_multicast.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 1fcc9a898d81..8950e9546f4e 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -769,7 +769,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
769 ipoib_mcast_stop_thread(dev, 0); 769 ipoib_mcast_stop_thread(dev, 0);
770 770
771 local_irq_save(flags); 771 local_irq_save(flags);
772 netif_tx_lock(dev); 772 netif_addr_lock(dev);
773 spin_lock(&priv->lock); 773 spin_lock(&priv->lock);
774 774
775 /* 775 /*
@@ -846,7 +846,7 @@ void ipoib_mcast_restart_task(struct work_struct *work)
846 } 846 }
847 847
848 spin_unlock(&priv->lock); 848 spin_unlock(&priv->lock);
849 netif_tx_unlock(dev); 849 netif_addr_unlock(dev);
850 local_irq_restore(flags); 850 local_irq_restore(flags);
851 851
852 /* We have to cancel outside of the spinlock */ 852 /* We have to cancel outside of the spinlock */