diff options
| author |   Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-10 05:01:31 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-05-10 05:01:31 -0700 |
| commit | 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (patch) | |
| tree | d1955a7639e99832590df26466a34d5786a880ae /drivers/net/3c515.c | |
| parent | Bluetooth: Fix issues where sk_sleep() helper is needed now (diff) | |
| download | linux-dev-1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1.tar.xz linux-dev-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/3c515.c')
| -rw-r--r-- | drivers/net/3c515.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c index 2e17837be546..569e269f282e 100644 --- a/drivers/net/3c515.c +++ b/drivers/net/3c515.c @@ -992,7 +992,7 @@ static void corkscrew_timeout(struct net_device *dev) if (!(inw(ioaddr + EL3_STATUS) & CmdInProgress)) break; outw(TxEnable, ioaddr + EL3_CMD); - dev->trans_start = jiffies; + dev->trans_start = jiffies; /* prevent tx timeout */ dev->stats.tx_errors++; dev->stats.tx_dropped++; netif_wake_queue(dev); @@ -1055,7 +1055,6 @@ static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb, prev_entry->status &= ~0x80000000; netif_wake_queue(dev); } - dev->trans_start = jiffies; return NETDEV_TX_OK; } /* Put out the doubleword header... */ @@ -1091,7 +1090,6 @@ static netdev_tx_t corkscrew_start_xmit(struct sk_buff *skb, outw(SetTxThreshold + (1536 >> 2), ioaddr + EL3_CMD); #endif /* bus master */ - dev->trans_start = jiffies; /* Clear the Tx status stack. */ { |