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/fealnx.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/fealnx.c')
-rw-r--r-- | drivers/net/fealnx.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c index 51b738dd6547..15f4f8d3d46d 100644 --- a/drivers/net/fealnx.c +++ b/drivers/net/fealnx.c | |||
@@ -1233,7 +1233,7 @@ static void fealnx_tx_timeout(struct net_device *dev) | |||
1233 | 1233 | ||
1234 | spin_unlock_irqrestore(&np->lock, flags); | 1234 | spin_unlock_irqrestore(&np->lock, flags); |
1235 | 1235 | ||
1236 | dev->trans_start = jiffies; | 1236 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1237 | np->stats.tx_errors++; | 1237 | np->stats.tx_errors++; |
1238 | netif_wake_queue(dev); /* or .._start_.. ?? */ | 1238 | netif_wake_queue(dev); /* or .._start_.. ?? */ |
1239 | } | 1239 | } |
@@ -1374,7 +1374,6 @@ static netdev_tx_t start_tx(struct sk_buff *skb, struct net_device *dev) | |||
1374 | netif_stop_queue(dev); | 1374 | netif_stop_queue(dev); |
1375 | ++np->really_tx_count; | 1375 | ++np->really_tx_count; |
1376 | iowrite32(0, np->mem + TXPDR); | 1376 | iowrite32(0, np->mem + TXPDR); |
1377 | dev->trans_start = jiffies; | ||
1378 | 1377 | ||
1379 | spin_unlock_irqrestore(&np->lock, flags); | 1378 | spin_unlock_irqrestore(&np->lock, flags); |
1380 | return NETDEV_TX_OK; | 1379 | return NETDEV_TX_OK; |