Revert "rndis_host: Flag RNDIS modems as WWAN devices"
authorChristian Heusel <christian@heusel.eu>
Thu, 24 Apr 2025 14:00:28 +0000 (16:00 +0200)
committerJakub Kicinski <kuba@kernel.org>
Sat, 26 Apr 2025 01:46:13 +0000 (18:46 -0700)
This reverts commit 67d1a8956d2d62fe6b4c13ebabb57806098511d8. Since this
commit has been proven to be problematic for the setup of USB-tethered
ethernet connections and the related breakage is very noticeable for
users it should be reverted until a fixed version of the change can be
rolled out.

Closes: https://lore.kernel.org/all/e0df2d85-1296-4317-b717-bd757e3ab928@heusel.eu/
Link: https://chaos.social/@gromit/114377862699921553
Link: https://bugzilla.kernel.org/show_bug.cgi?id=220002
Link: https://bugs.gentoo.org/953555
Link: https://bbs.archlinux.org/viewtopic.php?id=304892
Cc: stable@vger.kernel.org
Acked-by: Lubomir Rintel <lkundrak@v3.sk>
Signed-off-by: Christian Heusel <christian@heusel.eu>
Link: https://patch.msgid.link/20250424-usb-tethering-fix-v1-1-b65cf97c740e@heusel.eu
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/net/usb/rndis_host.c

index bb0bf1415872745aea177ce0ba7d6eb578cb4a47..7b3739b29c8f72b7b108c5f4ae11fdfcf243237d 100644 (file)
@@ -630,16 +630,6 @@ static const struct driver_info    zte_rndis_info = {
        .tx_fixup =     rndis_tx_fixup,
 };
 
-static const struct driver_info        wwan_rndis_info = {
-       .description =  "Mobile Broadband RNDIS device",
-       .flags =        FLAG_WWAN | FLAG_POINTTOPOINT | FLAG_FRAMING_RN | FLAG_NO_SETINT,
-       .bind =         rndis_bind,
-       .unbind =       rndis_unbind,
-       .status =       rndis_status,
-       .rx_fixup =     rndis_rx_fixup,
-       .tx_fixup =     rndis_tx_fixup,
-};
-
 /*-------------------------------------------------------------------------*/
 
 static const struct usb_device_id      products [] = {
@@ -676,11 +666,9 @@ static const struct usb_device_id  products [] = {
        USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
        .driver_info = (unsigned long) &rndis_info,
 }, {
-       /* Mobile Broadband Modem, seen in Novatel Verizon USB730L and
-        * Telit FN990A (RNDIS)
-        */
+       /* Novatel Verizon USB730L */
        USB_INTERFACE_INFO(USB_CLASS_MISC, 4, 1),
-       .driver_info = (unsigned long)&wwan_rndis_info,
+       .driver_info = (unsigned long) &rndis_info,
 },
        { },            // END
 };