diff options
| author | Eric Dumazet <eric.dumazet@gmail.com> | 2009-05-27 21:26:37 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-29 10:46:26 +0200 |
| commit | 28679751a924c11f7135641f26e99249385de5b4 (patch) | |
| tree | 79e05e9ee10e62b02c52e3a5af11dd3dfa28a0e2 /drivers/net/sfc | |
| parent | Merge branch 'linux-2.6.31.y' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-28679751a924c11f7135641f26e99249385de5b4.tar.xz linux-28679751a924c11f7135641f26e99249385de5b4.zip | |
net: dont update dev->trans_start in 10GB drivers
Followup of commits 9d21493b4beb8f918ba248032fefa393074a5e2b
and 08baf561083bc27a953aa087dd8a664bb2b88e8e
(net: tx scalability works : trans_start)
(net: txq_trans_update() helper)
Now that core network takes care of trans_start updates, dont do it
in drivers themselves, if possible. Multi queue drivers can
avoid one cache miss (on dev->trans_start) in their start_xmit()
handler.
Exceptions are NETIF_F_LLTX drivers (vxge & tehuti)
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/sfc')
| -rw-r--r-- | drivers/net/sfc/selftest.c | 1 | ||||
| -rw-r--r-- | drivers/net/sfc/tx.c | 7 |
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/net/sfc/selftest.c b/drivers/net/sfc/selftest.c index 043795715955..b67ccca3fc1a 100644 --- a/drivers/net/sfc/selftest.c +++ b/drivers/net/sfc/selftest.c @@ -438,6 +438,7 @@ static int efx_begin_loopback(struct efx_tx_queue *tx_queue) kfree_skb(skb); return -EPIPE; } + efx->net_dev->trans_start = jiffies; } return 0; diff --git a/drivers/net/sfc/tx.c b/drivers/net/sfc/tx.c index d6681edb7014..14a14788566c 100644 --- a/drivers/net/sfc/tx.c +++ b/drivers/net/sfc/tx.c @@ -360,13 +360,6 @@ inline int efx_xmit(struct efx_nic *efx, /* Map fragments for DMA and add to TX queue */ rc = efx_enqueue_skb(tx_queue, skb); - if (unlikely(rc != NETDEV_TX_OK)) - goto out; - - /* Update last TX timer */ - efx->net_dev->trans_start = jiffies; - - out: return rc; } |