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/appletalk | |
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/appletalk')
-rw-r--r-- | drivers/net/appletalk/cops.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 6f8d6206b5c4..14e1d952226e 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c | |||
@@ -866,7 +866,7 @@ static void cops_timeout(struct net_device *dev) | |||
866 | } | 866 | } |
867 | printk(KERN_WARNING "%s: Transmit timed out.\n", dev->name); | 867 | printk(KERN_WARNING "%s: Transmit timed out.\n", dev->name); |
868 | cops_jumpstart(dev); /* Restart the card. */ | 868 | cops_jumpstart(dev); /* Restart the card. */ |
869 | dev->trans_start = jiffies; | 869 | dev->trans_start = jiffies; /* prevent tx timeout */ |
870 | netif_wake_queue(dev); | 870 | netif_wake_queue(dev); |
871 | } | 871 | } |
872 | 872 | ||
@@ -919,9 +919,8 @@ static netdev_tx_t cops_send_packet(struct sk_buff *skb, | |||
919 | /* Done sending packet, update counters and cleanup. */ | 919 | /* Done sending packet, update counters and cleanup. */ |
920 | dev->stats.tx_packets++; | 920 | dev->stats.tx_packets++; |
921 | dev->stats.tx_bytes += skb->len; | 921 | dev->stats.tx_bytes += skb->len; |
922 | dev->trans_start = jiffies; | ||
923 | dev_kfree_skb (skb); | 922 | dev_kfree_skb (skb); |
924 | return NETDEV_TX_OK; | 923 | return NETDEV_TX_OK; |
925 | } | 924 | } |
926 | 925 | ||
927 | /* | 926 | /* |