diff options
| author | Jakub Kicinski | 2017-08-23 23:41:50 +0200 |
|---|---|---|
| committer | David S. Miller | 2017-08-24 07:40:49 +0200 |
| commit | 46f1c52e66dbc0d7a99f7c2a3c9debb497fe7b7b (patch) | |
| tree | 71d077de7e2b677bdffe612392cd612f42bfc4ad /drivers/net/ethernet/netronome/nfp/nfp_net_common.c | |
| parent | sctp: Avoid out-of-bounds reads from address storage (diff) | |
| download | kernel-qcow2-linux-46f1c52e66dbc0d7a99f7c2a3c9debb497fe7b7b.tar.gz kernel-qcow2-linux-46f1c52e66dbc0d7a99f7c2a3c9debb497fe7b7b.tar.xz kernel-qcow2-linux-46f1c52e66dbc0d7a99f7c2a3c9debb497fe7b7b.zip | |
nfp: TX time stamp packets before HW doorbell is rung
TX completion may happen any time after HW queue was kicked.
We can't access the skb afterwards. Move the time stamping
before ringing the doorbell.
Fixes: 4c3523623dc0 ("net: add driver for Netronome NFP4000/NFP6000 NIC VFs")
Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/netronome/nfp/nfp_net_common.c')
| -rw-r--r-- | drivers/net/ethernet/netronome/nfp/nfp_net_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c index 1ff0c577819e..66a09e490cf5 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_common.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_common.c @@ -895,6 +895,8 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) netdev_tx_sent_queue(nd_q, txbuf->real_len); + skb_tx_timestamp(skb); + tx_ring->wr_p += nr_frags + 1; if (nfp_net_tx_ring_should_stop(tx_ring)) nfp_net_tx_ring_stop(nd_q, tx_ring); @@ -903,8 +905,6 @@ static int nfp_net_tx(struct sk_buff *skb, struct net_device *netdev) if (!skb->xmit_more || netif_xmit_stopped(nd_q)) nfp_net_tx_xmit_more_flush(tx_ring); - skb_tx_timestamp(skb); - return NETDEV_TX_OK; err_unmap: |