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/via-rhine.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/via-rhine.c')
-rw-r--r-- | drivers/net/via-rhine.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index 467bcff13cd0..4930f9dbc493 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c | |||
@@ -1209,7 +1209,7 @@ static void rhine_reset_task(struct work_struct *work) | |||
1209 | spin_unlock_bh(&rp->lock); | 1209 | spin_unlock_bh(&rp->lock); |
1210 | enable_irq(rp->pdev->irq); | 1210 | enable_irq(rp->pdev->irq); |
1211 | 1211 | ||
1212 | dev->trans_start = jiffies; | 1212 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1213 | dev->stats.tx_errors++; | 1213 | dev->stats.tx_errors++; |
1214 | netif_wake_queue(dev); | 1214 | netif_wake_queue(dev); |
1215 | } | 1215 | } |
@@ -1294,8 +1294,6 @@ static netdev_tx_t rhine_start_tx(struct sk_buff *skb, | |||
1294 | if (rp->cur_tx == rp->dirty_tx + TX_QUEUE_LEN) | 1294 | if (rp->cur_tx == rp->dirty_tx + TX_QUEUE_LEN) |
1295 | netif_stop_queue(dev); | 1295 | netif_stop_queue(dev); |
1296 | 1296 | ||
1297 | dev->trans_start = jiffies; | ||
1298 | |||
1299 | spin_unlock_irqrestore(&rp->lock, flags); | 1297 | spin_unlock_irqrestore(&rp->lock, flags); |
1300 | 1298 | ||
1301 | if (debug > 4) { | 1299 | if (debug > 4) { |