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/seeq8005.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/seeq8005.c')
-rw-r--r-- | drivers/net/seeq8005.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c index 374832cca11f..11ab32e0060b 100644 --- a/drivers/net/seeq8005.c +++ b/drivers/net/seeq8005.c | |||
@@ -390,7 +390,7 @@ static void seeq8005_timeout(struct net_device *dev) | |||
390 | tx_done(dev) ? "IRQ conflict" : "network cable problem"); | 390 | tx_done(dev) ? "IRQ conflict" : "network cable problem"); |
391 | /* Try to restart the adaptor. */ | 391 | /* Try to restart the adaptor. */ |
392 | seeq8005_init(dev, 1); | 392 | seeq8005_init(dev, 1); |
393 | dev->trans_start = jiffies; | 393 | dev->trans_start = jiffies; /* prevent tx timeout */ |
394 | netif_wake_queue(dev); | 394 | netif_wake_queue(dev); |
395 | } | 395 | } |
396 | 396 | ||
@@ -411,7 +411,6 @@ static netdev_tx_t seeq8005_send_packet(struct sk_buff *skb, | |||
411 | netif_stop_queue(dev); | 411 | netif_stop_queue(dev); |
412 | 412 | ||
413 | hardware_send_packet(dev, buf, length); | 413 | hardware_send_packet(dev, buf, length); |
414 | dev->trans_start = jiffies; | ||
415 | dev->stats.tx_bytes += length; | 414 | dev->stats.tx_bytes += length; |
416 | dev_kfree_skb (skb); | 415 | dev_kfree_skb (skb); |
417 | /* You might need to clean up and record Tx statistics here. */ | 416 | /* You might need to clean up and record Tx statistics here. */ |