aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/a2065.c
diff options
context:
space:
mode:
authorEric Dumazet <eric.dumazet@gmail.com>2010-05-10 08:01:31 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-10 08:01:31 -0400
commit1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (patch)
treed1955a7639e99832590df26466a34d5786a880ae /drivers/net/a2065.c
parent2b0b05ddc04b6d45e71cd36405df512075786f1e (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/a2065.c')
-rw-r--r--drivers/net/a2065.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index ce0a0b8787d8..ecaa28c6f505 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -525,7 +525,7 @@ static inline int lance_reset (struct net_device *dev)
525 load_csrs (lp); 525 load_csrs (lp);
526 526
527 lance_init_ring (dev); 527 lance_init_ring (dev);
528 dev->trans_start = jiffies; 528 dev->trans_start = jiffies; /* prevent tx timeout */
529 netif_start_queue(dev); 529 netif_start_queue(dev);
530 530
531 status = init_restart_lance (lp); 531 status = init_restart_lance (lp);
@@ -588,7 +588,6 @@ static netdev_tx_t lance_start_xmit (struct sk_buff *skb,
588 588
589 /* Kick the lance: transmit now */ 589 /* Kick the lance: transmit now */
590 ll->rdp = LE_C0_INEA | LE_C0_TDMD; 590 ll->rdp = LE_C0_INEA | LE_C0_TDMD;
591 dev->trans_start = jiffies;
592 dev_kfree_skb (skb); 591 dev_kfree_skb (skb);
593 592
594 local_irq_restore(flags); 593 local_irq_restore(flags);