diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-05-28 00:00:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-29 01:46:27 -0700 |
| commit | cdd0db058d64f2619b08e7d098ee0014aa0a5bc1 (patch) | |
| tree | a5e31f6687eff581309b095781c7e2f0bc676182 /drivers/net/hamachi.c | |
| parent | 28679751a924c11f7135641f26e99249385de5b4 (diff) | |
| download | linux-cdd0db058d64f2619b08e7d098ee0014aa0a5bc1.tar.gz linux-cdd0db058d64f2619b08e7d098ee0014aa0a5bc1.tar.bz2 linux-cdd0db058d64f2619b08e7d098ee0014aa0a5bc1.zip | |
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/hamachi.c')
| -rw-r--r-- | drivers/net/hamachi.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c index 310ee035067c..26151fa35df5 100644 --- a/drivers/net/hamachi.c +++ b/drivers/net/hamachi.c @@ -1163,7 +1163,7 @@ static void hamachi_tx_timeout(struct net_device *dev) hmp->rx_ring[RX_RING_SIZE-1].status_n_length |= cpu_to_le32(DescEndRing); /* Trigger an immediate transmit demand. */ - dev->trans_start = jiffies; + dev->trans_start = jiffies; /* prevent tx timeout */ hmp->stats.tx_errors++; /* Restart the chip's Tx/Rx processes . */ @@ -1364,7 +1364,6 @@ static int hamachi_start_xmit(struct sk_buff *skb, struct net_device *dev) hmp->tx_full = 1; netif_stop_queue(dev); } - dev->trans_start = jiffies; if (hamachi_debug > 4) { printk(KERN_DEBUG "%s: Hamachi transmit frame #%d queued in slot %d.\n", |