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/sis900.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/sis900.c')
-rw-r--r-- | drivers/net/sis900.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index 6293592635be..11f7ebedcde5 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -1553,7 +1553,7 @@ static void sis900_tx_timeout(struct net_device *net_dev) | |||
1553 | 1553 | ||
1554 | spin_unlock_irqrestore(&sis_priv->lock, flags); | 1554 | spin_unlock_irqrestore(&sis_priv->lock, flags); |
1555 | 1555 | ||
1556 | net_dev->trans_start = jiffies; | 1556 | net_dev->trans_start = jiffies; /* prevent tx timeout */ |
1557 | 1557 | ||
1558 | /* load Transmit Descriptor Register */ | 1558 | /* load Transmit Descriptor Register */ |
1559 | outl(sis_priv->tx_ring_dma, ioaddr + txdp); | 1559 | outl(sis_priv->tx_ring_dma, ioaddr + txdp); |
@@ -1623,8 +1623,6 @@ sis900_start_xmit(struct sk_buff *skb, struct net_device *net_dev) | |||
1623 | 1623 | ||
1624 | spin_unlock_irqrestore(&sis_priv->lock, flags); | 1624 | spin_unlock_irqrestore(&sis_priv->lock, flags); |
1625 | 1625 | ||
1626 | net_dev->trans_start = jiffies; | ||
1627 | |||
1628 | if (netif_msg_tx_queued(sis_priv)) | 1626 | if (netif_msg_tx_queued(sis_priv)) |
1629 | printk(KERN_DEBUG "%s: Queued Tx packet at %p size %d " | 1627 | printk(KERN_DEBUG "%s: Queued Tx packet at %p size %d " |
1630 | "to slot %d.\n", | 1628 | "to slot %d.\n", |