Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70910791 authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller
Browse files

qmi_wwan: fix entry for HP lt4112 LTE/HSPA+ Gobi 4G Module 



The lt4112 is a HP branded Huawei me906e modem. Like other Huawei
modems, it does not have a fixed interface to function mapping.
Instead it uses a Huawei specific scheme: functions are mapped by
subclass and protocol.

However, the HP vendor ID is used for modems from many different
manufacturers using different schemes, so we cannot apply a generic
vendor rule like we do for the Huawei vendor ID.

Replace the previous lt4112 entry pointing to an arbitrary interface
number with a device specific subclass + protocol match.

Reported-and-tested-by: default avatarMuri Nicanor <muri+libqmi@immerda.ch>
Tested-by: default avatarMartin Hauke <mardnh@gmx.de>
Fixes: bb2bdeb8 ("qmi_wwan: Add support for HP lt4112 LTE/HSPA+ Gobi 4G Modem")
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 44f49dd8

drivers/net/usb/qmi_wwan.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -539,6 +539,10 @@ static const struct usb_device_id products[] = { 
					      USB_CDC_PROTO_NONE),

					      USB_CDC_PROTO_NONE),

		.driver_info        = (unsigned long)&qmi_wwan_info,

		.driver_info        = (unsigned long)&qmi_wwan_info,

	},

	},

	{	/* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */

		USB_DEVICE_AND_INTERFACE_INFO(0x03f0, 0x581d, USB_CLASS_VENDOR_SPEC, 1, 7),

		.driver_info = (unsigned long)&qmi_wwan_info,

	},





	/* 3. Combined interface devices matching on interface number */

	/* 3. Combined interface devices matching on interface number */

	{QMI_FIXED_INTF(0x0408, 0xea42, 4)},	/* Yota / Megafon M100-1 */

	{QMI_FIXED_INTF(0x0408, 0xea42, 4)},	/* Yota / Megafon M100-1 */
@@ -791,7 +795,6 @@ static const struct usb_device_id products[] = { 
	{QMI_FIXED_INTF(0x413c, 0x81a9, 8)},	/* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */

	{QMI_FIXED_INTF(0x413c, 0x81a9, 8)},	/* Dell Wireless 5808e Gobi(TM) 4G LTE Mobile Broadband Card */

	{QMI_FIXED_INTF(0x413c, 0x81b1, 8)},	/* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */

	{QMI_FIXED_INTF(0x413c, 0x81b1, 8)},	/* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card */

	{QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)},	/* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */

	{QMI_FIXED_INTF(0x03f0, 0x4e1d, 8)},	/* HP lt4111 LTE/EV-DO/HSPA+ Gobi 4G Module */

	{QMI_FIXED_INTF(0x03f0, 0x581d, 4)},	/* HP lt4112 LTE/HSPA+ Gobi 4G Module (Huawei me906e) */





	/* 4. Gobi 1000 devices */

	/* 4. Gobi 1000 devices */

	{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */

	{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)},	/* Acer Gobi Modem Device */