Skip to content

Commit 765f253

Browse files
christian-heuselkuba-moo
authored andcommitted
Revert "rndis_host: Flag RNDIS modems as WWAN devices"
This reverts commit 67d1a89. 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/[email protected]/ 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: [email protected] Acked-by: Lubomir Rintel <[email protected]> Signed-off-by: Christian Heusel <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent bf9de1d commit 765f253

File tree

1 file changed

+2
-14
lines changed

1 file changed

+2
-14
lines changed

drivers/net/usb/rndis_host.c

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -630,16 +630,6 @@ static const struct driver_info zte_rndis_info = {
630630
.tx_fixup = rndis_tx_fixup,
631631
};
632632

633-
static const struct driver_info wwan_rndis_info = {
634-
.description = "Mobile Broadband RNDIS device",
635-
.flags = FLAG_WWAN | FLAG_POINTTOPOINT | FLAG_FRAMING_RN | FLAG_NO_SETINT,
636-
.bind = rndis_bind,
637-
.unbind = rndis_unbind,
638-
.status = rndis_status,
639-
.rx_fixup = rndis_rx_fixup,
640-
.tx_fixup = rndis_tx_fixup,
641-
};
642-
643633
/*-------------------------------------------------------------------------*/
644634

645635
static const struct usb_device_id products [] = {
@@ -676,11 +666,9 @@ static const struct usb_device_id products [] = {
676666
USB_INTERFACE_INFO(USB_CLASS_WIRELESS_CONTROLLER, 1, 3),
677667
.driver_info = (unsigned long) &rndis_info,
678668
}, {
679-
/* Mobile Broadband Modem, seen in Novatel Verizon USB730L and
680-
* Telit FN990A (RNDIS)
681-
*/
669+
/* Novatel Verizon USB730L */
682670
USB_INTERFACE_INFO(USB_CLASS_MISC, 4, 1),
683-
.driver_info = (unsigned long)&wwan_rndis_info,
671+
.driver_info = (unsigned long) &rndis_info,
684672
},
685673
{ }, // END
686674
};

0 commit comments

Comments
 (0)