34 lines
1020 B
Diff
34 lines
1020 B
Diff
From: Eric Dumazet <eric.dumazet@gmail.com>
|
|
Date: Wed, 30 Nov 2011 17:12:27 -0500
|
|
Subject: sfc: fix race in efx_enqueue_skb_tso()
|
|
|
|
commit 449fa023bca5b53bd924d91a27ffd34807fdeb80 upstream.
|
|
|
|
As soon as skb is pushed to hardware, it can be completed and freed, so
|
|
we should not dereference skb anymore.
|
|
|
|
Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/sfc/tx.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/sfc/tx.c b/drivers/net/ethernet/sfc/tx.c
|
|
index ab4c635..e0e00b3 100644
|
|
--- a/drivers/net/ethernet/sfc/tx.c
|
|
+++ b/drivers/net/ethernet/sfc/tx.c
|
|
@@ -1173,11 +1173,11 @@ static int efx_enqueue_skb_tso(struct efx_tx_queue *tx_queue,
|
|
goto mem_err;
|
|
}
|
|
|
|
+ netdev_tx_sent_queue(tx_queue->core_txq, skb->len);
|
|
+
|
|
/* Pass off to hardware */
|
|
efx_nic_push_buffers(tx_queue);
|
|
|
|
- netdev_tx_sent_queue(tx_queue->core_txq, skb->len);
|
|
-
|
|
tx_queue->tso_bursts++;
|
|
return NETDEV_TX_OK;
|
|
|