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/atp.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/atp.c')
-rw-r--r-- | drivers/net/atp.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/atp.c b/drivers/net/atp.c index 2bd1a5c0ec17..75ff0c59e9c7 100644 --- a/drivers/net/atp.c +++ b/drivers/net/atp.c | |||
@@ -547,7 +547,7 @@ static void tx_timeout(struct net_device *dev) | |||
547 | dev->stats.tx_errors++; | 547 | dev->stats.tx_errors++; |
548 | /* Try to restart the adapter. */ | 548 | /* Try to restart the adapter. */ |
549 | hardware_init(dev); | 549 | hardware_init(dev); |
550 | dev->trans_start = jiffies; | 550 | dev->trans_start = jiffies; /* prevent tx timeout */ |
551 | netif_wake_queue(dev); | 551 | netif_wake_queue(dev); |
552 | dev->stats.tx_errors++; | 552 | dev->stats.tx_errors++; |
553 | } | 553 | } |
@@ -586,7 +586,6 @@ static netdev_tx_t atp_send_packet(struct sk_buff *skb, | |||
586 | write_reg(ioaddr, IMR, ISR_RxOK | ISR_TxErr | ISR_TxOK); | 586 | write_reg(ioaddr, IMR, ISR_RxOK | ISR_TxErr | ISR_TxOK); |
587 | write_reg_high(ioaddr, IMR, ISRh_RxErr); | 587 | write_reg_high(ioaddr, IMR, ISRh_RxErr); |
588 | 588 | ||
589 | dev->trans_start = jiffies; | ||
590 | dev_kfree_skb (skb); | 589 | dev_kfree_skb (skb); |
591 | return NETDEV_TX_OK; | 590 | return NETDEV_TX_OK; |
592 | } | 591 | } |