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/3c509.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/3c509.c')
-rw-r--r-- | drivers/net/3c509.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c index ab9bb3c52002..54deaa91e7c6 100644 --- a/drivers/net/3c509.c +++ b/drivers/net/3c509.c | |||
@@ -807,7 +807,7 @@ el3_tx_timeout (struct net_device *dev) | |||
807 | dev->name, inb(ioaddr + TX_STATUS), inw(ioaddr + EL3_STATUS), | 807 | dev->name, inb(ioaddr + TX_STATUS), inw(ioaddr + EL3_STATUS), |
808 | inw(ioaddr + TX_FREE)); | 808 | inw(ioaddr + TX_FREE)); |
809 | dev->stats.tx_errors++; | 809 | dev->stats.tx_errors++; |
810 | dev->trans_start = jiffies; | 810 | dev->trans_start = jiffies; /* prevent tx timeout */ |
811 | /* Issue TX_RESET and TX_START commands. */ | 811 | /* Issue TX_RESET and TX_START commands. */ |
812 | outw(TxReset, ioaddr + EL3_CMD); | 812 | outw(TxReset, ioaddr + EL3_CMD); |
813 | outw(TxEnable, ioaddr + EL3_CMD); | 813 | outw(TxEnable, ioaddr + EL3_CMD); |
@@ -868,7 +868,6 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
868 | /* ... and the packet rounded to a doubleword. */ | 868 | /* ... and the packet rounded to a doubleword. */ |
869 | outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2); | 869 | outsl(ioaddr + TX_FIFO, skb->data, (skb->len + 3) >> 2); |
870 | 870 | ||
871 | dev->trans_start = jiffies; | ||
872 | if (inw(ioaddr + TX_FREE) > 1536) | 871 | if (inw(ioaddr + TX_FREE) > 1536) |
873 | netif_start_queue(dev); | 872 | netif_start_queue(dev); |
874 | else | 873 | else |