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/starfire.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/starfire.c')
-rw-r--r-- | drivers/net/starfire.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c index 8a6d27cdc0bd..e19b5a143886 100644 --- a/drivers/net/starfire.c +++ b/drivers/net/starfire.c | |||
@@ -1173,7 +1173,7 @@ static void tx_timeout(struct net_device *dev) | |||
1173 | 1173 | ||
1174 | /* Trigger an immediate transmit demand. */ | 1174 | /* Trigger an immediate transmit demand. */ |
1175 | 1175 | ||
1176 | dev->trans_start = jiffies; | 1176 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1177 | np->stats.tx_errors++; | 1177 | np->stats.tx_errors++; |
1178 | netif_wake_queue(dev); | 1178 | netif_wake_queue(dev); |
1179 | } | 1179 | } |
@@ -1312,8 +1312,6 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1312 | if ((np->cur_tx - np->dirty_tx) + 4 > TX_RING_SIZE) | 1312 | if ((np->cur_tx - np->dirty_tx) + 4 > TX_RING_SIZE) |
1313 | netif_stop_queue(dev); | 1313 | netif_stop_queue(dev); |
1314 | 1314 | ||
1315 | dev->trans_start = jiffies; | ||
1316 | |||
1317 | return NETDEV_TX_OK; | 1315 | return NETDEV_TX_OK; |
1318 | } | 1316 | } |
1319 | 1317 | ||