r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
Heiner Kallweit
maintainerPATCH 1/1 r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
The skb isn't consumed in case of NETDEV_TX_BUSY, therefore don't increment the tx_dropped counter.
Fixes 188f4af04618 ("r8169: use NETDEV_TX_{BUSY/OK}")
Suggested-by Jakub Kicinski <[email protected]>
Signed-off-by Heiner Kallweit <[email protected]>
--- drivers/net/ethernet/realtek/r8169_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/net/ethernet/realtek/r8169_main.c +2 -6
@@ -4349,7 +4349,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);
@@ -4405,11 +4406,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)
Signature · 1 line
2.45.2
Quoted 8 lines · Heiner Kallweit
The skb isn't consumed in case of
NETDEV_TX_BUSY, therefore don't increment thetx_droppedcounter.Fixes 188f4af04618 ("r8169: use NETDEV_TX_{BUSY/OK}")Suggested-by Jakub Kicinski <[email protected]>Signed-off-by Heiner Kallweit <[email protected]>---
Reviewed-by Wojciech Drewek <[email protected]>
Quoted 29 lines
drivers/net/ethernet/realtek/r8169_main.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)drivers/net/ethernet/realtek/r8169_main.c +2
-6@@ -4349,7 +4349,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);@@ -4405,11 +4406,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)
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Tue, 30 Jul 2024 21:51:52 +0200 you wrote:
The skb isn't consumed in case of
NETDEV_TX_BUSY, therefore don't increment thetx_droppedcounter.Fixes 188f4af04618 ("r8169: use NETDEV_TX_{BUSY/OK}")Suggested-by Jakub Kicinski <[email protected]>Signed-off-by Heiner Kallweit <[email protected]>[...]
Here is the summary with links:
- [net] r8169: don't increment tx_dropped in case of NETDEV_TX_BUSY
https://git.kernel.org/netdev/net/c/d516b187a9cc
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html