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/wireless/wl3501_cs.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/wireless/wl3501_cs.c')
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 65dd502eab0d..1e61e6cace90 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -1307,7 +1307,7 @@ static void wl3501_tx_timeout(struct net_device *dev) | |||
1307 | printk(KERN_ERR "%s: Error %d resetting card on Tx timeout!\n", | 1307 | printk(KERN_ERR "%s: Error %d resetting card on Tx timeout!\n", |
1308 | dev->name, rc); | 1308 | dev->name, rc); |
1309 | else { | 1309 | else { |
1310 | dev->trans_start = jiffies; | 1310 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1311 | netif_wake_queue(dev); | 1311 | netif_wake_queue(dev); |
1312 | } | 1312 | } |
1313 | } | 1313 | } |
@@ -1326,7 +1326,6 @@ static netdev_tx_t wl3501_hard_start_xmit(struct sk_buff *skb, | |||
1326 | 1326 | ||
1327 | spin_lock_irqsave(&this->lock, flags); | 1327 | spin_lock_irqsave(&this->lock, flags); |
1328 | enabled = wl3501_block_interrupt(this); | 1328 | enabled = wl3501_block_interrupt(this); |
1329 | dev->trans_start = jiffies; | ||
1330 | rc = wl3501_send_pkt(this, skb->data, skb->len); | 1329 | rc = wl3501_send_pkt(this, skb->data, skb->len); |
1331 | if (enabled) | 1330 | if (enabled) |
1332 | wl3501_unblock_interrupt(this); | 1331 | wl3501_unblock_interrupt(this); |