Skip to content

Commit 06a4df5

Browse files
Zhang Changzhongdavem330
Zhang Changzhong
authored andcommitted
net: fec: fix improper use of NETDEV_TX_BUSY
The ndo_start_xmit() method must not free skb when returning NETDEV_TX_BUSY, since caller is going to requeue freed skb. Fix it by returning NETDEV_TX_OK in case of dma_map_single() fails. Fixes: 79f3391 ("net: fec: Add software TSO support") Signed-off-by: Zhang Changzhong <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5715a50 commit 06a4df5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ethernet/freescale/fec_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q *txq, struct sk_buff *skb,
713713
dev_kfree_skb_any(skb);
714714
if (net_ratelimit())
715715
netdev_err(ndev, "Tx DMA memory map failed\n");
716-
return NETDEV_TX_BUSY;
716+
return NETDEV_TX_OK;
717717
}
718718

719719
bdp->cbd_datlen = cpu_to_fec16(size);
@@ -775,7 +775,7 @@ fec_enet_txq_put_hdr_tso(struct fec_enet_priv_tx_q *txq,
775775
dev_kfree_skb_any(skb);
776776
if (net_ratelimit())
777777
netdev_err(ndev, "Tx DMA memory map failed\n");
778-
return NETDEV_TX_BUSY;
778+
return NETDEV_TX_OK;
779779
}
780780
}
781781

0 commit comments

Comments
 (0)