Commit 7927835a authored Jul 30, 2024 by Heiner Kallweit Committed by ZhangPeng Aug 12, 2024

r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY

stable inclusion
from stable-v6.6.45
commit 7e927022495a2fc56ede02d3f7364759ef2c8f7f
bugzilla: https://gitee.com/openeuler/kernel/issues/IAJEIR

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=7e927022495a2fc56ede02d3f7364759ef2c8f7f



--------------------------------

commit d516b187a9cc2e842030dd005be2735db3e8f395 upstream.

The skb isn't consumed in case of NETDEV_TX_BUSY, therefore don't
increment the tx_dropped counter.

Fixes: 188f4af0 ("r8169: use NETDEV_TX_{BUSY/OK}")
Cc: stable@vger.kernel.org
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Wojciech Drewek <wojciech.drewek@intel.com>
Link: https://patch.msgid.link/bbba9c48-8bac-4932-9aa1-d2ed63bc9433@gmail.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: ZhangPeng <zhangpeng362@huawei.com>

parent f1d80501

drivers/net/ethernet/realtek/r8169_main.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -4256,7 +4256,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
		if (unlikely(!rtl_tx_slots_avail(tp))) {
		if (net_ratelimit())
		netdev_err(dev, "BUG! Tx Ring full when queue awake!\n");
		goto err_stop_0;
		netif_stop_queue(dev);
		return NETDEV_TX_BUSY;
		}

		opts[1] = rtl8169_tx_vlan_tag(skb);
		@@ -4312,11 +4313,6 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
		dev_kfree_skb_any(skb);
		dev->stats.tx_dropped++;
		return NETDEV_TX_OK;

		err_stop_0:
		netif_stop_queue(dev);
		dev->stats.tx_dropped++;
		return NETDEV_TX_BUSY;
		}

		static unsigned int rtl_last_frag_len(struct sk_buff *skb)