aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2012-06-05 17:18:10 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-17 14:23:11 -0400
commit8f509b694f5d1f287188bdd3df11aafccc911c11 (patch)
treef14f860370c9e8c7862067cdc6744b54dd433d66
parentf90b005ff35ab8e6ed3ddcbf79dee0baa48c429a (diff)
net: sierra_net: device IDs for Aircard 320U++
commit dd03cff23d694cfb0fdae80cb618e7ced05ea696 upstream. Adding device IDs for Aircard 320U and two other devices found in the out-of-tree version of this driver. Cc: linux@sierrawireless.com Cc: Autif Khan <autif.mlist@gmail.com> Cc: Tom Cassidy <tomas.cassidy@gmail.com> Signed-off-by: Bjørn Mork <bjorn@mork.no> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/usb/sierra_net.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/net/usb/sierra_net.c b/drivers/net/usb/sierra_net.c
index ed1b4321058..864448b7612 100644
--- a/drivers/net/usb/sierra_net.c
+++ b/drivers/net/usb/sierra_net.c
@@ -943,7 +943,7 @@ struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
943} 943}
944 944
945static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 }; 945static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 };
946static const struct sierra_net_info_data sierra_net_info_data_68A3 = { 946static const struct sierra_net_info_data sierra_net_info_data_direct_ip = {
947 .rx_urb_size = 8 * 1024, 947 .rx_urb_size = 8 * 1024,
948 .whitelist = { 948 .whitelist = {
949 .infolen = ARRAY_SIZE(sierra_net_ifnum_list), 949 .infolen = ARRAY_SIZE(sierra_net_ifnum_list),
@@ -951,7 +951,7 @@ static const struct sierra_net_info_data sierra_net_info_data_68A3 = {
951 } 951 }
952}; 952};
953 953
954static const struct driver_info sierra_net_info_68A3 = { 954static const struct driver_info sierra_net_info_direct_ip = {
955 .description = "Sierra Wireless USB-to-WWAN Modem", 955 .description = "Sierra Wireless USB-to-WWAN Modem",
956 .flags = FLAG_WWAN | FLAG_SEND_ZLP, 956 .flags = FLAG_WWAN | FLAG_SEND_ZLP,
957 .bind = sierra_net_bind, 957 .bind = sierra_net_bind,
@@ -959,12 +959,18 @@ static const struct driver_info sierra_net_info_68A3 = {
959 .status = sierra_net_status, 959 .status = sierra_net_status,
960 .rx_fixup = sierra_net_rx_fixup, 960 .rx_fixup = sierra_net_rx_fixup,
961 .tx_fixup = sierra_net_tx_fixup, 961 .tx_fixup = sierra_net_tx_fixup,
962 .data = (unsigned long)&sierra_net_info_data_68A3, 962 .data = (unsigned long)&sierra_net_info_data_direct_ip,
963}; 963};
964 964
965static const struct usb_device_id products[] = { 965static const struct usb_device_id products[] = {
966 {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */ 966 {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */
967 .driver_info = (unsigned long) &sierra_net_info_68A3}, 967 .driver_info = (unsigned long) &sierra_net_info_direct_ip},
968 {USB_DEVICE(0x0F3D, 0x68A3), /* AT&T Direct IP modem */
969 .driver_info = (unsigned long) &sierra_net_info_direct_ip},
970 {USB_DEVICE(0x1199, 0x68AA), /* Sierra Wireless Direct IP LTE modem */
971 .driver_info = (unsigned long) &sierra_net_info_direct_ip},
972 {USB_DEVICE(0x0F3D, 0x68AA), /* AT&T Direct IP LTE modem */
973 .driver_info = (unsigned long) &sierra_net_info_direct_ip},
968 974
969 {}, /* last item */ 975 {}, /* last item */
970}; 976};