diff options
| author | Eric Dumazet | 2010-05-10 14:01:31 +0200 |
|---|---|---|
| committer | David S. Miller | 2010-05-10 14:01:31 +0200 |
| commit | 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (patch) | |
| tree | d1955a7639e99832590df26466a34d5786a880ae /drivers/net/tulip/uli526x.c | |
| parent | Bluetooth: Fix issues where sk_sleep() helper is needed now (diff) | |
| download | kernel-qcow2-linux-1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1.tar.gz kernel-qcow2-linux-1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1.tar.xz kernel-qcow2-linux-1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1.zip | |
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/tulip/uli526x.c')
| -rw-r--r-- | drivers/net/tulip/uli526x.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c index c7f972852921..96de5829b940 100644 --- a/drivers/net/tulip/uli526x.c +++ b/drivers/net/tulip/uli526x.c @@ -1040,11 +1040,11 @@ static void uli526x_timer(unsigned long data) /* TX polling kick monitor */ if ( db->tx_packet_cnt && - time_after(jiffies, dev->trans_start + ULI526X_TX_KICK) ) { + time_after(jiffies, dev_trans_start(dev) + ULI526X_TX_KICK) ) { outl(0x1, dev->base_addr + DCR1); // Tx polling again // TX Timeout - if ( time_after(jiffies, dev->trans_start + ULI526X_TX_TIMEOUT) ) { + if ( time_after(jiffies, dev_trans_start(dev) + ULI526X_TX_TIMEOUT) ) { db->reset_TXtimeout++; db->wait_reset = 1; printk( "%s: Tx timeout - resetting\n", |