Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dd03cff2 authored by Bjørn Mork's avatar Bjørn Mork Committed by David S. Miller
Browse files

net: sierra_net: device IDs for Aircard 320U++ 



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>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarBjørn Mork <bjorn@mork.no>
Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9a43a026

drivers/net/usb/sierra_net.c

+10 −4
Original line number Original line Diff line number Diff line
@@ -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 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,

	.rx_urb_size = 8 * 1024,

	.whitelist = {

	.whitelist = {

		.infolen = ARRAY_SIZE(sierra_net_ifnum_list),

		.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",

	.description = "Sierra Wireless USB-to-WWAN Modem",

	.flags = FLAG_WWAN | FLAG_SEND_ZLP,

	.flags = FLAG_WWAN | FLAG_SEND_ZLP,

	.bind = sierra_net_bind,

	.bind = sierra_net_bind,
@@ -962,12 +962,18 @@ static const struct driver_info sierra_net_info_68A3 = { 
	.status = sierra_net_status,

	.status = sierra_net_status,

	.rx_fixup = sierra_net_rx_fixup,

	.rx_fixup = sierra_net_rx_fixup,

	.tx_fixup = sierra_net_tx_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[] = {

static const struct usb_device_id products[] = {

	{USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless USB-to-WWAN modem */

	{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 */

	{}, /* last item */

};

};