diff options
author | Eric Dumazet <eric.dumazet@gmail.com> | 2010-05-10 14:01:31 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-05-10 14:01:31 +0200 |
commit | 1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1 (patch) | |
tree | d1955a7639e99832590df26466a34d5786a880ae /drivers/net/tlan.c | |
parent | Bluetooth: Fix issues where sk_sleep() helper is needed now (diff) | |
download | linux-1ae5dc342ac78d7a42965fd1f323815f6f5ef2c1.tar.xz 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/tlan.c')
-rw-r--r-- | drivers/net/tlan.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/tlan.c b/drivers/net/tlan.c index 8ffec22b74bf..ccee3eddc5f4 100644 --- a/drivers/net/tlan.c +++ b/drivers/net/tlan.c @@ -1034,7 +1034,7 @@ static void TLan_tx_timeout(struct net_device *dev) TLan_ResetLists( dev ); TLan_ReadAndClearStats( dev, TLAN_IGNORE ); TLan_ResetAdapter( dev ); - dev->trans_start = jiffies; + dev->trans_start = jiffies; /* prevent tx timeout */ netif_wake_queue( dev ); } @@ -1147,7 +1147,6 @@ static netdev_tx_t TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS ); - dev->trans_start = jiffies; return NETDEV_TX_OK; } /* TLan_StartTx */ |