[PATCHv2] hso: fix disable_net

[PATCHv2] hso: fix disable_net

[Filip Aben]

The HSO driver incorrectly creates a serial device instead of a net
device when disable_net is set. It shouldn't create anything for the
network interface.

Signed-off-by: Filip Aben <f.aben-x9gZzRpC1QbQT0dZR+AlfA@public.gmane.org>
---
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index b154a94..1b755ae 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -2994,12 +2994,14 @@ static int hso_probe(struct usb_interface *interface,
 
 	case HSO_INTF_BULK:
 		/* It's a regular bulk interface */
-		if (((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) &&
-		    !disable_net)
-			hso_dev = hso_create_net_device(interface, port_spec);
-		else
+		if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) { 
+			if(!disable_net)
+				hso_dev =
+				    hso_create_net_device(interface, port_spec);
+		} else {
 			hso_dev =
 			    hso_create_bulk_serial_device(interface, port_spec);
+		}
 		if (!hso_dev)
 			goto exit;
 		break;

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCHv2] hso: fix disable_net

[Johan Hovold]

On Thu, Nov 25, 2010 at 2:40 PM, Filip Aben <f.aben@option.com> wrote:
> The HSO driver incorrectly creates a serial device instead of a net
> device when disable_net is set. It shouldn't create anything for the
> network interface.
>
> Signed-off-by: Filip Aben <f.aben@option.com>

Please add the appropriate Reported-by-tags as well, e.g.

Reported-by: Piotr Isajew <pki@ex.com.pl>
Reported-by: Johan Hovold <jhovold@gmail.com>

As this patch is meant to fix a driver crash, perhaps it should be marked for
stable as well?

Thanks,
Johan

Re: [PATCHv2] hso: fix disable_net

[Filip Aben]

On Thu, 2010-11-25 at 16:03 +0100, Johan Hovold wrote:
> On Thu, Nov 25, 2010 at 2:40 PM, Filip Aben <f.aben-x9gZzRpC1QbQT0dZR+AlfA@public.gmane.org> wrote:
> > The HSO driver incorrectly creates a serial device instead of a net
> > device when disable_net is set. It shouldn't create anything for the
> > network interface.
> >
> > Signed-off-by: Filip Aben <f.aben-x9gZzRpC1QbQT0dZR+AlfA@public.gmane.org>
> 
> Please add the appropriate Reported-by-tags as well, e.g.
> 
> Reported-by: Piotr Isajew <pki-/L4m51SJ8HhmR6Xm/wNWPw@public.gmane.org>
> Reported-by: Johan Hovold <jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>

I would have gladly done so if you included that in your comment on the
previous patch :)

> 
> As this patch is meant to fix a driver crash, perhaps it should be marked for
> stable as well?
> 

I don't think it's that critical: it only applies to people explicitly
loading the module with disable_net set. But feel free to queue it up
for stable.

Thanks,

Filip-



--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCHv2] hso: fix disable_net

[Johan Hovold]

On Thu, Nov 25, 2010 at 5:01 PM, Filip Aben <f.aben-x9gZzRpC1QbQT0dZR+AlfA@public.gmane.org> wrote:
> On Thu, 2010-11-25 at 16:03 +0100, Johan Hovold wrote:
>> Please add the appropriate Reported-by-tags as well, e.g.
>>
>> Reported-by: Piotr Isajew <pki-/L4m51SJ8HhmR6Xm/wNWPw@public.gmane.org>
>> Reported-by: Johan Hovold <jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>
> I would have gladly done so if you included that in your comment on the
> previous patch :)

What is stopping you from submitting a v3? :)

But perhaps David can pick those up from the thread. Not sure how this
is usually dealt with on netdev.

Thanks,
Johan
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCHv2] hso: fix disable_net

[Jan Ceuleers]

On 25/11/10 17:25, Johan Hovold wrote:
> On Thu, Nov 25, 2010 at 5:01 PM, Filip Aben<f.aben@option.com>  wrote:
>> On Thu, 2010-11-25 at 16:03 +0100, Johan Hovold wrote:
>>> Please add the appropriate Reported-by-tags as well, e.g.
>>>
>>> Reported-by: Piotr Isajew<pki@ex.com.pl>
>>> Reported-by: Johan Hovold<jhovold@gmail.com>
>>
>> I would have gladly done so if you included that in your comment on the
>> previous patch :)
>
> What is stopping you from submitting a v3? :)
>
> But perhaps David can pick those up from the thread. Not sure how this
> is usually dealt with on netdev.

Automatically taken care of by patchwork:

http://patchwork.ozlabs.org/patch/73060/mbox/

Re: [PATCHv2] hso: fix disable_net

[David Miller]

From: Jan Ceuleers <jan.ceuleers-bdq14YP6qtRg9hUCZPvPmw@public.gmane.org>
Date: Fri, 26 Nov 2010 21:18:12 +0100

> On 25/11/10 17:25, Johan Hovold wrote:
>> On Thu, Nov 25, 2010 at 5:01 PM, Filip Aben<f.aben-x9gZzRpC1QbQT0dZR+AlfA@public.gmane.org>  wrote:
>>> On Thu, 2010-11-25 at 16:03 +0100, Johan Hovold wrote:
>>>> Please add the appropriate Reported-by-tags as well, e.g.
>>>>
>>>> Reported-by: Piotr Isajew<pki-/L4m51SJ8HhmR6Xm/wNWPw@public.gmane.org>
>>>> Reported-by: Johan Hovold<jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
>>>
>>> I would have gladly done so if you included that in your comment on
>>> the
>>> previous patch :)
>>
>> What is stopping you from submitting a v3? :)
>>
>> But perhaps David can pick those up from the thread. Not sure how this
>> is usually dealt with on netdev.
> 
> Automatically taken care of by patchwork:
> 
> http://patchwork.ozlabs.org/patch/73060/mbox/

Right :-)

I'll apply this, thanks.
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html