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/wireless/zd1201.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/wireless/zd1201.c')
-rw-r--r-- | drivers/net/wireless/zd1201.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/zd1201.c b/drivers/net/wireless/zd1201.c index 1e2b684f8ed4..ece86a5d3355 100644 --- a/drivers/net/wireless/zd1201.c +++ b/drivers/net/wireless/zd1201.c | |||
@@ -827,7 +827,6 @@ static netdev_tx_t zd1201_hard_start_xmit(struct sk_buff *skb, | |||
827 | } else { | 827 | } else { |
828 | dev->stats.tx_packets++; | 828 | dev->stats.tx_packets++; |
829 | dev->stats.tx_bytes += skb->len; | 829 | dev->stats.tx_bytes += skb->len; |
830 | dev->trans_start = jiffies; | ||
831 | } | 830 | } |
832 | kfree_skb(skb); | 831 | kfree_skb(skb); |
833 | 832 | ||
@@ -845,7 +844,7 @@ static void zd1201_tx_timeout(struct net_device *dev) | |||
845 | usb_unlink_urb(zd->tx_urb); | 844 | usb_unlink_urb(zd->tx_urb); |
846 | dev->stats.tx_errors++; | 845 | dev->stats.tx_errors++; |
847 | /* Restart the timeout to quiet the watchdog: */ | 846 | /* Restart the timeout to quiet the watchdog: */ |
848 | dev->trans_start = jiffies; | 847 | dev->trans_start = jiffies; /* prevent tx timeout */ |
849 | } | 848 | } |
850 | 849 | ||
851 | static int zd1201_set_mac_address(struct net_device *dev, void *p) | 850 | static int zd1201_set_mac_address(struct net_device *dev, void *p) |