* [PATCH] net: sierra_net: device IDs for Aircard 320U++ [not found] ` <20120605212414.GB6526-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org> @ 2012-06-06 7:18 ` Bjørn Mork [not found] ` <1338967090-7119-1-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Bjørn Mork @ 2012-06-06 7:18 UTC (permalink / raw) To: netdev-u79uwXL29TY76Z2rM5mHXA Cc: linux-usb-u79uwXL29TY76Z2rM5mHXA, Greg KH, Dan Williams, Bjørn Mork, linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8, Autif Khan, Tom Cassidy, stable-u79uwXL29TY76Z2rM5mHXA Adding device IDs for Aircard 320U and two other devices found in the out-of-tree version of this driver. Cc: linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8@public.gmane.org Cc: Autif Khan <autif.mlist-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: Tom Cassidy <tomas.cassidy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Signed-off-by: Bjørn Mork <bjorn-yOkvZcmFvRU@public.gmane.org> --- drivers/net/usb/sierra_net.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c index 3faef56..d75d1f5 100644 --- a/drivers/net/usb/sierra_net.c +++ b/drivers/net/usb/sierra_net.c @@ -946,7 +946,7 @@ struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb, } static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 }; -static const struct sierra_net_info_data sierra_net_info_data_68A3 = { +static const struct sierra_net_info_data sierra_net_info_data_direct_ip = { .rx_urb_size = 8 * 1024, .whitelist = { .infolen = ARRAY_SIZE(sierra_net_ifnum_list), @@ -954,7 +954,7 @@ static const struct sierra_net_info_data sierra_net_info_data_68A3 = { } }; -static const struct driver_info sierra_net_info_68A3 = { +static const struct driver_info sierra_net_info_direct_ip = { .description = "Sierra Wireless USB-to-WWAN Modem", .flags = FLAG_WWAN | FLAG_SEND_ZLP, .bind = sierra_net_bind, @@ -962,12 +962,18 @@ static const struct driver_info sierra_net_info_68A3 = { .status = sierra_net_status, .rx_fixup = sierra_net_rx_fixup, .tx_fixup = sierra_net_tx_fixup, - .data = (unsigned long)&sierra_net_info_data_68A3, + .data = (unsigned long)&sierra_net_info_data_direct_ip, }; static const struct usb_device_id products[] = { {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */ - .driver_info = (unsigned long) &sierra_net_info_68A3}, + .driver_info = (unsigned long) &sierra_net_info_direct_ip}, + {USB_DEVICE(0x0F3D, 0x68A3), /* AT&T Direct IP modem */ + .driver_info = (unsigned long) &sierra_net_info_direct_ip}, + {USB_DEVICE(0x1199, 0x68AA), /* Sierra Wireless Direct IP LTE modem */ + .driver_info = (unsigned long) &sierra_net_info_direct_ip}, + {USB_DEVICE(0x0F3D, 0x68AA), /* AT&T Direct IP LTE modem */ + .driver_info = (unsigned long) &sierra_net_info_direct_ip}, {}, /* last item */ }; -- 1.7.10 -- 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 ^ permalink raw reply related [flat|nested] 6+ messages in thread
[parent not found: <1338967090-7119-1-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org>]
* Re: [PATCH] net: sierra_net: device IDs for Aircard 320U++ [not found] ` <1338967090-7119-1-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org> @ 2012-06-06 8:12 ` Greg KH [not found] ` <20120606081246.GB7306-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Greg KH @ 2012-06-06 8:12 UTC (permalink / raw) To: Bjørn Mork Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA, Dan Williams, linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8, Autif Khan, Tom Cassidy, stable-u79uwXL29TY76Z2rM5mHXA On Wed, Jun 06, 2012 at 09:18:10AM +0200, Bjørn Mork wrote: > Adding device IDs for Aircard 320U and two other devices > found in the out-of-tree version of this driver. > > Cc: linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8@public.gmane.org > Cc: Autif Khan <autif.mlist-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > Cc: Tom Cassidy <tomas.cassidy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > Signed-off-by: Bjørn Mork <bjorn-yOkvZcmFvRU@public.gmane.org> > --- > drivers/net/usb/sierra_net.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) Wait, Tom just sent me a patch adding these device ids to the sierra serial driver, why would the same device work for both drivers? Where should the device id go? confused, greg k-h -- 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20120606081246.GB7306-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] net: sierra_net: device IDs for Aircard 320U++ [not found] ` <20120606081246.GB7306-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org> @ 2012-06-06 8:19 ` Bjørn Mork [not found] ` <87wr3kua2k.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: Bjørn Mork @ 2012-06-06 8:19 UTC (permalink / raw) To: Greg KH Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA, Dan Williams, linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8, Autif Khan, Tom Cassidy, stable-u79uwXL29TY76Z2rM5mHXA Greg KH <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> writes: > On Wed, Jun 06, 2012 at 09:18:10AM +0200, Bjørn Mork wrote: >> Adding device IDs for Aircard 320U and two other devices >> found in the out-of-tree version of this driver. >> >> Cc: linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8@public.gmane.org >> Cc: Autif Khan <autif.mlist-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> >> Cc: Tom Cassidy <tomas.cassidy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> >> Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org >> Signed-off-by: Bjørn Mork <bjorn-yOkvZcmFvRU@public.gmane.org> >> --- >> drivers/net/usb/sierra_net.c | 14 ++++++++++---- >> 1 file changed, 10 insertions(+), 4 deletions(-) > > Wait, Tom just sent me a patch adding these device ids to the sierra > serial driver, why would the same device work for both drivers? Because it's a composite device. Was this a trick question? :-) > Where should the device id go? To both drivers. The device is similar to the 1199:68a3 device already supported by both drivers. It has a number of serial ports (depending on how many features like GPS etc is enabled) supported by the "sierra" driver and one ethernet interface speaking Sierra's HIP protocol supported by the "sierra_net" driver. Bjørn -- 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <87wr3kua2k.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org>]
* Re: [PATCH] net: sierra_net: device IDs for Aircard 320U++ [not found] ` <87wr3kua2k.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org> @ 2012-06-06 12:16 ` Greg KH 2012-06-06 17:40 ` David Miller 0 siblings, 1 reply; 6+ messages in thread From: Greg KH @ 2012-06-06 12:16 UTC (permalink / raw) To: Bjørn Mork Cc: netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA, Dan Williams, linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8, Autif Khan, Tom Cassidy, stable-u79uwXL29TY76Z2rM5mHXA On Wed, Jun 06, 2012 at 10:19:15AM +0200, Bjørn Mork wrote: > Greg KH <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> writes: > > On Wed, Jun 06, 2012 at 09:18:10AM +0200, Bjørn Mork wrote: > >> Adding device IDs for Aircard 320U and two other devices > >> found in the out-of-tree version of this driver. > >> > >> Cc: linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8@public.gmane.org > >> Cc: Autif Khan <autif.mlist-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > >> Cc: Tom Cassidy <tomas.cassidy-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> > >> Cc: stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org > >> Signed-off-by: Bjørn Mork <bjorn-yOkvZcmFvRU@public.gmane.org> > >> --- > >> drivers/net/usb/sierra_net.c | 14 ++++++++++---- > >> 1 file changed, 10 insertions(+), 4 deletions(-) > > > > Wait, Tom just sent me a patch adding these device ids to the sierra > > serial driver, why would the same device work for both drivers? > > Because it's a composite device. Was this a trick question? :-) > > > Where should the device id go? > > To both drivers. The device is similar to the 1199:68a3 device already > supported by both drivers. It has a number of serial ports (depending > on how many features like GPS etc is enabled) supported by the "sierra" > driver and one ethernet interface speaking Sierra's HIP protocol > supported by the "sierra_net" driver. Ok, thanks for clearing that up, I'll take the serial patch, and I'm sure that David will take this one. Acked-by: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> -- 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] net: sierra_net: device IDs for Aircard 320U++ 2012-06-06 12:16 ` Greg KH @ 2012-06-06 17:40 ` David Miller [not found] ` <20120606.104018.1721491470277229085.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> 0 siblings, 1 reply; 6+ messages in thread From: David Miller @ 2012-06-06 17:40 UTC (permalink / raw) To: gregkh Cc: bjorn, netdev, linux-usb, dcbw, linux, autif.mlist, tomas.cassidy, stable From: Greg KH <gregkh@linuxfoundation.org> Date: Wed, 6 Jun 2012 21:16:33 +0900 > Ok, thanks for clearing that up, I'll take the serial patch, and I'm > sure that David will take this one. > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> I'll apply this, thanks. Greg, could you not put that TAB at the beginning of your signoffs? It causes patchwork not to pick them up so I have to add it manually. Thanks. ^ permalink raw reply [flat|nested] 6+ messages in thread
[parent not found: <20120606.104018.1721491470277229085.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>]
* Re: [PATCH] net: sierra_net: device IDs for Aircard 320U++ [not found] ` <20120606.104018.1721491470277229085.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org> @ 2012-06-06 21:15 ` Greg KH 0 siblings, 0 replies; 6+ messages in thread From: Greg KH @ 2012-06-06 21:15 UTC (permalink / raw) To: David Miller Cc: bjorn-yOkvZcmFvRU, netdev-u79uwXL29TY76Z2rM5mHXA, linux-usb-u79uwXL29TY76Z2rM5mHXA, dcbw-H+wXaHxf7aLQT0dZR+AlfA, linux-ywE8TTl5eJHWpu6QEFMNjNBPR1lH4CV8, autif.mlist-Re5JQEeQqe8AvxtiuMwx3w, tomas.cassidy-Re5JQEeQqe8AvxtiuMwx3w, stable-u79uwXL29TY76Z2rM5mHXA On Wed, Jun 06, 2012 at 10:40:18AM -0700, David Miller wrote: > From: Greg KH <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> > Date: Wed, 6 Jun 2012 21:16:33 +0900 > > > Ok, thanks for clearing that up, I'll take the serial patch, and I'm > > sure that David will take this one. > > > > Acked-by: Greg Kroah-Hartman <gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org> > > I'll apply this, thanks. > > Greg, could you not put that TAB at the beginning of your > signoffs? It causes patchwork not to pick them up so I have > to add it manually. Sorry, I didn't know that, I'll not do that in the future. greg k-h -- 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 ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-06-06 21:15 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20120605212414.GB6526@kroah.com>
[not found] ` <20120605212414.GB6526-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2012-06-06 7:18 ` [PATCH] net: sierra_net: device IDs for Aircard 320U++ Bjørn Mork
[not found] ` <1338967090-7119-1-git-send-email-bjorn-yOkvZcmFvRU@public.gmane.org>
2012-06-06 8:12 ` Greg KH
[not found] ` <20120606081246.GB7306-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2012-06-06 8:19 ` Bjørn Mork
[not found] ` <87wr3kua2k.fsf-lbf33ChDnrE/G1V5fR+Y7Q@public.gmane.org>
2012-06-06 12:16 ` Greg KH
2012-06-06 17:40 ` David Miller
[not found] ` <20120606.104018.1721491470277229085.davem-fT/PcQaiUtIeIZ0/mPfg9Q@public.gmane.org>
2012-06-06 21:15 ` Greg KH
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.