diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-05-27 20:00:41 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-05-29 04:46:27 -0400 |
commit | cdd0db058d64f2619b08e7d098ee0014aa0a5bc1 (patch) | |
tree | a5e31f6687eff581309b095781c7e2f0bc676182 /drivers/net/yellowfin.c | |
parent | 28679751a924c11f7135641f26e99249385de5b4 (diff) |
net: dont update dev->trans_start
Second round of drivers for Gb cards (and NIU one I forgot in the 10GB round)
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/yellowfin.c')
-rw-r--r-- | drivers/net/yellowfin.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 7477ffdcddb4..3c7a5053f1da 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -717,7 +717,7 @@ static void yellowfin_tx_timeout(struct net_device *dev) | |||
717 | if (yp->cur_tx - yp->dirty_tx < TX_QUEUE_SIZE) | 717 | if (yp->cur_tx - yp->dirty_tx < TX_QUEUE_SIZE) |
718 | netif_wake_queue (dev); /* Typical path */ | 718 | netif_wake_queue (dev); /* Typical path */ |
719 | 719 | ||
720 | dev->trans_start = jiffies; | 720 | dev->trans_start = jiffies; /* prevent tx timeout */ |
721 | dev->stats.tx_errors++; | 721 | dev->stats.tx_errors++; |
722 | } | 722 | } |
723 | 723 | ||
@@ -876,7 +876,6 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
876 | netif_start_queue (dev); /* Typical path */ | 876 | netif_start_queue (dev); /* Typical path */ |
877 | else | 877 | else |
878 | yp->tx_full = 1; | 878 | yp->tx_full = 1; |
879 | dev->trans_start = jiffies; | ||
880 | 879 | ||
881 | if (yellowfin_debug > 4) { | 880 | if (yellowfin_debug > 4) { |
882 | printk(KERN_DEBUG "%s: Yellowfin transmit frame #%d queued in slot %d.\n", | 881 | printk(KERN_DEBUG "%s: Yellowfin transmit frame #%d queued in slot %d.\n", |