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/au1000_eth.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/au1000_eth.c')
-rw-r--r-- | drivers/net/au1000_eth.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/au1000_eth.c b/drivers/net/au1000_eth.c index 7abb2c84ba5d..ece6128bef14 100644 --- a/drivers/net/au1000_eth.c +++ b/drivers/net/au1000_eth.c | |||
@@ -924,7 +924,6 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev) | |||
924 | au_sync(); | 924 | au_sync(); |
925 | dev_kfree_skb(skb); | 925 | dev_kfree_skb(skb); |
926 | aup->tx_head = (aup->tx_head + 1) & (NUM_TX_DMA - 1); | 926 | aup->tx_head = (aup->tx_head + 1) & (NUM_TX_DMA - 1); |
927 | dev->trans_start = jiffies; | ||
928 | return NETDEV_TX_OK; | 927 | return NETDEV_TX_OK; |
929 | } | 928 | } |
930 | 929 | ||
@@ -937,7 +936,7 @@ static void au1000_tx_timeout(struct net_device *dev) | |||
937 | netdev_err(dev, "au1000_tx_timeout: dev=%p\n", dev); | 936 | netdev_err(dev, "au1000_tx_timeout: dev=%p\n", dev); |
938 | au1000_reset_mac(dev); | 937 | au1000_reset_mac(dev); |
939 | au1000_init(dev); | 938 | au1000_init(dev); |
940 | dev->trans_start = jiffies; | 939 | dev->trans_start = jiffies; /* prevent tx timeout */ |
941 | netif_wake_queue(dev); | 940 | netif_wake_queue(dev); |
942 | } | 941 | } |
943 | 942 | ||