mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
NET: nps_enet: TX done race condition
We need to set tx_skb pointer before send frame. If we receive interrupt before we set pointer we will try to free SKB with wrong pointer. Now we are sure that SKB pointer will never be NULL during handling TX done and check is removed. Signed-off-by: Noam Camus <noamc@ezchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
0dd20f3ce0
commit
93fcf83eb9
1 changed files with 3 additions and 7 deletions
|
@ -158,11 +158,7 @@ static void nps_enet_tx_handler(struct net_device *ndev)
|
|||
ndev->stats.tx_bytes += tx_ctrl.nt;
|
||||
}
|
||||
|
||||
if (priv->tx_skb) {
|
||||
dev_kfree_skb(priv->tx_skb);
|
||||
priv->tx_skb = NULL;
|
||||
}
|
||||
|
||||
dev_kfree_skb(priv->tx_skb);
|
||||
priv->tx_packet_sent = false;
|
||||
|
||||
if (netif_queue_stopped(ndev))
|
||||
|
@ -528,10 +524,10 @@ static netdev_tx_t nps_enet_start_xmit(struct sk_buff *skb,
|
|||
/* This driver handles one frame at a time */
|
||||
netif_stop_queue(ndev);
|
||||
|
||||
nps_enet_send_frame(ndev, skb);
|
||||
|
||||
priv->tx_skb = skb;
|
||||
|
||||
nps_enet_send_frame(ndev, skb);
|
||||
|
||||
return NETDEV_TX_OK;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue