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/depca.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/depca.c')
-rw-r--r-- | drivers/net/depca.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/depca.c b/drivers/net/depca.c index a88300a0d1e8..38d4d9eefbdd 100644 --- a/drivers/net/depca.c +++ b/drivers/net/depca.c | |||
@@ -921,7 +921,7 @@ static void depca_tx_timeout(struct net_device *dev) | |||
921 | STOP_DEPCA; | 921 | STOP_DEPCA; |
922 | depca_init_ring(dev); | 922 | depca_init_ring(dev); |
923 | LoadCSRs(dev); | 923 | LoadCSRs(dev); |
924 | dev->trans_start = jiffies; | 924 | dev->trans_start = jiffies; /* prevent tx timeout */ |
925 | netif_wake_queue(dev); | 925 | netif_wake_queue(dev); |
926 | InitRestartDepca(dev); | 926 | InitRestartDepca(dev); |
927 | } | 927 | } |
@@ -954,7 +954,6 @@ static netdev_tx_t depca_start_xmit(struct sk_buff *skb, | |||
954 | outw(CSR0, DEPCA_ADDR); | 954 | outw(CSR0, DEPCA_ADDR); |
955 | outw(INEA | TDMD, DEPCA_DATA); | 955 | outw(INEA | TDMD, DEPCA_DATA); |
956 | 956 | ||
957 | dev->trans_start = jiffies; | ||
958 | dev_kfree_skb(skb); | 957 | dev_kfree_skb(skb); |
959 | } | 958 | } |
960 | if (TX_BUFFS_AVAIL) | 959 | if (TX_BUFFS_AVAIL) |