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/epic100.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/epic100.c')
-rw-r--r-- | drivers/net/epic100.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c index 8b5a203d3aa2..a48da2dc907f 100644 --- a/drivers/net/epic100.c +++ b/drivers/net/epic100.c | |||
@@ -908,7 +908,7 @@ static void epic_tx_timeout(struct net_device *dev) | |||
908 | outl(TxQueued, dev->base_addr + COMMAND); | 908 | outl(TxQueued, dev->base_addr + COMMAND); |
909 | } | 909 | } |
910 | 910 | ||
911 | dev->trans_start = jiffies; | 911 | dev->trans_start = jiffies; /* prevent tx timeout */ |
912 | ep->stats.tx_errors++; | 912 | ep->stats.tx_errors++; |
913 | if (!ep->tx_full) | 913 | if (!ep->tx_full) |
914 | netif_wake_queue(dev); | 914 | netif_wake_queue(dev); |
@@ -1006,7 +1006,6 @@ static netdev_tx_t epic_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1006 | /* Trigger an immediate transmit demand. */ | 1006 | /* Trigger an immediate transmit demand. */ |
1007 | outl(TxQueued, dev->base_addr + COMMAND); | 1007 | outl(TxQueued, dev->base_addr + COMMAND); |
1008 | 1008 | ||
1009 | dev->trans_start = jiffies; | ||
1010 | if (debug > 4) | 1009 | if (debug > 4) |
1011 | printk(KERN_DEBUG "%s: Queued Tx packet size %d to slot %d, " | 1010 | printk(KERN_DEBUG "%s: Queued Tx packet size %d to slot %d, " |
1012 | "flag %2.2x Tx status %8.8x.\n", | 1011 | "flag %2.2x Tx status %8.8x.\n", |