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/lib82596.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/lib82596.c')
-rw-r--r-- | drivers/net/lib82596.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c index 61c38ab4c247..de856d8abc90 100644 --- a/drivers/net/lib82596.c +++ b/drivers/net/lib82596.c | |||
@@ -963,7 +963,7 @@ static void i596_tx_timeout (struct net_device *dev) | |||
963 | lp->last_restart = dev->stats.tx_packets; | 963 | lp->last_restart = dev->stats.tx_packets; |
964 | } | 964 | } |
965 | 965 | ||
966 | dev->trans_start = jiffies; | 966 | dev->trans_start = jiffies; /* prevent tx timeout */ |
967 | netif_wake_queue (dev); | 967 | netif_wake_queue (dev); |
968 | } | 968 | } |
969 | 969 | ||
@@ -974,7 +974,6 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
974 | struct tx_cmd *tx_cmd; | 974 | struct tx_cmd *tx_cmd; |
975 | struct i596_tbd *tbd; | 975 | struct i596_tbd *tbd; |
976 | short length = skb->len; | 976 | short length = skb->len; |
977 | dev->trans_start = jiffies; | ||
978 | 977 | ||
979 | DEB(DEB_STARTTX, printk(KERN_DEBUG | 978 | DEB(DEB_STARTTX, printk(KERN_DEBUG |
980 | "%s: i596_start_xmit(%x,%p) called\n", | 979 | "%s: i596_start_xmit(%x,%p) called\n", |