diff options
author | Herbert Xu <herbert@gondor.apana.org.au> | 2006-06-20 20:53:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-20 20:57:28 -0400 |
commit | 58dfd9c16e88b9d790e7df8f2c5b03b7887db54c (patch) | |
tree | c2df549913133d9885a182b926c76fa34a79f78d /drivers/net | |
parent | 050335db2a777ffaa859d77beb05fffe9e8c5ae9 (diff) |
[FORCEDETH] Fix xmit_lock/netif_tx_lock after merge
There has been an update to the forcedeth driver that added a few new
uses of xmit_lock which is no longer meant to be used directly. This
patch replaces them with netif_tx_lock_bh.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/forcedeth.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c index 04a53f1dfdbd..62b38a4494b8 100644 --- a/drivers/net/forcedeth.c +++ b/drivers/net/forcedeth.c | |||
@@ -2991,13 +2991,13 @@ static int nv_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd) | |||
2991 | netif_carrier_off(dev); | 2991 | netif_carrier_off(dev); |
2992 | if (netif_running(dev)) { | 2992 | if (netif_running(dev)) { |
2993 | nv_disable_irq(dev); | 2993 | nv_disable_irq(dev); |
2994 | spin_lock_bh(&dev->xmit_lock); | 2994 | netif_tx_lock_bh(dev); |
2995 | spin_lock(&np->lock); | 2995 | spin_lock(&np->lock); |
2996 | /* stop engines */ | 2996 | /* stop engines */ |
2997 | nv_stop_rx(dev); | 2997 | nv_stop_rx(dev); |
2998 | nv_stop_tx(dev); | 2998 | nv_stop_tx(dev); |
2999 | spin_unlock(&np->lock); | 2999 | spin_unlock(&np->lock); |
3000 | spin_unlock_bh(&dev->xmit_lock); | 3000 | netif_tx_unlock_bh(dev); |
3001 | } | 3001 | } |
3002 | 3002 | ||
3003 | if (ecmd->autoneg == AUTONEG_ENABLE) { | 3003 | if (ecmd->autoneg == AUTONEG_ENABLE) { |
@@ -3131,13 +3131,13 @@ static int nv_nway_reset(struct net_device *dev) | |||
3131 | netif_carrier_off(dev); | 3131 | netif_carrier_off(dev); |
3132 | if (netif_running(dev)) { | 3132 | if (netif_running(dev)) { |
3133 | nv_disable_irq(dev); | 3133 | nv_disable_irq(dev); |
3134 | spin_lock_bh(&dev->xmit_lock); | 3134 | netif_tx_lock_bh(dev); |
3135 | spin_lock(&np->lock); | 3135 | spin_lock(&np->lock); |
3136 | /* stop engines */ | 3136 | /* stop engines */ |
3137 | nv_stop_rx(dev); | 3137 | nv_stop_rx(dev); |
3138 | nv_stop_tx(dev); | 3138 | nv_stop_tx(dev); |
3139 | spin_unlock(&np->lock); | 3139 | spin_unlock(&np->lock); |
3140 | spin_unlock_bh(&dev->xmit_lock); | 3140 | netif_tx_unlock_bh(dev); |
3141 | printk(KERN_INFO "%s: link down.\n", dev->name); | 3141 | printk(KERN_INFO "%s: link down.\n", dev->name); |
3142 | } | 3142 | } |
3143 | 3143 | ||
@@ -3244,7 +3244,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri | |||
3244 | 3244 | ||
3245 | if (netif_running(dev)) { | 3245 | if (netif_running(dev)) { |
3246 | nv_disable_irq(dev); | 3246 | nv_disable_irq(dev); |
3247 | spin_lock_bh(&dev->xmit_lock); | 3247 | netif_tx_lock_bh(dev); |
3248 | spin_lock(&np->lock); | 3248 | spin_lock(&np->lock); |
3249 | /* stop engines */ | 3249 | /* stop engines */ |
3250 | nv_stop_rx(dev); | 3250 | nv_stop_rx(dev); |
@@ -3303,7 +3303,7 @@ static int nv_set_ringparam(struct net_device *dev, struct ethtool_ringparam* ri | |||
3303 | nv_start_rx(dev); | 3303 | nv_start_rx(dev); |
3304 | nv_start_tx(dev); | 3304 | nv_start_tx(dev); |
3305 | spin_unlock(&np->lock); | 3305 | spin_unlock(&np->lock); |
3306 | spin_unlock_bh(&dev->xmit_lock); | 3306 | netif_tx_unlock_bh(dev); |
3307 | nv_enable_irq(dev); | 3307 | nv_enable_irq(dev); |
3308 | } | 3308 | } |
3309 | return 0; | 3309 | return 0; |
@@ -3339,13 +3339,13 @@ static int nv_set_pauseparam(struct net_device *dev, struct ethtool_pauseparam* | |||
3339 | netif_carrier_off(dev); | 3339 | netif_carrier_off(dev); |
3340 | if (netif_running(dev)) { | 3340 | if (netif_running(dev)) { |
3341 | nv_disable_irq(dev); | 3341 | nv_disable_irq(dev); |
3342 | spin_lock_bh(&dev->xmit_lock); | 3342 | netif_tx_lock_bh(dev); |
3343 | spin_lock(&np->lock); | 3343 | spin_lock(&np->lock); |
3344 | /* stop engines */ | 3344 | /* stop engines */ |
3345 | nv_stop_rx(dev); | 3345 | nv_stop_rx(dev); |
3346 | nv_stop_tx(dev); | 3346 | nv_stop_tx(dev); |
3347 | spin_unlock(&np->lock); | 3347 | spin_unlock(&np->lock); |
3348 | spin_unlock_bh(&dev->xmit_lock); | 3348 | netif_tx_unlock_bh(dev); |
3349 | } | 3349 | } |
3350 | 3350 | ||
3351 | np->pause_flags &= ~(NV_PAUSEFRAME_RX_REQ|NV_PAUSEFRAME_TX_REQ); | 3351 | np->pause_flags &= ~(NV_PAUSEFRAME_RX_REQ|NV_PAUSEFRAME_TX_REQ); |
@@ -3729,7 +3729,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64 | |||
3729 | if (test->flags & ETH_TEST_FL_OFFLINE) { | 3729 | if (test->flags & ETH_TEST_FL_OFFLINE) { |
3730 | if (netif_running(dev)) { | 3730 | if (netif_running(dev)) { |
3731 | netif_stop_queue(dev); | 3731 | netif_stop_queue(dev); |
3732 | spin_lock_bh(&dev->xmit_lock); | 3732 | netif_tx_lock_bh(dev); |
3733 | spin_lock_irq(&np->lock); | 3733 | spin_lock_irq(&np->lock); |
3734 | nv_disable_hw_interrupts(dev, np->irqmask); | 3734 | nv_disable_hw_interrupts(dev, np->irqmask); |
3735 | if (!(np->msi_flags & NV_MSI_X_ENABLED)) { | 3735 | if (!(np->msi_flags & NV_MSI_X_ENABLED)) { |
@@ -3745,7 +3745,7 @@ static void nv_self_test(struct net_device *dev, struct ethtool_test *test, u64 | |||
3745 | nv_drain_rx(dev); | 3745 | nv_drain_rx(dev); |
3746 | nv_drain_tx(dev); | 3746 | nv_drain_tx(dev); |
3747 | spin_unlock_irq(&np->lock); | 3747 | spin_unlock_irq(&np->lock); |
3748 | spin_unlock_bh(&dev->xmit_lock); | 3748 | netif_tx_unlock_bh(dev); |
3749 | } | 3749 | } |
3750 | 3750 | ||
3751 | if (!nv_register_test(dev)) { | 3751 | if (!nv_register_test(dev)) { |