netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry
@ 2013-06-28 15:17 Bjørn Mork
  2013-06-28 15:17 ` [PATCH 2/3] net: qmi_wwan: add Option GTM681W Bjørn Mork
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Bjørn Mork @ 2013-06-28 15:17 UTC (permalink / raw)
  To: netdev; +Cc: linux-usb, Bjørn Mork

The MC8305 module got an additional entry added based solely on
information from a Windows driver *.inf file. We now have the
actual descriptor layout from one of these modules, and it
consists of two alternate configurations where cfg #1 is a
normal Gobi 2k layout and cfg #2 is MBIM only, using interface
numbers 5 and 6 for MBIM control and data. The extra Windows
driver entry for interface number 5 was most likely a bug.

Deleting the bogus entry to avoid unnecessary qmi_wwan probe
failures when using the MBIM configuration.

Reported-by: Lana Black <sickmind@lavabit.com>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 drivers/net/usb/qmi_wwan.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index d095d0d..1d1021c 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -625,7 +625,6 @@ static const struct usb_device_id products[] = {
 	{QMI_GOBI_DEVICE(0x1199, 0x9009)},	/* Sierra Wireless Gobi 2000 Modem device (VT773) */
 	{QMI_GOBI_DEVICE(0x1199, 0x900a)},	/* Sierra Wireless Gobi 2000 Modem device (VT773) */
 	{QMI_GOBI_DEVICE(0x1199, 0x9011)},	/* Sierra Wireless Gobi 2000 Modem device (MC8305) */
-	{QMI_FIXED_INTF(0x1199, 0x9011, 5)},	/* alternate interface number!? */
 	{QMI_GOBI_DEVICE(0x16d8, 0x8002)},	/* CMDTech Gobi 2000 Modem device (VU922) */
 	{QMI_GOBI_DEVICE(0x05c6, 0x9205)},	/* Gobi 2000 Modem device */
 	{QMI_GOBI_DEVICE(0x1199, 0x9013)},	/* Sierra Wireless Gobi 3000 Modem device (MC8355) */
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 2/3] net: qmi_wwan: add Option GTM681W
  2013-06-28 15:17 [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry Bjørn Mork
@ 2013-06-28 15:17 ` Bjørn Mork
  2013-07-02  0:01   ` David Miller
  2013-06-28 15:17 ` [PATCH 3/3] net: qmi_wwan: add TP-LINK MA260 Bjørn Mork
  2013-07-02  0:01 ` [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry David Miller
  2 siblings, 1 reply; 6+ messages in thread
From: Bjørn Mork @ 2013-06-28 15:17 UTC (permalink / raw)
  To: netdev; +Cc: linux-usb, Bjørn Mork

A standard Gobi 3000 reference design module.

Reported-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 drivers/net/usb/qmi_wwan.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index 1d1021c..e4a0843 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -612,6 +612,7 @@ static const struct usb_device_id products[] = {
 	{QMI_GOBI_DEVICE(0x05c6, 0x9265)},	/* Asus Gobi 2000 Modem device (VR305) */
 	{QMI_GOBI_DEVICE(0x05c6, 0x9235)},	/* Top Global Gobi 2000 Modem device (VR306) */
 	{QMI_GOBI_DEVICE(0x05c6, 0x9275)},	/* iRex Technologies Gobi 2000 Modem device (VR307) */
+	{QMI_GOBI_DEVICE(0x0af0, 0x8120)},	/* Option GTM681W */
 	{QMI_GOBI_DEVICE(0x1199, 0x68a5)},	/* Sierra Wireless Modem */
 	{QMI_GOBI_DEVICE(0x1199, 0x68a9)},	/* Sierra Wireless Modem */
 	{QMI_GOBI_DEVICE(0x1199, 0x9001)},	/* Sierra Wireless Gobi 2000 Modem device (VT773) */
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [PATCH 3/3] net: qmi_wwan: add TP-LINK MA260
  2013-06-28 15:17 [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry Bjørn Mork
  2013-06-28 15:17 ` [PATCH 2/3] net: qmi_wwan: add Option GTM681W Bjørn Mork
@ 2013-06-28 15:17 ` Bjørn Mork
  2013-07-02  0:02   ` David Miller
  2013-07-02  0:01 ` [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry David Miller
  2 siblings, 1 reply; 6+ messages in thread
From: Bjørn Mork @ 2013-06-28 15:17 UTC (permalink / raw)
  To: netdev; +Cc: linux-usb, Bjørn Mork

Signed-off-by: Bjørn Mork <bjorn@mork.no>
---
 drivers/net/usb/qmi_wwan.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index e4a0843..6de1102 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -582,6 +582,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x1199, 0x901c, 8)},    /* Sierra Wireless EM7700 */
 	{QMI_FIXED_INTF(0x1bbb, 0x011e, 4)},	/* Telekom Speedstick LTE II (Alcatel One Touch L100V LTE) */
 	{QMI_FIXED_INTF(0x2357, 0x0201, 4)},	/* TP-LINK HSUPA Modem MA180 */
+	{QMI_FIXED_INTF(0x2357, 0x9000, 4)},	/* TP-LINK MA260 */
 	{QMI_FIXED_INTF(0x1bc7, 0x1200, 5)},	/* Telit LE920 */
 	{QMI_FIXED_INTF(0x1e2d, 0x12d1, 4)},	/* Cinterion PLxx */
 
-- 
1.7.10.4

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry
  2013-06-28 15:17 [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry Bjørn Mork
  2013-06-28 15:17 ` [PATCH 2/3] net: qmi_wwan: add Option GTM681W Bjørn Mork
  2013-06-28 15:17 ` [PATCH 3/3] net: qmi_wwan: add TP-LINK MA260 Bjørn Mork
@ 2013-07-02  0:01 ` David Miller
  2 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-07-02  0:01 UTC (permalink / raw)
  To: bjorn; +Cc: netdev, linux-usb

From: Bjørn Mork <bjorn@mork.no>
Date: Fri, 28 Jun 2013 17:17:49 +0200

> The MC8305 module got an additional entry added based solely on
> information from a Windows driver *.inf file. We now have the
> actual descriptor layout from one of these modules, and it
> consists of two alternate configurations where cfg #1 is a
> normal Gobi 2k layout and cfg #2 is MBIM only, using interface
> numbers 5 and 6 for MBIM control and data. The extra Windows
> driver entry for interface number 5 was most likely a bug.
> 
> Deleting the bogus entry to avoid unnecessary qmi_wwan probe
> failures when using the MBIM configuration.
> 
> Reported-by: Lana Black <sickmind@lavabit.com>
> Signed-off-by: Bjørn Mork <bjorn@mork.no>

Applied.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 2/3] net: qmi_wwan: add Option GTM681W
  2013-06-28 15:17 ` [PATCH 2/3] net: qmi_wwan: add Option GTM681W Bjørn Mork
@ 2013-07-02  0:01   ` David Miller
  0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-07-02  0:01 UTC (permalink / raw)
  To: bjorn; +Cc: netdev, linux-usb

From: Bjørn Mork <bjorn@mork.no>
Date: Fri, 28 Jun 2013 17:17:50 +0200

> A standard Gobi 3000 reference design module.
> 
> Reported-by: Richard Weinberger <richard@nod.at>
> Signed-off-by: Bjørn Mork <bjorn@mork.no>

Applied.

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH 3/3] net: qmi_wwan: add TP-LINK MA260
  2013-06-28 15:17 ` [PATCH 3/3] net: qmi_wwan: add TP-LINK MA260 Bjørn Mork
@ 2013-07-02  0:02   ` David Miller
  0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2013-07-02  0:02 UTC (permalink / raw)
  To: bjorn; +Cc: netdev, linux-usb

From: Bjørn Mork <bjorn@mork.no>
Date: Fri, 28 Jun 2013 17:17:51 +0200

> Signed-off-by: Bjørn Mork <bjorn@mork.no>

Applied.

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2013-07-02  0:02 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-28 15:17 [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry Bjørn Mork
2013-06-28 15:17 ` [PATCH 2/3] net: qmi_wwan: add Option GTM681W Bjørn Mork
2013-07-02  0:01   ` David Miller
2013-06-28 15:17 ` [PATCH 3/3] net: qmi_wwan: add TP-LINK MA260 Bjørn Mork
2013-07-02  0:02   ` David Miller
2013-07-02  0:01 ` [PATCH 1/3] net: qmi_wwan: fixup Sierra Wireless MC8305 entry David Miller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).