Skip to content

Commit d516b18

Browse files
hkallweitkuba-moo
authored andcommitted
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: 188f4af ("r8169: use NETDEV_TX_{BUSY/OK}") Cc: [email protected] Suggested-by: Jakub Kicinski <[email protected]> Signed-off-by: Heiner Kallweit <[email protected]> Reviewed-by: Wojciech Drewek <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 601df20 commit d516b18

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/net/ethernet/realtek/r8169_main.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4349,7 +4349,8 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
43494349
if (unlikely(!rtl_tx_slots_avail(tp))) {
43504350
if (net_ratelimit())
43514351
netdev_err(dev, "BUG! Tx Ring full when queue awake!\n");
4352-
goto err_stop_0;
4352+
netif_stop_queue(dev);
4353+
return NETDEV_TX_BUSY;
43534354
}
43544355

43554356
opts[1] = rtl8169_tx_vlan_tag(skb);
@@ -4405,11 +4406,6 @@ static netdev_tx_t rtl8169_start_xmit(struct sk_buff *skb,
44054406
dev_kfree_skb_any(skb);
44064407
dev->stats.tx_dropped++;
44074408
return NETDEV_TX_OK;
4408-
4409-
err_stop_0:
4410-
netif_stop_queue(dev);
4411-
dev->stats.tx_dropped++;
4412-
return NETDEV_TX_BUSY;
44134409
}
44144410

44154411
static unsigned int rtl_last_frag_len(struct sk_buff *skb)

0 commit comments

Comments
 (0)