diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 11:19:50 -0400 |
| commit | eb6a12c2428d21a9f3e0f1a50e927d5fd80fc3d0 (patch) | |
| tree | 5ac6f43899648abeab1d43aad3107f664e7f13d5 /drivers/infiniband | |
| parent | c4762aba0b1f72659aae9ce37b772ca8bd8f06f4 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into cpus4096-for-linus
Conflicts:
net/sunrpc/svc.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/infiniband')
| -rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib_multicast.c | 4 |
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 */ |