| Message ID | 1290627352.1739.19.camel@filip-linux |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello. On 24-11-2010 22:35, Filip Aben 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> > --- > diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c > index b154a94..b05c235 100644 > --- a/drivers/net/usb/hso.c > +++ b/drivers/net/usb/hso.c > @@ -2994,10 +2994,10 @@ 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) > + if ((port_spec& HSO_PORT_MASK) == HSO_PORT_NETWORK) { > + if(!disable_net) Don't use spaces for indentation. WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 24-11-2010 22:35, Filip Aben 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> > --- > diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c > index b154a94..b05c235 100644 > --- a/drivers/net/usb/hso.c > +++ b/drivers/net/usb/hso.c > @@ -2994,10 +2994,10 @@ 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) > + if ((port_spec& HSO_PORT_MASK) == HSO_PORT_NETWORK) { > + if(!disable_net) > hso_dev = hso_create_net_device(interface, port_spec); > - else > + } else There should now be {} on the *else* branch too, according to CodingStyle. > hso_dev = > hso_create_bulk_serial_device(interface, port_spec); > if (!hso_dev) WBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Nov 24, 2010 at 8:35 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. Looks good apart from the indentation issue pointed out by Sergei (you should also indent the hso_create_net_device line). As I mentioned in another thread, this was actually suggested about a year ago but was never accepted due to patch corruption (the other two patches submitted as part of that series also seem to have been plain wrong, though): http://kerneltrap.org/mailarchive/linux-netdev/2009/11/19/6261572 Thanks, Johan -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c index b154a94..b05c235 100644 --- a/drivers/net/usb/hso.c +++ b/drivers/net/usb/hso.c @@ -2994,10 +2994,10 @@ 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) + if ((port_spec & HSO_PORT_MASK) == HSO_PORT_NETWORK) { + if(!disable_net) hso_dev = hso_create_net_device(interface, port_spec); - else + } else hso_dev = hso_create_bulk_serial_device(interface, port_spec); if (!hso_dev)
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> --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html