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/3c507.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/3c507.c')
-rw-r--r-- | drivers/net/3c507.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c index 9e95afa49fbe..c4e272fbc2cc 100644 --- a/drivers/net/3c507.c +++ b/drivers/net/3c507.c | |||
@@ -504,7 +504,7 @@ static void el16_tx_timeout (struct net_device *dev) | |||
504 | outb (0, ioaddr + SIGNAL_CA); /* Issue channel-attn. */ | 504 | outb (0, ioaddr + SIGNAL_CA); /* Issue channel-attn. */ |
505 | lp->last_restart = dev->stats.tx_packets; | 505 | lp->last_restart = dev->stats.tx_packets; |
506 | } | 506 | } |
507 | dev->trans_start = jiffies; | 507 | dev->trans_start = jiffies; /* prevent tx timeout */ |
508 | netif_wake_queue (dev); | 508 | netif_wake_queue (dev); |
509 | } | 509 | } |
510 | 510 | ||
@@ -528,7 +528,6 @@ static netdev_tx_t el16_send_packet (struct sk_buff *skb, | |||
528 | 528 | ||
529 | hardware_send_packet (dev, buf, skb->len, length - skb->len); | 529 | hardware_send_packet (dev, buf, skb->len, length - skb->len); |
530 | 530 | ||
531 | dev->trans_start = jiffies; | ||
532 | /* Enable the 82586 interrupt input. */ | 531 | /* Enable the 82586 interrupt input. */ |
533 | outb (0x84, ioaddr + MISC_CTRL); | 532 | outb (0x84, ioaddr + MISC_CTRL); |
534 | 533 | ||