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/atarilance.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/atarilance.c')
-rw-r--r-- | drivers/net/atarilance.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c index a8686bfec7a1..b57d7dee389a 100644 --- a/drivers/net/atarilance.c +++ b/drivers/net/atarilance.c | |||
@@ -767,8 +767,8 @@ static void lance_tx_timeout (struct net_device *dev) | |||
767 | /* lance_restart, essentially */ | 767 | /* lance_restart, essentially */ |
768 | lance_init_ring(dev); | 768 | lance_init_ring(dev); |
769 | REGA( CSR0 ) = CSR0_INEA | CSR0_INIT | CSR0_STRT; | 769 | REGA( CSR0 ) = CSR0_INEA | CSR0_INIT | CSR0_STRT; |
770 | dev->trans_start = jiffies; | 770 | dev->trans_start = jiffies; /* prevent tx timeout */ |
771 | netif_wake_queue (dev); | 771 | netif_wake_queue(dev); |
772 | } | 772 | } |
773 | 773 | ||
774 | /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ | 774 | /* XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX */ |
@@ -836,7 +836,6 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev ) | |||
836 | 836 | ||
837 | /* Trigger an immediate send poll. */ | 837 | /* Trigger an immediate send poll. */ |
838 | DREG = CSR0_INEA | CSR0_TDMD; | 838 | DREG = CSR0_INEA | CSR0_TDMD; |
839 | dev->trans_start = jiffies; | ||
840 | 839 | ||
841 | if ((MEM->tx_head[(entry+1) & TX_RING_MOD_MASK].flag & TMD1_OWN) == | 840 | if ((MEM->tx_head[(entry+1) & TX_RING_MOD_MASK].flag & TMD1_OWN) == |
842 | TMD1_OWN_HOST) | 841 | TMD1_OWN_HOST) |