aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/infiniband/ulp
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-07-15 03:15:08 -0400
committerDavid S. Miller <davem@davemloft.net>2008-07-15 03:15:08 -0400
commitb9e40857682ecfc5bcd0356a23ff409883ffb982 (patch)
treed241fd289bed6d16f36f6d26815c1e78e212c89a /drivers/infiniband/ulp
parente308a5d806c852f56590ffdd3834d0df0cbed8d7 (diff)
netdev: Do not use TX lock to protect address lists.
Now that we have a specific lock to protect the network device unicast and multicast lists, remove extraneous grabs of the TX lock in cases where the code only needs address list protection. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/infiniband/ulp')
-rw-r--r--drivers/infiniband/ulp/ipoib/ipoib_multicast.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index 261ab7150431..cd2fb955040f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -774,7 +774,6 @@ void ipoib_mcast_restart_task(struct work_struct *work)
774 ipoib_mcast_stop_thread(dev, 0); 774 ipoib_mcast_stop_thread(dev, 0);
775 775
776 local_irq_save(flags); 776 local_irq_save(flags);
777 netif_tx_lock(dev);
778 netif_addr_lock(dev); 777 netif_addr_lock(dev);
779 spin_lock(&priv->lock); 778 spin_lock(&priv->lock);
780 779
@@ -853,7 +852,6 @@ void ipoib_mcast_restart_task(struct work_struct *work)
853 852
854 spin_unlock(&priv->lock); 853 spin_unlock(&priv->lock);
855 netif_addr_unlock(dev); 854 netif_addr_unlock(dev);
856 netif_tx_unlock(dev);
857 local_irq_restore(flags); 855 local_irq_restore(flags);
858 856
859 /* We have to cancel outside of the spinlock */ 857 /* We have to cancel outside of the spinlock */