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/tlan.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/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) | |||
1034 | TLan_ResetLists( dev ); | 1034 | TLan_ResetLists( dev ); |
1035 | TLan_ReadAndClearStats( dev, TLAN_IGNORE ); | 1035 | TLan_ReadAndClearStats( dev, TLAN_IGNORE ); |
1036 | TLan_ResetAdapter( dev ); | 1036 | TLan_ResetAdapter( dev ); |
1037 | dev->trans_start = jiffies; | 1037 | dev->trans_start = jiffies; /* prevent tx timeout */ |
1038 | netif_wake_queue( dev ); | 1038 | netif_wake_queue( dev ); |
1039 | 1039 | ||
1040 | } | 1040 | } |
@@ -1147,7 +1147,6 @@ static netdev_tx_t TLan_StartTx( struct sk_buff *skb, struct net_device *dev ) | |||
1147 | 1147 | ||
1148 | CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS ); | 1148 | CIRC_INC( priv->txTail, TLAN_NUM_TX_LISTS ); |
1149 | 1149 | ||
1150 | dev->trans_start = jiffies; | ||
1151 | return NETDEV_TX_OK; | 1150 | return NETDEV_TX_OK; |
1152 | 1151 | ||
1153 | } /* TLan_StartTx */ | 1152 | } /* TLan_StartTx */ |