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/eexpress.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/eexpress.c')
-rw-r--r-- | drivers/net/eexpress.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/eexpress.c b/drivers/net/eexpress.c index c31dd0685553..43c9c9c5cf4c 100644 --- a/drivers/net/eexpress.c +++ b/drivers/net/eexpress.c | |||
@@ -543,7 +543,7 @@ static void unstick_cu(struct net_device *dev) | |||
543 | 543 | ||
544 | if (lp->started) | 544 | if (lp->started) |
545 | { | 545 | { |
546 | if (time_after(jiffies, dev->trans_start + 50)) | 546 | if (time_after(jiffies, dev_trans_start(dev) + HZ/2)) |
547 | { | 547 | { |
548 | if (lp->tx_link==lp->last_tx_restart) | 548 | if (lp->tx_link==lp->last_tx_restart) |
549 | { | 549 | { |
@@ -1018,7 +1018,7 @@ static void eexp_hw_tx_pio(struct net_device *dev, unsigned short *buf, | |||
1018 | outw(lp->tx_head+0x16, ioaddr + DATAPORT); | 1018 | outw(lp->tx_head+0x16, ioaddr + DATAPORT); |
1019 | outw(0, ioaddr + DATAPORT); | 1019 | outw(0, ioaddr + DATAPORT); |
1020 | 1020 | ||
1021 | outsw(ioaddr + DATAPORT, buf, (len+1)>>1); | 1021 | outsw(ioaddr + DATAPORT, buf, (len+1)>>1); |
1022 | 1022 | ||
1023 | outw(lp->tx_tail+0xc, ioaddr + WRITE_PTR); | 1023 | outw(lp->tx_tail+0xc, ioaddr + WRITE_PTR); |
1024 | outw(lp->tx_head, ioaddr + DATAPORT); | 1024 | outw(lp->tx_head, ioaddr + DATAPORT); |