diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-10 08:01:31 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-10 08:01:31 -0400 |
commit | 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (patch) | |
tree | d1955a7639e99832590df26466a34d5786a880ae /drivers/net/ewrk3.c | |
parent | 2b0b05ddc04b6d45e71cd36405df512075786f1e (diff) |
net: trans_start cleanups
Now that core network takes care of trans_start updates, dont do it
in drivers themselves, if possible. Drivers can avoid one cache miss
(on dev->trans_start) in their start_xmit() handler.
Exceptions are NETIF_F_LLTX drivers
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ewrk3.c')
-rw-r--r-- | drivers/net/ewrk3.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c index 11ba70f49971..99eb56be093f 100644 --- a/drivers/net/ewrk3.c +++ b/drivers/net/ewrk3.c | |||
@@ -757,7 +757,7 @@ static void ewrk3_timeout(struct net_device *dev) | |||
757 | */ | 757 | */ |
758 | ENABLE_IRQs; | 758 | ENABLE_IRQs; |
759 | 759 | ||
760 | dev->trans_start = jiffies; | 760 | dev->trans_start = jiffies; /* prevent tx timeout */ |
761 | netif_wake_queue(dev); | 761 | netif_wake_queue(dev); |
762 | } | 762 | } |
763 | } | 763 | } |
@@ -862,7 +862,6 @@ static netdev_tx_t ewrk3_queue_pkt(struct sk_buff *skb, struct net_device *dev) | |||
862 | spin_unlock_irq (&lp->hw_lock); | 862 | spin_unlock_irq (&lp->hw_lock); |
863 | 863 | ||
864 | dev->stats.tx_bytes += skb->len; | 864 | dev->stats.tx_bytes += skb->len; |
865 | dev->trans_start = jiffies; | ||
866 | dev_kfree_skb (skb); | 865 | dev_kfree_skb (skb); |
867 | 866 | ||
868 | /* Check for free resources: stop Tx queue if there are none */ | 867 | /* Check for free resources: stop Tx queue if there are none */ |