[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.21 / 0034-net-sierra_net-device-IDs-for-Aircard-320U.patch
1 From a6d6029227b3b65257a974953df957d28ea190e7 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Bj=C3=B8rn=20Mork?= <bjorn@mork.no>
3 Date: Tue, 5 Jun 2012 21:18:10 +0000
4 Subject: [PATCH 34/67] net: sierra_net: device IDs for Aircard 320U++
5 MIME-Version: 1.0
6 Content-Type: text/plain; charset=UTF-8
7 Content-Transfer-Encoding: 8bit
9 commit dd03cff23d694cfb0fdae80cb618e7ced05ea696 upstream.
11 Adding device IDs for Aircard 320U and two other devices
12 found in the out-of-tree version of this driver.
14 Cc: linux@sierrawireless.com
15 Cc: Autif Khan <autif.mlist@gmail.com>
16 Cc: Tom Cassidy <tomas.cassidy@gmail.com>
17 Signed-off-by: Bjørn Mork <bjorn@mork.no>
18 Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
19 Signed-off-by: David S. Miller <davem@davemloft.net>
20 Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
21 ---
22 drivers/net/usb/sierra_net.c | 14 ++++++++++----
23 1 file changed, 10 insertions(+), 4 deletions(-)
25 diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
26 index ed1b432..864448b 100644
27 --- a/drivers/net/usb/sierra_net.c
28 +++ b/drivers/net/usb/sierra_net.c
29 @@ -943,7 +943,7 @@ struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
30 }
32 static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 };
33 -static const struct sierra_net_info_data sierra_net_info_data_68A3 = {
34 +static const struct sierra_net_info_data sierra_net_info_data_direct_ip = {
35 .rx_urb_size = 8 * 1024,
36 .whitelist = {
37 .infolen = ARRAY_SIZE(sierra_net_ifnum_list),
38 @@ -951,7 +951,7 @@ static const struct sierra_net_info_data sierra_net_info_data_68A3 = {
39 }
40 };
42 -static const struct driver_info sierra_net_info_68A3 = {
43 +static const struct driver_info sierra_net_info_direct_ip = {
44 .description = "Sierra Wireless USB-to-WWAN Modem",
45 .flags = FLAG_WWAN | FLAG_SEND_ZLP,
46 .bind = sierra_net_bind,
47 @@ -959,12 +959,18 @@ static const struct driver_info sierra_net_info_68A3 = {
48 .status = sierra_net_status,
49 .rx_fixup = sierra_net_rx_fixup,
50 .tx_fixup = sierra_net_tx_fixup,
51 - .data = (unsigned long)&sierra_net_info_data_68A3,
52 + .data = (unsigned long)&sierra_net_info_data_direct_ip,
53 };
55 static const struct usb_device_id products[] = {
56 {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */
57 - .driver_info = (unsigned long) &sierra_net_info_68A3},
58 + .driver_info = (unsigned long) &sierra_net_info_direct_ip},
59 + {USB_DEVICE(0x0F3D, 0x68A3), /* AT&T Direct IP modem */
60 + .driver_info = (unsigned long) &sierra_net_info_direct_ip},
61 + {USB_DEVICE(0x1199, 0x68AA), /* Sierra Wireless Direct IP LTE modem */
62 + .driver_info = (unsigned long) &sierra_net_info_direct_ip},
63 + {USB_DEVICE(0x0F3D, 0x68AA), /* AT&T Direct IP LTE modem */
64 + .driver_info = (unsigned long) &sierra_net_info_direct_ip},
66 {}, /* last item */
67 };
68 --
69 1.7.9.5