This is a note to let you know that I've just added the patch titled
net: ethernet: mtk-star-emac: return ok when xmit drops
to the 5.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
net-ethernet-mtk-star-emac-return-ok-when-xmit-drops.patch
and it can be found in the queue-5.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Sun Nov 22 10:24:40 AM CET 2020
From: "Vincent Stehlé" <vincent.stehle@xxxxxxxxxxx>
Date: Thu, 12 Nov 2020 09:48:33 +0100
Subject: net: ethernet: mtk-star-emac: return ok when xmit drops
From: "Vincent Stehlé" <vincent.stehle@xxxxxxxxxxx>
[ Upstream commit e8aa6d520b448efc88670a98eccd196713639f2f ]
The ndo_start_xmit() method must return NETDEV_TX_OK if the DMA mapping
fails, after freeing the socket buffer.
Fix the mtk_star_netdev_start_xmit() function accordingly.
Fixes: 8c7bd5a454ff ("net: ethernet: mtk-star-emac: new driver")
Signed-off-by: Vincent Stehlé <vincent.stehle@xxxxxxxxxxx>
Acked-by: Bartosz Golaszewski <bgolaszewski@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20201112084833.21842-1-vincent.stehle@xxxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/ethernet/mediatek/mtk_star_emac.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/net/ethernet/mediatek/mtk_star_emac.c
+++ b/drivers/net/ethernet/mediatek/mtk_star_emac.c
@@ -1054,7 +1054,7 @@ static int mtk_star_netdev_start_xmit(st
err_drop_packet:
dev_kfree_skb(skb);
ndev->stats.tx_dropped++;
- return NETDEV_TX_BUSY;
+ return NETDEV_TX_OK;
}
/* Returns the number of bytes sent or a negative number on the first
Patches currently in stable-queue which might be from vincent.stehle@xxxxxxxxxxx are
queue-5.9/net-ethernet-mtk-star-emac-return-ok-when-xmit-drops.patch
