readd back NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED to option.c [patch]

readd back NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED to option.c [patch]

[Santiago Garcia Mantinan]

Hi!

It looks like there was a mistake on Dirk De Schepper's patch commited by
gregkh on 4 Sep 2010 00:33:40 +0000 which can be seen here:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=c7aa8f44b4d1dc73591894a2dd6909213612d299

He removed NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED from the scruct while
moving things around, it was a bit difficult to see as the defines and the
struct are not on the same order.  We've carried this for a year and a half
and for what I've seen there have been some reports about this like:
https://bugs.launchpad.net/ubuntu/+source/usb-modeswitch/+bug/750362
but unfortunately it didn't get much attention.

I've looked at the strings and the only one missing was
NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED, so here is the patch for it.

--- option.c.old	2012-03-19 10:16:31.046565765 +0100
+++ option.c	2012-03-19 10:55:34.348846327 +0100
@@ -538,6 +538,7 @@
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) },
+	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED3) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5) },

Regards.
-- 
Manty/BestiaTester -> http://manty.net

Re: [PATCH] USB: option: re-add NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED to option_id array

[Jonathan Nieder]

(cc-ing some relevant people)
Hi,

Santiago Garcia Mantinan wrote:

> c7aa8f44b4d1dc73591894a2dd6909213612d299
[...]
>    removed NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED from the scruct while
> moving things around, it was a bit difficult to see as the defines and the
> struct are not on the same order.  We've carried this for a year and a half
> and for what I've seen there have been some reports about this like:
> https://bugs.launchpad.net/ubuntu/+source/usb-modeswitch/+bug/750362
> but unfortunately it didn't get much attention.
>
> I've looked at the strings and the only one missing was
> NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED, so here is the patch for it.

Thanks!  Can we have your sign-off?  See Documentation/SubmittingPatches,
item 12 "Sign your work", for what this means.

> --- option.c.old	2012-03-19 10:16:31.046565765 +0100
> +++ option.c	2012-03-19 10:55:34.348846327 +0100
> @@ -538,6 +538,7 @@
>  	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) },
>  	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) },
>  	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) },
> +	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) },
>  	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED3) },
>  	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4) },
>  	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5) },

Hope that helps,
Jonathan

[PATCH] USB: option: re-add NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED to option_id array

[Santiago Garcia Mantinan]

> Thanks!  Can we have your sign-off?  See Documentation/SubmittingPatches,
> item 12 "Sign your work", for what this means.

Sure, just thought that for a one liner that gets back to its place this was
not needed, here it goes with full paths on the patch ...



Re-add NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED to option_id array

Signed-off-by: Santiago Garcia Mantinan <manty@debian.org>

--- a/drivers/usb/serial/option.c	2012-03-19 10:16:31.046565765 +0100
+++ b/drivers/usb/serial/option.c	2012-03-19 10:55:34.348846327 +0100
@@ -538,6 +538,7 @@
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) },
+	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED3) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5) },

-- 
Manty/BestiaTester -> http://manty.net

[RFC/PATCH] USB: option: handle Novatel 3G modem 1410:7001 out of the box again

[Jonathan Nieder]

From: Santiago Garcia Mantinan <manty@debian.org>
Date: Mon, 19 Mar 2012 18:17:00 +0100

Since commit c7aa8f44b4d1 ("USB: option: fix incorrect novatel
entries"), the Novatel Mifi 2372 (USB id 1410:7001) is not recognized
by the option driver.  That commit removed that id from the list of
supported ids for no obvious reason --- perhaps it was just lost in
the shuffle.

Addresses http://bugs.debian.org/664605 and
          https://bugs.launchpad.net/bugs/750362

Signed-off-by: Santiago Garcia Mantinan <manty@debian.org>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Cc: <stable@vger.kernel.org> # >= 2.6.36
---
Santiago Garcia Mantinan wrote:

> here it goes with full paths on the patch ...

Great.  Here is the same with a commit message and all. ;-)  linux-usb
folks, what do you think?

 drivers/usb/serial/option.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index f9b11fb8e25c..4021f4d303bb 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -708,6 +708,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_EMBEDDED_FULLSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_EMBEDDED_FULLSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_EVDO_HIGHSPEED) },
+	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED3) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED4) },
 	{ USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_HSPA_HIGHSPEED5) },
-- 
1.7.10.rc1

Re: [RFC/PATCH] USB: option: handle Novatel 3G modem 1410:7001 out of the box again

[Greg KH]

On Mon, Mar 19, 2012 at 01:25:21PM -0500, Jonathan Nieder wrote:
> From: Santiago Garcia Mantinan <manty@debian.org>
> Date: Mon, 19 Mar 2012 18:17:00 +0100
> 
> Since commit c7aa8f44b4d1 ("USB: option: fix incorrect novatel
> entries"), the Novatel Mifi 2372 (USB id 1410:7001) is not recognized
> by the option driver.  That commit removed that id from the list of
> supported ids for no obvious reason --- perhaps it was just lost in
> the shuffle.
> 
> Addresses http://bugs.debian.org/664605 and
>           https://bugs.launchpad.net/bugs/750362
> 
> Signed-off-by: Santiago Garcia Mantinan <manty@debian.org>
> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
> Cc: <stable@vger.kernel.org> # >= 2.6.36
> ---
> Santiago Garcia Mantinan wrote:
> 
> > here it goes with full paths on the patch ...
> 
> Great.  Here is the same with a commit message and all. ;-)  linux-usb
> folks, what do you think?

Looks good, thanks, I'll queue it up after I get this latest round of
patches all off to Linus.  That means I will not be able to get to it
probably until after 3.4-rc1 is out, but don't worry, it's not lost.

thanks,

greg k-h