diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-10 05:01:31 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-10 05:01:31 -0700 |
| commit | 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (patch) | |
| tree | d1955a7639e99832590df26466a34d5786a880ae /drivers/net/de600.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/de600.c')
| -rw-r--r-- | drivers/net/de600.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/de600.c b/drivers/net/de600.c index 6b13f4fd2e9..23a65398d01 100644 --- a/drivers/net/de600.c +++ b/drivers/net/de600.c @@ -166,8 +166,8 @@ static int de600_start_xmit(struct sk_buff *skb, struct net_device *dev) int i; if (free_tx_pages <= 0) { /* Do timeouts, to avoid hangs. */ - tickssofar = jiffies - dev->trans_start; - if (tickssofar < 5) + tickssofar = jiffies - dev_trans_start(dev); + if (tickssofar < HZ/20) return NETDEV_TX_BUSY; /* else */ printk(KERN_WARNING "%s: transmit timed out (%d), %s?\n", dev->name, tickssofar, "network cable problem"); |