[PATCH 5/8] sky2: Remove tx locks
From: Stephen Hemminger <hidden>
Date: 2009-08-06 16:44:45
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Should no longer be necessary. Signed-off-by: Mike McCormack <redacted> Acked-by: Stephen Hemminger <redacted> --- drivers/net/sky2.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index ac303cb..dbedee4 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c@@ -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); } static inline void sky2_skb_rx(const struct sky2_port *sky2,
--
1.5.6.5
--