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/lib8390.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/lib8390.c')
-rw-r--r-- | drivers/net/lib8390.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/lib8390.c b/drivers/net/lib8390.c index 770b606a9e3a..64d51d627d8d 100644 --- a/drivers/net/lib8390.c +++ b/drivers/net/lib8390.c | |||
@@ -257,7 +257,7 @@ static void __ei_tx_timeout(struct net_device *dev) | |||
257 | { | 257 | { |
258 | unsigned long e8390_base = dev->base_addr; | 258 | unsigned long e8390_base = dev->base_addr; |
259 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); | 259 | struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev); |
260 | int txsr, isr, tickssofar = jiffies - dev->trans_start; | 260 | int txsr, isr, tickssofar = jiffies - dev_trans_start(dev); |
261 | unsigned long flags; | 261 | unsigned long flags; |
262 | 262 | ||
263 | dev->stats.tx_errors++; | 263 | dev->stats.tx_errors++; |
@@ -386,7 +386,6 @@ static netdev_tx_t __ei_start_xmit(struct sk_buff *skb, | |||
386 | { | 386 | { |
387 | ei_local->txing = 1; | 387 | ei_local->txing = 1; |
388 | NS8390_trigger_send(dev, send_length, output_page); | 388 | NS8390_trigger_send(dev, send_length, output_page); |
389 | dev->trans_start = jiffies; | ||
390 | if (output_page == ei_local->tx_start_page) | 389 | if (output_page == ei_local->tx_start_page) |
391 | { | 390 | { |
392 | ei_local->tx1 = -1; | 391 | ei_local->tx1 = -1; |