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/sonic.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/sonic.c')
-rw-r--r-- | drivers/net/sonic.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/sonic.c b/drivers/net/sonic.c index e5d67327d707..26e25d7f5829 100644 --- a/drivers/net/sonic.c +++ b/drivers/net/sonic.c | |||
@@ -174,7 +174,7 @@ static void sonic_tx_timeout(struct net_device *dev) | |||
174 | /* Try to restart the adaptor. */ | 174 | /* Try to restart the adaptor. */ |
175 | sonic_init(dev); | 175 | sonic_init(dev); |
176 | lp->stats.tx_errors++; | 176 | lp->stats.tx_errors++; |
177 | dev->trans_start = jiffies; | 177 | dev->trans_start = jiffies; /* prevent tx timeout */ |
178 | netif_wake_queue(dev); | 178 | netif_wake_queue(dev); |
179 | } | 179 | } |
180 | 180 | ||
@@ -263,8 +263,6 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) | |||
263 | 263 | ||
264 | SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP); | 264 | SONIC_WRITE(SONIC_CMD, SONIC_CR_TXP); |
265 | 265 | ||
266 | dev->trans_start = jiffies; | ||
267 | |||
268 | return NETDEV_TX_OK; | 266 | return NETDEV_TX_OK; |
269 | } | 267 | } |
270 | 268 | ||