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/sunlance.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/sunlance.c')
-rw-r--r-- | drivers/net/sunlance.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c index c7748b73fa0..f88a60fa25f 100644 --- a/drivers/net/sunlance.c +++ b/drivers/net/sunlance.c | |||
@@ -1003,7 +1003,7 @@ static int lance_reset(struct net_device *dev) | |||
1003 | } | 1003 | } |
1004 | lp->init_ring(dev); | 1004 | lp->init_ring(dev); |
1005 | load_csrs(lp); | 1005 | load_csrs(lp); |
1006 | dev->trans_start = jiffies; | 1006 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1007 | status = init_restart_lance(lp); | 1007 | status = init_restart_lance(lp); |
1008 | return status; | 1008 | return status; |
1009 | } | 1009 | } |
@@ -1160,7 +1160,6 @@ static int lance_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1160 | 1160 | ||
1161 | spin_unlock_irq(&lp->lock); | 1161 | spin_unlock_irq(&lp->lock); |
1162 | 1162 | ||
1163 | dev->trans_start = jiffies; | ||
1164 | dev_kfree_skb(skb); | 1163 | dev_kfree_skb(skb); |
1165 | 1164 | ||
1166 | return NETDEV_TX_OK; | 1165 | return NETDEV_TX_OK; |