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/sb1250-mac.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/sb1250-mac.c')
-rw-r--r-- | drivers/net/sb1250-mac.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index fec3c29b2ea8..1f3acc3a5dfd 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -2068,8 +2068,6 @@ static int sbmac_start_tx(struct sk_buff *skb, struct net_device *dev) | |||
2068 | return NETDEV_TX_BUSY; | 2068 | return NETDEV_TX_BUSY; |
2069 | } | 2069 | } |
2070 | 2070 | ||
2071 | dev->trans_start = jiffies; | ||
2072 | |||
2073 | spin_unlock_irqrestore(&sc->sbm_lock, flags); | 2071 | spin_unlock_irqrestore(&sc->sbm_lock, flags); |
2074 | 2072 | ||
2075 | return NETDEV_TX_OK; | 2073 | return NETDEV_TX_OK; |
@@ -2488,7 +2486,7 @@ static void sbmac_tx_timeout (struct net_device *dev) | |||
2488 | spin_lock_irqsave(&sc->sbm_lock, flags); | 2486 | spin_lock_irqsave(&sc->sbm_lock, flags); |
2489 | 2487 | ||
2490 | 2488 | ||
2491 | dev->trans_start = jiffies; | 2489 | dev->trans_start = jiffies; /* prevent tx timeout */ |
2492 | dev->stats.tx_errors++; | 2490 | dev->stats.tx_errors++; |
2493 | 2491 | ||
2494 | spin_unlock_irqrestore(&sc->sbm_lock, flags); | 2492 | spin_unlock_irqrestore(&sc->sbm_lock, flags); |