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/wan/pc300_drv.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/wan/pc300_drv.c')
-rw-r--r-- | drivers/net/wan/pc300_drv.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wan/pc300_drv.c b/drivers/net/wan/pc300_drv.c index 17502d80b65a..c6aa66e5b52f 100644 --- a/drivers/net/wan/pc300_drv.c +++ b/drivers/net/wan/pc300_drv.c | |||
@@ -1790,7 +1790,7 @@ static void cpc_tx_timeout(struct net_device *dev) | |||
1790 | cpc_readb(card->hw.falcbase + card->hw.cpld_reg2) & | 1790 | cpc_readb(card->hw.falcbase + card->hw.cpld_reg2) & |
1791 | ~(CPLD_REG2_FALC_LED1 << (2 * ch))); | 1791 | ~(CPLD_REG2_FALC_LED1 << (2 * ch))); |
1792 | } | 1792 | } |
1793 | dev->trans_start = jiffies; | 1793 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1794 | CPC_UNLOCK(card, flags); | 1794 | CPC_UNLOCK(card, flags); |
1795 | netif_wake_queue(dev); | 1795 | netif_wake_queue(dev); |
1796 | } | 1796 | } |
@@ -1849,7 +1849,6 @@ static int cpc_queue_xmit(struct sk_buff *skb, struct net_device *dev) | |||
1849 | if (d->trace_on) { | 1849 | if (d->trace_on) { |
1850 | cpc_trace(dev, skb, 'T'); | 1850 | cpc_trace(dev, skb, 'T'); |
1851 | } | 1851 | } |
1852 | dev->trans_start = jiffies; | ||
1853 | 1852 | ||
1854 | /* Start transmission */ | 1853 | /* Start transmission */ |
1855 | CPC_LOCK(card, flags); | 1854 | CPC_LOCK(card, flags); |