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/3c505.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/3c505.c')
-rw-r--r-- | drivers/net/3c505.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c index 8d584f5fd02d..88d766ee0e1b 100644 --- a/drivers/net/3c505.c +++ b/drivers/net/3c505.c | |||
@@ -1055,7 +1055,7 @@ static void elp_timeout(struct net_device *dev) | |||
1055 | (stat & ACRF) ? "interrupt" : "command"); | 1055 | (stat & ACRF) ? "interrupt" : "command"); |
1056 | if (elp_debug >= 1) | 1056 | if (elp_debug >= 1) |
1057 | pr_debug("%s: status %#02x\n", dev->name, stat); | 1057 | pr_debug("%s: status %#02x\n", dev->name, stat); |
1058 | dev->trans_start = jiffies; | 1058 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1059 | dev->stats.tx_dropped++; | 1059 | dev->stats.tx_dropped++; |
1060 | netif_wake_queue(dev); | 1060 | netif_wake_queue(dev); |
1061 | } | 1061 | } |
@@ -1093,11 +1093,6 @@ static netdev_tx_t elp_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1093 | if (elp_debug >= 3) | 1093 | if (elp_debug >= 3) |
1094 | pr_debug("%s: packet of length %d sent\n", dev->name, (int) skb->len); | 1094 | pr_debug("%s: packet of length %d sent\n", dev->name, (int) skb->len); |
1095 | 1095 | ||
1096 | /* | ||
1097 | * start the transmit timeout | ||
1098 | */ | ||
1099 | dev->trans_start = jiffies; | ||
1100 | |||
1101 | prime_rx(dev); | 1096 | prime_rx(dev); |
1102 | spin_unlock_irqrestore(&adapter->lock, flags); | 1097 | spin_unlock_irqrestore(&adapter->lock, flags); |
1103 | netif_start_queue(dev); | 1098 | netif_start_queue(dev); |