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/tulip/dmfe.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/tulip/dmfe.c')
-rw-r--r-- | drivers/net/tulip/dmfe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c index 7278ecb823cb..bdb25b8b1017 100644 --- a/drivers/net/tulip/dmfe.c +++ b/drivers/net/tulip/dmfe.c | |||
@@ -1180,11 +1180,11 @@ static void dmfe_timer(unsigned long data) | |||
1180 | 1180 | ||
1181 | /* TX polling kick monitor */ | 1181 | /* TX polling kick monitor */ |
1182 | if ( db->tx_packet_cnt && | 1182 | if ( db->tx_packet_cnt && |
1183 | time_after(jiffies, dev->trans_start + DMFE_TX_KICK) ) { | 1183 | time_after(jiffies, dev_trans_start(dev) + DMFE_TX_KICK) ) { |
1184 | outl(0x1, dev->base_addr + DCR1); /* Tx polling again */ | 1184 | outl(0x1, dev->base_addr + DCR1); /* Tx polling again */ |
1185 | 1185 | ||
1186 | /* TX Timeout */ | 1186 | /* TX Timeout */ |
1187 | if ( time_after(jiffies, dev->trans_start + DMFE_TX_TIMEOUT) ) { | 1187 | if (time_after(jiffies, dev_trans_start(dev) + DMFE_TX_TIMEOUT) ) { |
1188 | db->reset_TXtimeout++; | 1188 | db->reset_TXtimeout++; |
1189 | db->wait_reset = 1; | 1189 | db->wait_reset = 1; |
1190 | dev_warn(&dev->dev, "Tx timeout - resetting\n"); | 1190 | dev_warn(&dev->dev, "Tx timeout - resetting\n"); |