summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZhang Changzhong <zhangchangzhong@huawei.com>2022-10-21 09:32:24 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-11-03 23:50:55 +0900
commit8fb31d7827d61979eec367ec4c6d2d7e5f1e5ae4 (patch)
tree51bf92d1b4f9236c27b96372cffbd451d48647a7
parent9ae47f11493509cde707af8ecc7eee04c8b8e635 (diff)
downloadlinux-8fb31d7827d61979eec367ec4c6d2d7e5f1e5ae4.tar.gz
linux-8fb31d7827d61979eec367ec4c6d2d7e5f1e5ae4.tar.bz2
linux-8fb31d7827d61979eec367ec4c6d2d7e5f1e5ae4.zip
net: lantiq_etop: don't free skb when returning NETDEV_TX_BUSY
[ Upstream commit 9c1eaa27ec599fcc25ed4970c0b73c247d147a2b ] The ndo_start_xmit() method must not free skb when returning NETDEV_TX_BUSY, since caller is going to requeue freed skb. Fixes: 504d4721ee8e ("MIPS: Lantiq: Add ethernet driver") Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/net/ethernet/lantiq_etop.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c
index afc810069440..2a14520e4798 100644
--- a/drivers/net/ethernet/lantiq_etop.c
+++ b/drivers/net/ethernet/lantiq_etop.c
@@ -479,7 +479,6 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev)
len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len;
if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) {
- dev_kfree_skb_any(skb);
netdev_err(dev, "tx ring full\n");
netif_tx_stop_queue(txq);
return NETDEV_TX_BUSY;