@@ -1799,9 +1799,7 @@ static void sky2_tx_clean(struct net_device *dev)
{
struct sky2_port *sky2 = netdev_priv(dev);
- netif_tx_lock_bh(dev);
sky2_tx_complete(sky2, sky2->tx_prod);
- netif_tx_unlock_bh(dev);
}
static void sky2_tx_reset(struct sky2_port* sky2)
@@ -2369,11 +2367,7 @@ static inline void sky2_tx_done(struct
net_device *dev, u16 last)
{
struct sky2_port *sky2 = netdev_priv(dev);
- if (netif_running(dev)) {
- netif_tx_lock(dev);
- sky2_tx_complete(sky2, last);
- netif_tx_unlock(dev);
- }
+ sky2_tx_complete(sky2, last);
}
Should no longer be necessary. Signed-off-by: Mike McCormack <mikem@ring3k.org> --- drivers/net/sky2.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) static inline void sky2_skb_rx(const struct sky2_port *sky2,