tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

net: usbnet: Fix the wrong netif_carrier_on() call

The commit referenced in the Fixes tag causes usbnet to malfunction
(identified via git bisect). Post-commit, my external RJ45 LAN cable
fails to connect. Linus also reported the same issue after pulling that
commit.

The code has a logic error: netif_carrier_on() is only called when the
link is already on. Fix this by moving the netif_carrier_on() call
outside the if-statement entirely. This ensures it is always called
when EVENT_LINK_CARRIER_ON is set and properly clears it regardless
of the link state.

Cc: stable@vger.kernel.org
Cc: Armando Budianto <sprite@gnuweeb.org>
Reviewed-by: Simon Horman <horms@kernel.org>
Suggested-by: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lore.kernel.org/all/CAHk-=wjqL4uF0MG_c8+xHX1Vv8==sPYQrtzbdA3kzi96284nuQ@mail.gmail.com
Closes: https://lore.kernel.org/netdev/CAHk-=wjKh8X4PT_mU1kD4GQrbjivMfPn-_hXa6han_BTDcXddw@mail.gmail.com
Closes: https://lore.kernel.org/netdev/0752dee6-43d6-4e1f-81d2-4248142cccd2@gnuweeb.org
Fixes: 0d9cfc9b8cb1 ("net: usbnet: Avoid potential RCU stall on LINK_CHANGE event")
Signed-off-by: Ammar Faizi <ammarfaizi2@gnuweeb.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by

Ammar Faizi and committed by
Linus Torvalds 8466d393 6bcdbd62

+3 -3
+3 -3
drivers/net/usb/usbnet.c
··· 1120 1120 if (!test_bit(EVENT_DEV_OPEN, &dev->flags)) 1121 1121 return; 1122 1122 1123 + if (test_and_clear_bit(EVENT_LINK_CARRIER_ON, &dev->flags)) 1124 + netif_carrier_on(dev->net); 1125 + 1123 1126 if (!netif_carrier_ok(dev->net)) { 1124 1127 /* kill URBs for reading packets to save bus bandwidth */ 1125 1128 unlink_urbs(dev, &dev->rxq); ··· 1132 1129 * tx queue is stopped by netcore after link becomes off 1133 1130 */ 1134 1131 } else { 1135 - if (test_and_clear_bit(EVENT_LINK_CARRIER_ON, &dev->flags)) 1136 - netif_carrier_on(dev->net); 1137 - 1138 1132 /* submitting URBs for reading packets */ 1139 1133 queue_work(system_bh_wq, &dev->bh_work); 1140 1134 }