summaryrefslogtreecommitdiffstats
path: root/package/system
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-17 15:11:43 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-17 15:11:43 +0000
commit729e3e48e69b8d32b194babdb0b0a6af21e56ea4 (patch)
treeaac1dd24e7cf8f08a119d7d04a2815b6a76f4cb1 /package/system
parent9d5658343af4a7bd990a70196a26b7e0fddaca1d (diff)
sierra-directip: delete, replaced by upstream drivers
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34738 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/system')
-rw-r--r--package/system/sierra-directip/Makefile41
-rw-r--r--package/system/sierra-directip/patches/100-sierra_net_endian.patch22
-rw-r--r--package/system/sierra-directip/patches/110-drop_dhcp_requirement.patch14
-rw-r--r--package/system/sierra-directip/src/Makefile1
-rw-r--r--package/system/sierra-directip/src/sierra.c1409
-rw-r--r--package/system/sierra-directip/src/sierra_net.c1123
6 files changed, 0 insertions, 2610 deletions
diff --git a/package/system/sierra-directip/Makefile b/package/system/sierra-directip/Makefile
deleted file mode 100644
index fc0e4ea52..000000000
--- a/package/system/sierra-directip/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=sierra-directip
-PKG_RELEASE:=10
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/usb-sierrawireless-directip
- SUBMENU:=USB Support
- DEPENDS:=+kmod-usb-serial +kmod-usb-net
- TITLE:=Updated Sierra Wireless drivers for DirectIP
- FILES:= \
- $(PKG_BUILD_DIR)/sierra.ko \
- $(PKG_BUILD_DIR)/sierra_net.ko
- AUTOLOAD:=$(call AutoLoad,60,sierra sierra_net)
-endef
-
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
- $(CP) ./src/* $(PKG_BUILD_DIR)/
- $(Build/Patch)
-endef
-
-define Build/Compile
- $(MAKE) -C "$(LINUX_DIR)" \
- CROSS_COMPILE="$(TARGET_CROSS)" \
- ARCH="$(LINUX_KARCH)" \
- SUBDIRS="$(PKG_BUILD_DIR)" \
- EXTRA_CFLAGS="$(BUILDFLAGS)" \
- modules
-endef
-
-$(eval $(call KernelPackage,usb-sierrawireless-directip))
diff --git a/package/system/sierra-directip/patches/100-sierra_net_endian.patch b/package/system/sierra-directip/patches/100-sierra_net_endian.patch
deleted file mode 100644
index 196d77d49..000000000
--- a/package/system/sierra-directip/patches/100-sierra_net_endian.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/sierra_net.c
-+++ b/sierra_net.c
-@@ -840,8 +840,8 @@ static int sierra_net_bind(struct usbnet
- init_timer(&priv->sync_timer);
- /* verify fw attributes */
- status = sierra_net_get_fw_attr(dev, &fwattr);
-- dev_dbg(&dev->udev->dev, "Fw attr: %x\n", fwattr);
-- if (status == sizeof(fwattr) && (fwattr & SWI_GET_FW_ATTR_APM)) {
-+ dev_dbg(&dev->udev->dev, "Fw attr: %x\n", cpu_to_le16(fwattr));
-+ if (status == sizeof(fwattr) && (cpu_to_le16(fwattr) & SWI_GET_FW_ATTR_APM)) {
- /*******************************************************************************
- * If you want the default /sys/bus/usb/devices/.../.../power/level to be forced
- * to auto, the following needs to be compiled in.
-@@ -856,7 +856,7 @@ static int sierra_net_bind(struct usbnet
- usb_disable_autosuspend(dev->udev);
- }
- /* test whether firmware supports DHCP */
-- if (!(status == sizeof(fwattr) && (fwattr & SWI_GET_FW_ATTR_MASK))) {
-+ if (!(status == sizeof(fwattr) && (cpu_to_le16(fwattr) & SWI_GET_FW_ATTR_MASK))) {
- /* found incompatible firmware version */
- dev_err(&dev->udev->dev, "Incompatible driver and firmware"
- " versions\n");
diff --git a/package/system/sierra-directip/patches/110-drop_dhcp_requirement.patch b/package/system/sierra-directip/patches/110-drop_dhcp_requirement.patch
deleted file mode 100644
index 4c4d0ba65..000000000
--- a/package/system/sierra-directip/patches/110-drop_dhcp_requirement.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/sierra_net.c
-+++ b/sierra_net.c
-@@ -858,10 +858,7 @@ static int sierra_net_bind(struct usbnet
- /* test whether firmware supports DHCP */
- if (!(status == sizeof(fwattr) && (cpu_to_le16(fwattr) & SWI_GET_FW_ATTR_MASK))) {
- /* found incompatible firmware version */
-- dev_err(&dev->udev->dev, "Incompatible driver and firmware"
-- " versions\n");
-- kfree(priv);
-- return -ENODEV;
-+ dev_err(&dev->udev->dev, "Warning: Firmware does not have DHCP support\n");
- }
- /* prepare sync message from template */
- memcpy(priv->sync_msg, sync_tmplate, sizeof(priv->sync_msg));
diff --git a/package/system/sierra-directip/src/Makefile b/package/system/sierra-directip/src/Makefile
deleted file mode 100644
index 7ceb03b58..000000000
--- a/package/system/sierra-directip/src/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-obj-m := sierra.o sierra_net.o
diff --git a/package/system/sierra-directip/src/sierra.c b/package/system/sierra-directip/src/sierra.c
deleted file mode 100644
index 9752d1142..000000000
--- a/package/system/sierra-directip/src/sierra.c
+++ /dev/null
@@ -1,1409 +0,0 @@
-/*
- USB Driver for Sierra Wireless
-
- Copyright (C) 2006, 2007, 2008 Kevin Lloyd <klloyd@sierrawireless.com>,
-
- Copyright (C) 2008 - 2011 Elina Pasheva, Matthew Safar, Rory Filer
- <linux@sierrawireless.com>
-
- IMPORTANT DISCLAIMER: This driver is not commercially supported by
- Sierra Wireless. Use at your own risk.
-
- This driver is free software; you can redistribute it and/or modify
- it under the terms of Version 2 of the GNU General Public License as
- published by the Free Software Foundation.
-
- Portions based on the option driver by Matthias Urlichs <smurf@smurf.noris.de>
- Whom based his on the Keyspan driver by Hugh Blemings <hugh@blemings.org>
-*/
-/* Uncomment to log function calls */
-/*#define DEBUG*/
-/* Uncomment to force power level set to auto when attaching a device */
-/*#define POWER_LEVEL_AUTO*/
-
-/* Sierra driver - kernel 3.0 */
-#define DRIVER_VERSION "v.1.7.40"
-#define DRIVER_AUTHOR "Kevin Lloyd, Elina Pasheva, Matthew Safar, Rory Filer"
-#define DRIVER_DESC "USB Driver for Sierra Wireless USB modems"
-
-#include <linux/kernel.h>
-#include <linux/jiffies.h>
-#include <linux/errno.h>
-#include <linux/tty.h>
-#include <linux/slab.h>
-#include <linux/tty_flip.h>
-#include <linux/module.h>
-#include <linux/usb.h>
-#include <linux/usb/serial.h>
-#include <asm/unaligned.h>
-
-#define SWIMS_USB_REQUEST_SetPower 0x00
-#define SWIMS_USB_REQUEST_GetFwAttr 0x06
-#define SWIMS_USB_REQUEST_SetNmea 0x07
-#define USB_REQUEST_TYPE_CLASS 0xA1
-#define USB_REQUEST_IFACE 0x20
-
-#define N_IN_URB_HM 8
-#define N_OUT_URB_HM 64
-#define N_IN_URB 4
-#define N_OUT_URB 4
-#define IN_BUFLEN 4096
-
-#define MAX_TRANSFER (PAGE_SIZE - 512)
-/* MAX_TRANSFER is chosen so that the VM is not stressed by
- allocations > PAGE_SIZE and the number of packets in a page
- is an integer 512 is the largest possible packet on EHCI */
-
-#define SWI_FW_ATTR_PM_MASK 0x02
-/* PORTION_LEN defines the length of device attribute buffer */
-#define PORTION_LEN 4096
-
-static int debug;
-static int nmea;
-
-/* sysfs attributes */
-static int sierra_create_sysfs_attrs(struct usb_serial_port *port);
-static int sierra_remove_sysfs_attrs(struct usb_serial_port *port);
-
-/* Used in interface blacklisting */
-struct sierra_iface_info {
- const u32 infolen; /* number of interface numbers on blacklist */
- const u8 *ifaceinfo; /* pointer to the array holding the numbers */
-};
-
-/* per interface statistics */
-struct sierra_intf_stats {
- atomic_t rx_bytes; /* received bytes */
- atomic_t indat_cb_cnt; /* indat callback count */
- atomic_t indat_cb_fail; /* indat cb with error */
-
- atomic_t tx_bytes; /* transmitted bytes */
- atomic_t write_cnt; /* no. of writes */
- atomic_t write_err; /* no. of failed writes */
-
- atomic_t delayed_writes; /* no. of delayed writes */
- atomic_t delayed_write_err; /* no. of delayed write errs */
-
- atomic_t outdat_cb_cnt; /* outdat callback count */
- atomic_t outdat_cb_fail; /* outdat cb with error */
-
-};
-
-struct sierra_intf_private {
- spinlock_t susp_lock;
- unsigned int suspended:1;
- int in_flight;
-
- struct sierra_intf_stats stats;
-};
-
-static int sierra_set_power_state(struct usb_device *udev, __u16 swiState)
-{
- int result;
- dev_dbg(&udev->dev, "%s\n", __func__);
- result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
- SWIMS_USB_REQUEST_SetPower, /* __u8 request */
- USB_TYPE_VENDOR, /* __u8 request type */
- swiState, /* __u16 value */
- 0, /* __u16 index */
- NULL, /* void *data */
- 0, /* __u16 size */
- USB_CTRL_SET_TIMEOUT); /* int timeout */
- return result;
-}
-
-static int sierra_vsc_set_nmea(struct usb_device *udev, __u16 enable)
-{
- int result;
- dev_dbg(&udev->dev, "%s\n", __func__);
- result = usb_control_msg(udev, usb_sndctrlpipe(udev, 0),
- SWIMS_USB_REQUEST_SetNmea, /* __u8 request */
- USB_TYPE_VENDOR, /* __u8 request type */
- enable, /* __u16 value */
- 0x0000, /* __u16 index */
- NULL, /* void *data */
- 0, /* __u16 size */
- USB_CTRL_SET_TIMEOUT); /* int timeout */
- return result;
-}
-
-static int sierra_get_fw_attr(struct usb_device *udev, u16 *data)
-{
- int result;
- u16 *attrdata;
-
- dev_dbg(&udev->dev, "%s\n", __func__);
-
- attrdata = kmalloc(sizeof(*attrdata), GFP_KERNEL);
- if (!attrdata)
- return -ENOMEM;
-
- result = usb_control_msg(udev,
- usb_rcvctrlpipe(udev, 0),
- SWIMS_USB_REQUEST_GetFwAttr, /* __u8 request*/
- USB_TYPE_VENDOR | USB_DIR_IN, /* request type*/
- 0x0000, /* __u16 value */
- 0x0000, /* __u16 index */
- attrdata, /* void *data */
- sizeof(*attrdata), /* _u16 size */
- USB_CTRL_SET_TIMEOUT); /* in timeout */
-
- if (result < 0) {
- kfree(attrdata);
- return -EIO;
- }
-
- *data = *attrdata;
-
- kfree(attrdata);
- return result;
-}
-
-static int sierra_calc_num_ports(struct usb_serial *serial)
-{
- int num_ports = 0;
- u8 ifnum, numendpoints;
-
- dev_dbg(&serial->dev->dev, "%s\n", __func__);
-
- ifnum = serial->interface->cur_altsetting->desc.bInterfaceNumber;
- numendpoints = serial->interface->cur_altsetting->desc.bNumEndpoints;
-
- /* Dummy interface present on some SKUs should be ignored */
- if (ifnum == 0x99)
- num_ports = 0;
- else if (numendpoints <= 3)
- num_ports = 1;
- else
- num_ports = (numendpoints-1)/2;
- return num_ports;
-}
-
-static int is_blacklisted(const u8 ifnum,
- const struct sierra_iface_info *blacklist)
-{
- const u8 *info;
- int i;
-
- if (blacklist) {
- info = blacklist->ifaceinfo;
-
- for (i = 0; i < blacklist->infolen; i++) {
- if (info[i] == ifnum)
- return 1;
- }
- }
- return 0;
-}
-
-static int is_himemory(const u8 ifnum,
- const struct sierra_iface_info *himemorylist)
-{
- const u8 *info;
- int i;
-
- if (himemorylist) {
- info = himemorylist->ifaceinfo;
-
- for (i=0; i < himemorylist->infolen; i++) {
- if (info[i] == ifnum)
- return 1;
- }
- }
- return 0;
-}
-
-static int sierra_calc_interface(struct usb_serial *serial)
-{
- int interface;
- struct usb_interface *p_interface;
- struct usb_host_interface *p_host_interface;
-
- /* Get the interface structure pointer from the serial struct */
- p_interface = serial->interface;
-
- /* Get a pointer to the host interface structure */
- p_host_interface = p_interface->cur_altsetting;
-
- /* read the interface descriptor for this active altsetting
- * to find out the interface number we are on */
- interface = p_host_interface->desc.bInterfaceNumber;
-
- return interface;
-}
-
-static int sierra_probe(struct usb_serial *serial,
- const struct usb_device_id *id)
-{
- int result = 0;
- struct usb_device *udev;
- struct sierra_intf_private *intfdata;
- u8 ifnum;
-
- udev = serial->dev;
- dev_dbg(&udev->dev, "%s\n", __func__);
-
- ifnum = sierra_calc_interface(serial);
- /*
- * If this interface supports more than 1 alternate
- * select the 2nd one
- */
- if (serial->interface->num_altsetting == 2) {
- dev_dbg(&udev->dev, "Selecting alt setting for interface %d\n",
- ifnum);
- /* We know the alternate setting is for composite USB interface
- * modems
- */
- usb_set_interface(udev, ifnum, 1);
- }
-
- /* ifnum could have changed - by calling usb_set_interface */
- ifnum = sierra_calc_interface(serial);
-
- if (is_blacklisted(ifnum,
- (struct sierra_iface_info *)id->driver_info)) {
- dev_dbg(&serial->dev->dev,
- "Ignoring blacklisted interface #%d\n", ifnum);
- return -ENODEV;
- }
-
- intfdata = serial->private = kzalloc(sizeof(struct sierra_intf_private),
- GFP_KERNEL);
- if (!intfdata)
- return -ENOMEM;
- spin_lock_init(&intfdata->susp_lock);
-
- return result;
-}
-
-/* interfaces with higher memory requirements */
-static const u8 hi_memory_typeA_ifaces[] = { 0, 2 };
-static const struct sierra_iface_info typeA_interface_list = {
- .infolen = ARRAY_SIZE(hi_memory_typeA_ifaces),
- .ifaceinfo = hi_memory_typeA_ifaces,
-};
-
-static const u8 hi_memory_typeB_ifaces[] = { 3, 4, 5, 6 };
-static const struct sierra_iface_info typeB_interface_list = {
- .infolen = ARRAY_SIZE(hi_memory_typeB_ifaces),
- .ifaceinfo = hi_memory_typeB_ifaces,
-};
-
-/* 'blacklist' of interfaces not served by this driver */
-static const u8 direct_ip_non_serial_ifaces[] = { 7, 8, 9, 10, 11 };
-static const struct sierra_iface_info direct_ip_interface_blacklist = {
- .infolen = ARRAY_SIZE( direct_ip_non_serial_ifaces ),
- .ifaceinfo = direct_ip_non_serial_ifaces,
-};
-
-static const struct usb_device_id id_table [] = {
- { USB_DEVICE(0x0F3D, 0x0112) }, /* Airprime/Sierra PC 5220 */
- { USB_DEVICE(0x03F0, 0x1B1D) }, /* HP ev2200 a.k.a MC5720 */
- { USB_DEVICE(0x03F0, 0x1E1D) }, /* HP hs2300 a.k.a MC8775 */
- { USB_DEVICE(0x03F0, 0x211D) }, /* HP ev2210 a.k.a MC5725 */
-
- { USB_DEVICE(0x1199, 0x0017) }, /* Sierra Wireless EM5625 */
- { USB_DEVICE(0x1199, 0x0018) }, /* Sierra Wireless MC5720 */
- { USB_DEVICE(0x1199, 0x0218) }, /* Sierra Wireless MC5720 */
- { USB_DEVICE(0x1199, 0x0020) }, /* Sierra Wireless MC5725 */
- { USB_DEVICE(0x1199, 0x0220) }, /* Sierra Wireless MC5725 */
- { USB_DEVICE(0x1199, 0x0022) }, /* Sierra Wireless EM5725 */
- { USB_DEVICE(0x1199, 0x0024) }, /* Sierra Wireless MC5727 */
- { USB_DEVICE(0x1199, 0x0224) }, /* Sierra Wireless MC5727 */
- { USB_DEVICE(0x1199, 0x0019) }, /* Sierra Wireless AirCard 595 */
- { USB_DEVICE(0x1199, 0x0021) }, /* Sierra Wireless AirCard 597E */
- { USB_DEVICE(0x1199, 0x0112) }, /* Sierra Wireless AirCard 580 */
- { USB_DEVICE(0x1199, 0x0120) }, /* Sierra Wireless USB Dongle 595U */
- { USB_DEVICE(0x1199, 0x0301) }, /* Sierra Wireless USB Dongle 250U/3G */
- /* Sierra Wireless MC5728 */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0400, 0xFF, 0xFF, 0xFF) },
-
- /* Sierra Wireless C597 */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0023, 0xFF, 0xFF, 0xFF) },
- /* Sierra Wireless T598 */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x0025, 0xFF, 0xFF, 0xFF) },
- { USB_DEVICE(0x1199, 0x0026) }, /* Sierra Wireless T11 */
- { USB_DEVICE(0x1199, 0x0027) }, /* Sierra Wireless AC402 */
- { USB_DEVICE(0x1199, 0x0028) }, /* Sierra Wireless MC5728 */
- { USB_DEVICE(0x114F, 0x6000) }, /* Sierra Wireless Q26 Elite */
-
- { USB_DEVICE(0x1199, 0x6802) }, /* Sierra Wireless MC8755 */
- { USB_DEVICE(0x1199, 0x6803) }, /* Sierra Wireless MC8765 */
- { USB_DEVICE(0x1199, 0x6804) }, /* Sierra Wireless MC8755 */
- { USB_DEVICE(0x1199, 0x6805) }, /* Sierra Wireless MC8765 */
- { USB_DEVICE(0x1199, 0x6808) }, /* Sierra Wireless MC8755 */
- { USB_DEVICE(0x1199, 0x6809) }, /* Sierra Wireless MC8765 */
- { USB_DEVICE(0x1199, 0x6812) }, /* Sierra Wireless MC8775 & AC 875U */
- { USB_DEVICE(0x1199, 0x6813) }, /* Sierra Wireless MC8775 */
- { USB_DEVICE(0x1199, 0x6815) }, /* Sierra Wireless MC8775 */
- { USB_DEVICE(0x1199, 0x6816) }, /* Sierra Wireless MC8775 */
- { USB_DEVICE(0x1199, 0x6820) }, /* Sierra Wireless AirCard 875 */
- { USB_DEVICE(0x1199, 0x6821) }, /* Sierra Wireless AirCard 875U */
- { USB_DEVICE(0x1199, 0x6822) }, /* Sierra Wireless AirCard 875E */
- { USB_DEVICE(0x1199, 0x6832) }, /* Sierra Wireless MC8780 */
- { USB_DEVICE(0x1199, 0x6833) }, /* Sierra Wireless MC8781 */
- { USB_DEVICE(0x1199, 0x6834) }, /* Sierra Wireless MC8780 */
- { USB_DEVICE(0x1199, 0x6835) }, /* Sierra Wireless MC8781 */
- { USB_DEVICE(0x1199, 0x6838) }, /* Sierra Wireless MC8780 */
- { USB_DEVICE(0x1199, 0x6839) }, /* Sierra Wireless MC8781 */
- { USB_DEVICE(0x1199, 0x683A) }, /* Sierra Wireless MC8785 */
- { USB_DEVICE(0x1199, 0x683B) }, /* Sierra Wireless MC8785 Composite */
- /* Sierra Wireless MC8790, MC8791, MC8792 Composite */
- { USB_DEVICE(0x1199, 0x683C) },
- { USB_DEVICE(0x1199, 0x683D) }, /* Sierra Wireless MC8791 Composite */
- /* Sierra Wireless MC8790, MC8791, MC8792 */
- { USB_DEVICE(0x1199, 0x683E) },
- { USB_DEVICE(0x1199, 0x6850) }, /* Sierra Wireless AirCard 880 */
- { USB_DEVICE(0x1199, 0x6851) }, /* Sierra Wireless AirCard 881 */
- { USB_DEVICE(0x1199, 0x6852) }, /* Sierra Wireless AirCard 880 E */
- { USB_DEVICE(0x1199, 0x6853) }, /* Sierra Wireless AirCard 881 E */
- { USB_DEVICE(0x1199, 0x6855) }, /* Sierra Wireless AirCard 880 U */
- { USB_DEVICE(0x1199, 0x6856) }, /* Sierra Wireless AirCard 881 U */
- { USB_DEVICE(0x1199, 0x6859) }, /* Sierra Wireless AirCard 885 E */
- { USB_DEVICE(0x1199, 0x685A) }, /* Sierra Wireless AirCard 885 E */
- /* Sierra Wireless C885 */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6880, 0xFF, 0xFF, 0xFF)},
- /* Sierra Wireless C888, Air Card 501, USB 303, USB 304 */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6890, 0xFF, 0xFF, 0xFF)},
- /* Sierra Wireless C22/C33 */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6891, 0xFF, 0xFF, 0xFF)},
- /* Sierra Wireless HSPA Non-Composite Device */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x6892, 0xFF, 0xFF, 0xFF)},
- { USB_DEVICE(0x1199, 0x6893) }, /* Sierra Wireless Device */
- /* Sierra Wireless Direct IP modems */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68A3, 0xFF, 0xFF, 0xFF),
- .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
- },
- /* AT&T Direct IP modems */
- { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68A3, 0xFF, 0xFF, 0xFF),
- .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
- },
- /* Sierra Wireless Direct IP LTE modems */
- { USB_DEVICE_AND_INTERFACE_INFO(0x1199, 0x68AA, 0xFF, 0xFF, 0xFF),
- .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
- },
- /* AT&T Direct IP LTE modems */
- { USB_DEVICE_AND_INTERFACE_INFO(0x0F3D, 0x68AA, 0xFF, 0xFF, 0xFF),
- .driver_info = (kernel_ulong_t)&direct_ip_interface_blacklist
- },
- /* Wireless 5720 VZW Mobile Broadband (EVDO Rev-A) Minicard GPS Port */
- { USB_DEVICE(0x413C, 0x8133) },
-
- { }
-};
-MODULE_DEVICE_TABLE(usb, id_table);
-
-/* per port private data */
-struct sierra_port_private {
- spinlock_t lock; /* lock the structure */
- int outstanding_urbs; /* number of out urbs in flight */
-
- struct usb_anchor active;
- struct usb_anchor delayed;
-
- int num_out_urbs;
- int num_in_urbs;
- /* Input endpoints and buffers for this port */
- struct urb *in_urbs[N_IN_URB_HM];
-
- /* Settings for the port */
- int rts_state; /* Handshaking pins (outputs) */
- int dtr_state;
- int cts_state; /* Handshaking pins (inputs) */
- int dsr_state;
- int dcd_state;
- int ri_state;
- unsigned int opened:1;
-};
-
-static int sierra_send_setup(struct usb_serial_port *port)
-{
- struct usb_serial *serial = port->serial;
- struct sierra_port_private *portdata = usb_get_serial_port_data(port);
- __u16 interface = 0;
- int val = 0;
- int do_send = 0;
- int retval;
-
- dev_dbg(&port->dev, "%s\n", __func__);
-
- if (portdata->dtr_state)
- val |= 0x01;
- if (portdata->rts_state)
- val |= 0x02;
-
- /* If composite device then properly report interface */
- if (serial->num_ports == 1) {
- interface = sierra_calc_interface(serial);
- /* Control message is sent only to interfaces with
- * interrupt_in endpoints
- */
- if (port->interrupt_in_urb) {
- /* send control message */
- do_send = 1;
- }
- }
-
- /* Otherwise the need to do non-composite mapping */
- else {
- if (port->bulk_out_endpointAddress == 2)
- interface = 0;
- else if (port->bulk_out_endpointAddress == 4)
- interface = 1;
- else if (port->bulk_out_endpointAddress == 5)
- interface = 2;
-
- do_send = 1;
- }
- if (!do_send)
- return 0;
-
- usb_autopm_get_interface(serial->interface);
- retval = usb_control_msg(serial->dev, usb_rcvctrlpipe(serial->dev, 0),
- 0x22, 0x21, val, interface, NULL, 0, USB_CTRL_SET_TIMEOUT);
- usb_autopm_put_interface(serial->interface);
-
- return retval;
-}
-
-static void sierra_set_termios(struct tty_struct *tty,
- struct usb_serial_port *port, struct ktermios *old_termios)
-{
- dev_dbg(&port->dev, "%s\n", __func__);
- tty_termios_copy_hw(tty->termios, old_termios);
- sierra_send_setup(port);
-}
-
-static int sierra_tiocmget(struct tty_struct *tty)
-{
- struct usb_serial_port *port = tty->driver_data;
- unsigned int value;
- struct sierra_port_private *portdata;
-
- dev_dbg(&port->dev, "%s\n", __func__);
- portdata = usb_get_serial_port_data(port);
-
- value = ((portdata->rts_state) ? TIOCM_RTS : 0) |
- ((portdata->dtr_state) ? TIOCM_DTR : 0) |
- ((portdata->cts_state) ? TIOCM_CTS : 0) |
- ((portdata->dsr_state) ? TIOCM_DSR : 0) |
- ((portdata->dcd_state) ? TIOCM_CAR : 0) |
- ((portdata->ri_state) ? TIOCM_RNG : 0);
-
- return value;
-}
-
-static int sierra_tiocmset(struct tty_struct *tty,
- unsigned int set, unsigned int clear)
-{
- struct usb_serial_port *port = tty->driver_data;
- struct sierra_port_private *portdata;
-
- portdata = usb_get_serial_port_data(port);
-
- if (set & TIOCM_RTS)
- portdata->rts_state = 1;
- if (set & TIOCM_DTR)
- portdata->dtr_state = 1;
-
- if (clear & TIOCM_RTS)
- portdata->rts_state = 0;
- if (clear & TIOCM_DTR)
- portdata->dtr_state = 0;
- return sierra_send_setup(port);
-}
-
-static void sierra_release_urb(struct urb *urb)
-{
- struct usb_serial_port *port;
- if (urb) {
- port = urb->context;
- dev_dbg(&port->dev, "%s: %p\n", __func__, urb);
- usb_free_urb(urb);
- }
-}
-
-/* Sysfs Attributes */
-
-static ssize_t show_suspend_status(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct usb_serial_port *port;
- struct sierra_port_private *portdata;
- struct sierra_intf_private *intfdata;
- unsigned long flags;
- unsigned int flag_suspended = 0;
-
- port = to_usb_serial_port(dev);
- portdata = usb_get_serial_port_data(port);
- intfdata = port->serial->private;
-
- spin_lock_irqsave(&intfdata->susp_lock, flags);
- flag_suspended = intfdata->suspended;
- spin_unlock_irqrestore(&intfdata->susp_lock, flags);
-
- return snprintf(buf, PORTION_LEN, "%i\n", flag_suspended);
-}
-
-static ssize_t show_stats(struct device *dev,
- struct device_attribute *attr, char *buf)
-{
- struct usb_serial_port *port;
- struct sierra_intf_private *intfdata;
-
- port = to_usb_serial_port(dev);
- intfdata = port->serial->private;
-
- return snprintf(buf, PORTION_LEN,
- "rx: %i B\tindat: %i\tindat err: %i\n"
- "tx: %i B\toutdat: %i\toutdat err: %i\n"
- "writes: %i\t\twrite err: %i\n"
- "delayed writes: %i\tdelayed write err: %i\n",
- atomic_read(&intfdata->stats.rx_bytes), atomic_read(&intfdata->stats.indat_cb_cnt), atomic_read(&intfdata->stats.indat_cb_fail),
- atomic_read(&intfdata->stats.tx_bytes), atomic_read(&intfdata->stats.outdat_cb_cnt), atomic_read(&intfdata->stats.outdat_cb_fail),
- atomic_read(&intfdata->stats.write_cnt), atomic_read(&intfdata->stats.write_err),
- atomic_read(&intfdata->stats.delayed_writes), atomic_read(&intfdata->stats.delayed_write_err)
- );
-}
-
-/* Read only suspend status */
-static DEVICE_ATTR(suspend_status, S_IWUSR | S_IRUGO, show_suspend_status,
- NULL);
-
-/* Read only statistics */
-static DEVICE_ATTR(stats, S_IWUSR | S_IRUGO, show_stats, NULL);
-
-static int sierra_create_sysfs_attrs(struct usb_serial_port *port)
-{
- int result = 0;
-
- result = device_create_file(&port->dev, &dev_attr_stats);
- if (unlikely (result < 0))
- return result;
- return device_create_file(&port->dev, &dev_attr_suspend_status);
-}
-
-static int sierra_remove_sysfs_attrs(struct usb_serial_port *port)
-{
- device_remove_file(&port->dev, &dev_attr_stats);
- device_remove_file(&port->dev, &dev_attr_suspend_status);
- return 0;
-}
-
-static void sierra_outdat_callback(struct urb *urb)
-{
- struct usb_serial_port *port = urb->context;
- struct sierra_port_private *portdata = usb_get_serial_port_data(port);
- struct sierra_intf_private *intfdata;
- int status = urb->status;
-
- dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
- intfdata = port->serial->private;
-
- usb_autopm_put_interface_async(port->serial->interface);
-
- atomic_inc(&intfdata->stats.outdat_cb_cnt);
-
- if (status) {
- dev_dbg(&port->dev, "%s - nonzero write bulk status "
- "received: %d\n", __func__, status);
- atomic_inc(&intfdata->stats.outdat_cb_fail);
- }
-
- spin_lock(&portdata->lock);
- --portdata->outstanding_urbs;
- spin_unlock(&portdata->lock);
-
- spin_lock(&intfdata->susp_lock);
- --intfdata->in_flight;
- spin_unlock(&intfdata->susp_lock);
-
- usb_serial_port_softint(port);
-}
-
-/* Write */
-static int sierra_write(struct tty_struct *tty,
- struct usb_serial_port *port,
- const unsigned char *buf, int count)
-{
- struct sierra_port_private *portdata = usb_get_serial_port_data(port);
- struct sierra_intf_private *intfdata;
- struct usb_serial *serial = port->serial;
- unsigned long flags;
- unsigned char *buffer;
- struct urb *urb;
- size_t writesize = min((size_t)count, (size_t)MAX_TRANSFER);
- int retval = 0;
-
- /* verify that we actually have some data to write */
- if (count == 0)
- return 0;
-
- dev_dbg(&port->dev, "%s: write (%zu bytes)\n", __func__, writesize);
-
- intfdata = serial->private;
-
- spin_lock_irqsave(&portdata->lock, flags);
- if (portdata->outstanding_urbs > portdata->num_out_urbs) {
- spin_unlock_irqrestore(&portdata->lock, flags);
- dev_dbg(&port->dev, "%s - write limit hit\n", __func__);
- return 0;
- }
- portdata->outstanding_urbs++;
- spin_unlock_irqrestore(&portdata->lock, flags);
-
- retval = usb_autopm_get_interface_async(serial->interface);
- if (unlikely(retval < 0)) {
- spin_lock_irqsave(&portdata->lock, flags);
- portdata->outstanding_urbs--;
- spin_unlock_irqrestore(&portdata->lock, flags);
- return retval;
- }
-
- buffer = kmalloc(writesize, GFP_ATOMIC);
- if (!buffer) {
- dev_err(&port->dev, "out of memory\n");
- spin_lock_irqsave(&portdata->lock, flags);
- --portdata->outstanding_urbs;
- spin_unlock_irqrestore(&portdata->lock, flags);
- usb_autopm_put_interface_async(serial->interface);
- return -ENOMEM;
- }
-
- urb = usb_alloc_urb(0, GFP_ATOMIC);
- if (!urb) {
- dev_err(&port->dev, "no more free urbs\n");
- kfree(buffer);
- spin_lock_irqsave(&portdata->lock, flags);
- --portdata->outstanding_urbs;
- spin_unlock_irqrestore(&portdata->lock, flags);
- usb_autopm_put_interface_async(serial->interface);
- return -ENOMEM;
- }
-
- memcpy(buffer, buf, writesize);
-
- usb_serial_debug_data(debug, &port->dev, __func__, writesize, buffer);
-
- usb_fill_bulk_urb(urb, serial->dev,
- usb_sndbulkpipe(serial->dev,
- port->bulk_out_endpointAddress),
- buffer, writesize, sierra_outdat_callback, port);
-
- /* Handle the need to send a zero length packet and release the
- * transfer buffer
- */
- urb->transfer_flags |= (URB_ZERO_PACKET | URB_FREE_BUFFER);
-
- spin_lock_irqsave(&intfdata->susp_lock, flags);
-
- if (intfdata->suspended) {
- usb_anchor_urb(urb, &portdata->delayed);
- spin_unlock_irqrestore(&intfdata->susp_lock, flags);
- /* release our reference to this urb, the USB core will
- * eventually free it entirely */
- usb_free_urb(urb);
- return writesize;
- }
- usb_anchor_urb(urb, &portdata->active);
-
- /* send it down the pipe */
- retval = usb_submit_urb(urb, GFP_ATOMIC);
- if (retval) {
- usb_unanchor_urb(urb);
- spin_unlock_irqrestore(&intfdata->susp_lock, flags);
-
- dev_err(&port->dev, "%s - usb_submit_urb(write bulk) failed "
- "with status = %d\n", __func__, retval);
- usb_free_urb(urb);
- spin_lock_irqsave(&portdata->lock, flags);
- --portdata->outstanding_urbs;
- spin_unlock_irqrestore(&portdata->lock, flags);
- usb_autopm_put_interface_async(serial->interface);
- atomic_inc(&intfdata->stats.write_err);
- return retval;
- } else {
- intfdata->in_flight++;
- spin_unlock_irqrestore(&intfdata->susp_lock, flags);
- atomic_inc(&intfdata->stats.write_cnt);
- atomic_add(writesize, &intfdata->stats.tx_bytes);
- }
- /* release our reference to this urb, the USB core will eventually
- * free it entirely */
- usb_free_urb(urb);
-
- return writesize;
-}
-
-static void sierra_indat_callback(struct urb *urb)
-{
- int err;
- int endpoint;
- struct usb_serial_port *port = urb->context;
- struct tty_struct *tty;
- struct sierra_intf_private *intfdata;
- unsigned char *data = urb->transfer_buffer;
- int status = urb->status;
-
- endpoint = usb_pipeendpoint(urb->pipe);
-
- dev_dbg(&port->dev, "%s: %p\n", __func__, urb);
-
- intfdata = port->serial->private;
-
- atomic_inc(&intfdata->stats.indat_cb_cnt); /* indat calls */
-
- if (status) {
- dev_dbg(&port->dev, "%s: nonzero status: %d on"
- " endpoint %02x\n", __func__, status, endpoint);
- atomic_inc(&intfdata->stats.indat_cb_fail); /* indat fails */
- } else {
- if (urb->actual_length) {
- tty = tty_port_tty_get(&port->port);
- if (tty) {
- tty_insert_flip_string(tty, data,
- urb->actual_length);
- tty_flip_buffer_push(tty);
-
- tty_kref_put(tty);
- /* tty invalid after this point */
- /* rx'd bytes */
- atomic_add(urb->actual_length,
- &intfdata->stats.rx_bytes);
- usb_serial_debug_data(debug, &port->dev,
- __func__, urb->actual_length, data);
- }
- } else {
- dev_dbg(&port->dev, "%s: empty read urb"
- " received\n", __func__);
- }
- }
-
- /* Resubmit urb so we continue receiving */
- if (status != -ESHUTDOWN && status != -ENOENT && status != -ENODEV) {
- usb_mark_last_busy(port->serial->dev);
- err = usb_submit_urb(urb, GFP_ATOMIC);
- if (err && err != -ENODEV)
- dev_err(&port->dev, "resubmit read urb failed."
- "(%d)\n", err);
- }
-
- return;
-}
-
-static void sierra_instat_callback(struct urb *urb)
-{
- int err;
- int status = urb->status;
- struct usb_serial_port *port = urb->context;
- struct sierra_port_private *portdata = usb_get_serial_port_data(port);
- struct usb_serial *serial = port->serial;
-
- dev_dbg(&port->dev, "%s: %p\n", __func__, urb);
-
- if (status == 0) {
- struct usb_ctrlrequest *req_pkt =
- (struct usb_ctrlrequest *)urb->transfer_buffer;
-
- const u16 *sigp = (u16 *)(req_pkt + 1);
- /* usb_ctrlrequest we parsed is followed by two bytes of data
- * make sure we received that many bytes
- */
- if (urb->actual_length >= sizeof(*req_pkt) + sizeof(*sigp) &&
- req_pkt->bRequestType == USB_REQUEST_TYPE_CLASS &&
- req_pkt->bRequest == USB_REQUEST_IFACE) {
- int old_dcd_state;
- const u16 signals = get_unaligned_le16(sigp);
- struct tty_struct *tty;
-
- dev_dbg(&port->dev, "%s: signal 0x%x\n", __func__,
- signals);
-
- old_dcd_state = portdata->dcd_state;
- /* Note: CTS from modem is in reverse logic! */
- portdata->cts_state = ((signals & 0x100) ? 0 : 1);
- portdata->dcd_state = ((signals & 0x01) ? 1 : 0);
- portdata->dsr_state = ((signals & 0x02) ? 1 : 0);
- portdata->ri_state = ((signals & 0x08) ? 1 : 0);
-
- tty = tty_port_tty_get(&port->port);
- if (tty && !C_CLOCAL(tty) &&
- old_dcd_state && !portdata->dcd_state)
- tty_hangup(tty);
- tty_kref_put(tty);
- } else {
- /* dump the data we don't understand to log */
- usb_serial_debug_data(1, &port->dev, __func__,
- urb->actual_length, urb->transfer_buffer);
- }
- } else
- dev_dbg(&port->dev, "%s: error %d\n", __func__, status);
-
- /* Resubmit urb so we continue receiving IRQ data */
- if (status != -ESHUTDOWN && status != -ENOENT && status != -ENODEV) {
- usb_mark_last_busy(serial->dev);
- urb->dev = serial->dev;
- err = usb_submit_urb(urb, GFP_ATOMIC);
- if (err && err != -ENODEV)
- dev_err(&port->dev, "%s: resubmit intr urb "
- "failed. (%d)\n", __func__, err);
- }
-}
-
-static int sierra_write_room(struct tty_struct *tty)
-{
- struct usb_serial_port *port = tty->driver_data;
- struct sierra_port_private *portdata = usb_get_serial_port_data(port);
- unsigned long flags;
- int retval;
-
- dev_dbg(&port->dev, "%s - port %d\n", __func__, port->number);
-
- /* try to give a good number back based on if we have any free urbs at
- * this point in time */
- retval = MAX_TRANSFER;
-
- spin_lock_irqsave(&portdata->lock, flags);
- if (portdata->outstanding_urbs >= portdata->num_out_urbs) {
- retval = 0;
- }
- spin_unlock_irqrestore(&portdata->lock, flags);
-
- return retval;
-}
-
-static void sierra_stop_rx_urbs(struct usb_serial_port *port)
-{
- int i;
- struct sierra_port_private *portdata = usb_get_serial_port_data(port);
-
- for (i = 0; i < portdata->num_in_urbs; i++)
- usb_kill_urb(portdata->in_urbs[i]);
-
- usb_kill_urb(port->interrupt_in_urb);
-}
-
-static int sierra_submit_rx_urbs(struct usb_serial_port *port, gfp_t mem_flags)
-{
- int ok_cnt;
- int err = -EINVAL;
- int i;
- struct urb *urb;
- struct sierra_port_private *portdata = usb_get_serial_port_data(port);
-
- ok_cnt = 0;
- for (i = 0; i < portdata->num_in_urbs; i++) {
- urb = portdata->in_urbs[i];
- if (!urb)
- continue;
- urb->transfer_flags |= URB_FREE_BUFFER;
- err = usb_submit_urb(urb, mem_flags);
- if (err) {
- dev_err(&port->dev, "%s: submit urb failed: %d\n",
- __func__, err);
- } else {
- ok_cnt++;
- }
- }
-
- if (ok_cnt && port->interrupt_in_urb) {
- err = usb_submit_urb(port->interrupt_in_urb, mem_flags);
- if (err) {
- dev_err(&port->dev, "%s: submit intr urb failed: %d\n",
- __func__, err);
- }
- }
-
- if (ok_cnt > 0) /* at least one rx urb submitted */
- return 0;
- else
- return err;
-}
-
-static struct urb *sierra_setup_urb(struct usb_serial *serial, int endpoint,
- int dir, void *ctx, int len,
- gfp_t mem_flags,
- usb_complete_t callback)
-{
- struct urb *urb;
- u8 *buf;
-
- if (endpoint == -1)
- return NULL;
-
- urb = usb_alloc_urb(0, mem_flags);
- if (urb == NULL) {
- dev_dbg(&serial->dev->dev, "%s: alloc for endpoint %d failed\n",
- __func__, endpoint);
- return NULL;
- }
-
- buf = kmalloc(len, mem_flags);
- if (buf) {
- /* Fill URB using supplied data */
- usb_fill_bulk_urb(urb, serial->dev,
- usb_sndbulkpipe(serial->dev, endpoint) | dir,
- buf, len, callback, ctx);
-
- /* debug */
- dev_dbg(&serial->dev->dev, "%s %c u : %p d:%p\n", __func__,
- dir == USB_DIR_IN ? 'i' : 'o', urb, buf);
- } else {
- dev_dbg(&serial->dev->dev, "%s %c u:%p d:%p\n", __func__,
- dir == USB_DIR_IN ? 'i' : 'o', urb, buf);
-
- sierra_release_urb(urb);
- urb = NULL;
- }
-
- return urb;
-}
-static void sierra_close(struct usb_serial_port *port)
-{
- int i;
- struct urb *urb;
- struct usb_serial *serial = port->serial;
- struct sierra_port_private *portdata;
- struct sierra_intf_private *intfdata = port->serial->private;
-
- dev_dbg(&port->dev, "%s\n", __func__);
- portdata = usb_get_serial_port_data(port);
-
- portdata->rts_state = 0;
- portdata->dtr_state = 0;
-
- usb_autopm_get_interface(serial->interface);
-
- if (serial->dev) {
- mutex_lock(&serial->disc_mutex);
- if (!serial->disconnected)
- sierra_send_setup(port);
- mutex_unlock(&serial->disc_mutex);
- spin_lock_irq(&intfdata->susp_lock);
- portdata->opened = 0;
- spin_unlock_irq(&intfdata->susp_lock);
-
- /* Stop reading urbs */
- sierra_stop_rx_urbs(port);
- /* .. and release them */
- for (i = 0; i < portdata->num_in_urbs; i++) {
- sierra_release_urb(portdata->in_urbs[i]);
- portdata->in_urbs[i] = NULL;
- }
- while((urb = usb_get_from_anchor(&portdata->delayed))) {
- sierra_release_urb(urb);
- usb_autopm_put_interface(serial->interface);
- }
- /* wait for active to finish */
- usb_wait_anchor_empty_timeout(&portdata->active, 500);
- usb_kill_anchored_urbs(&portdata->active);
-
- }
-}
-
-static int sierra_open(struct tty_struct *tty, struct usb_serial_port *port)
-{
- struct sierra_port_private *portdata;
- struct usb_serial *serial = port->serial;
- struct sierra_intf_private *intfdata = serial->private;
- int i;
- int err;
- int endpoint;
- struct urb *urb;
-
- portdata = usb_get_serial_port_data(port);
-
- dev_dbg(&port->dev, "%s\n", __func__);
-
- /* Set some sane defaults */
- portdata->rts_state = 1;
- portdata->dtr_state = 1;
-
-
- endpoint = port->bulk_in_endpointAddress;
- for (i = 0; i < portdata->num_in_urbs; i++) {
- urb = sierra_setup_urb(serial, endpoint, USB_DIR_IN, port,
- IN_BUFLEN, GFP_KERNEL,
- sierra_indat_callback);
- portdata->in_urbs[i] = urb;
- }
- /* clear halt condition */
- usb_clear_halt(serial->dev,
- usb_sndbulkpipe(serial->dev, endpoint) | USB_DIR_IN);
-
- /* reset outstanding out urbs counter */
- spin_lock_irq(&portdata->lock);
- portdata->outstanding_urbs = 0;
- spin_unlock_irq(&portdata->lock);
-
- err = sierra_submit_rx_urbs(port, GFP_KERNEL);
- if (err) {
- /* do everything as in close() but do not call close() because
- * usbserial calls sierra_open() with mutex taken;
- * then if we call sierra_close() inside sierra_open() we
- * violate 'no nested mutexes' kernel condition
- */
- portdata->rts_state = 0;
- portdata->dtr_state = 0;
- usb_autopm_get_interface(serial->interface);
- /* Stop reading urbs */
- sierra_stop_rx_urbs(port);
- /* .. and release them */
- for (i = 0; i < portdata->num_in_urbs; i++) {
- sierra_release_urb(portdata->in_urbs[i]);
- portdata->in_urbs[i] = NULL;
- }
- while((urb = usb_get_from_anchor(&portdata->delayed))) {
- sierra_release_urb(urb);
- usb_autopm_put_interface(serial->interface);
- }
- /* wait for active to finish */
- usb_wait_anchor_empty_timeout(&portdata->active, 500);
- usb_kill_anchored_urbs(&portdata->active);
- /* restore balance for autopm */
- usb_autopm_put_interface(serial->interface);
- return err;
- }
- sierra_send_setup(port);
-
- spin_lock_irq(&intfdata->susp_lock);
- portdata->opened = 1;
- spin_unlock_irq(&intfdata->susp_lock);
- usb_autopm_put_interface(serial->interface);
-
- return 0;
-}
-
-static void sierra_dtr_rts(struct usb_serial_port *port, int on)
-{
- struct usb_serial *serial = port->serial;
- struct sierra_port_private *portdata;
-
- portdata = usb_get_serial_port_data(port);
- portdata->rts_state = on;
- portdata->dtr_state = on;
-
- if (serial->dev) {
- mutex_lock(&serial->disc_mutex);
- if (!serial->disconnected)
- sierra_send_setup(port);
- mutex_unlock(&serial->disc_mutex);
- }
-}
-
-static int sierra_startup(struct usb_serial *serial)
-{
- struct usb_serial_port *port = NULL;
- struct sierra_port_private *portdata = NULL;
- struct sierra_iface_info *himemoryp = NULL;
- int i;
- u8 ifnum;
- u16 fw_attr;
- int result;
-
- dev_dbg(&serial->dev->dev, "%s\n", __func__);
-
- /* Set Device mode to D0 */
- sierra_set_power_state(serial->dev, 0x0000);
-
- /* Check NMEA and set */
- if (nmea)
- sierra_vsc_set_nmea(serial->dev, 1);
-
- if (serial->num_ports) {
- /* Note: One big piece of memory is allocated for all ports
- * private data in one shot. This memory is split into equal
- * pieces for each port.
- */
- portdata = (struct sierra_port_private *)kzalloc
- (sizeof(*portdata) * serial->num_ports, GFP_KERNEL);
- if (!portdata) {
- dev_dbg(&serial->dev->dev, "%s: No memory!\n", __func__);
- return -ENOMEM;
- }
- }
-
- /* Now setup per port private data */
- for (i = 0; i < serial->num_ports; i++, portdata++) {
- port = serial->port[i];
- /* Initialize selected members of private data because these
- * may be referred to right away */
- spin_lock_init(&portdata->lock);
- init_usb_anchor(&portdata->active);
- init_usb_anchor(&portdata->delayed);
-
- portdata->cts_state = 1;
-
- ifnum = i;
- /* Assume low memory requirements */
- portdata->num_out_urbs = N_OUT_URB;
- portdata->num_in_urbs = N_IN_URB;
-
- /* Determine actual memory requirements */
- if (serial->num_ports == 1) {
- /* Get interface number for composite device */
- ifnum = sierra_calc_interface(serial);
- himemoryp =
- (struct sierra_iface_info *)&typeB_interface_list;
- if (is_himemory(ifnum, himemoryp)) {
- portdata->num_out_urbs = N_OUT_URB_HM;
- portdata->num_in_urbs = N_IN_URB_HM;
- }
- }
- else {
- himemoryp =
- (struct sierra_iface_info *)&typeA_interface_list;
- if (is_himemory(i, himemoryp)) {
- portdata->num_out_urbs = N_OUT_URB_HM;
- portdata->num_in_urbs = N_IN_URB_HM;
- }
- }
- dev_dbg(&serial->dev->dev,
- "Memory usage (urbs) interface #%d, in=%d, out=%d\n",
- ifnum,portdata->num_in_urbs, portdata->num_out_urbs );
- /* Set the port private data pointer */
- usb_set_serial_port_data(port, portdata);
- }
- serial->interface->needs_remote_wakeup = 1;
-
- result = sierra_get_fw_attr(serial->dev, &fw_attr);
- if (result == sizeof(fw_attr) && (fw_attr & SWI_FW_ATTR_PM_MASK) ) {
- dev_info(&serial->dev->dev,
- "APM supported, enabling autosuspend.\n");
-/*******************************************************************************
- * If you want the default /sys/bus/usb/devices/.../.../power/level to be forced
- * to auto, the following needs to be compiled in.
- */
-#ifdef POWER_LEVEL_AUTO
- /* make power level default be 'auto' */
- usb_enable_autosuspend(serial->dev);
-#endif
- } else {
- usb_disable_autosuspend(serial->dev);
- }
-
- return 0;
-}
-
-static void sierra_release(struct usb_serial *serial)
-{
- int i;
- struct usb_serial_port *port;
- struct sierra_intf_private *intfdata = serial->private;
-
- dev_dbg(&serial->dev->dev, "%s\n", __func__);
-
- if (serial->num_ports > 0) {
- port = serial->port[0];
- if (port)
- /* Note: The entire piece of memory that was allocated
- * in the startup routine can be released by passing
- * a pointer to the beginning of the piece.
- * This address corresponds to the address of the chunk
- * that was given to port 0.
- */
- kfree(usb_get_serial_port_data(port));
- }
-
- for (i = 0; i < serial->num_ports; ++i) {
- port = serial->port[i];
- if (!port)
- continue;
- usb_set_serial_port_data(port, NULL);
- }
- kfree(intfdata);
-}
-
-#ifdef CONFIG_PM
-static void stop_read_write_urbs(struct usb_serial *serial)
-{
- int i;
- struct usb_serial_port *port;
- struct sierra_port_private *portdata;
-
- /* Stop reading/writing urbs */
- for (i = 0; i < serial->num_ports; ++i) {
- port = serial->port[i];
- portdata = usb_get_serial_port_data(port);
- sierra_stop_rx_urbs(port);
- usb_kill_anchored_urbs(&portdata->active);
- }
-}
-
-static int sierra_suspend(struct usb_serial *serial, pm_message_t message)
-{
- struct sierra_intf_private *intfdata;
-
- dev_dbg(&serial->dev->dev, "%s\n", __func__);
-
- intfdata = serial->private;
- spin_lock_irq(&intfdata->susp_lock);
-
- if (message.event & PM_EVENT_AUTO) {
- if (intfdata->in_flight) {
- spin_unlock_irq(&intfdata->susp_lock);
- return -EBUSY;
- }
- }
- intfdata->suspended = 1;
- spin_unlock_irq(&intfdata->susp_lock);
-
- stop_read_write_urbs(serial);
-
- return 0;
-}
-
-static int sierra_resume(struct usb_serial *serial)
-{
- struct usb_serial_port *port;
- struct sierra_intf_private *intfdata = serial->private;
- struct sierra_port_private *portdata;
- struct urb *urb;
- int ec = 0;
- int i, err;
- int len;
- int failed_submits;
-
- dev_dbg(&serial->dev->dev, "%s\n", __func__);
-
- spin_lock_irq(&intfdata->susp_lock);
- for (i = 0; i < serial->num_ports; i++) {
- port = serial->port[i];
- portdata = usb_get_serial_port_data(port);
- failed_submits = 0;
- while ((urb = usb_get_from_anchor(&portdata->delayed))) {
- usb_anchor_urb(urb, &portdata->active);
- intfdata->in_flight++;
- len = urb->transfer_buffer_length;
- err = usb_submit_urb(urb, GFP_ATOMIC);
- if (err < 0) {
- intfdata->in_flight--;
- usb_unanchor_urb(urb);
- failed_submits++;
- atomic_inc(&intfdata->stats.delayed_write_err);
- /* fix pm_usage_cnt */
- usb_autopm_put_interface_async(
- port->serial->interface);
- } else {
- atomic_inc(&intfdata->stats.delayed_writes);
- atomic_add(len, &intfdata->stats.tx_bytes);
- }
- /* release urb - usb_get_from_anchor increased kref */
- usb_free_urb(urb);
- }
-
- if (portdata->opened) {
- err = sierra_submit_rx_urbs(port, GFP_ATOMIC);
- if (err)
- ec++;
- }
- if (failed_submits) {
- /* fix outstanding_urbs counter */
- spin_lock(&portdata->lock); /* assuming irq disabled */
- portdata->outstanding_urbs -= failed_submits;
- spin_unlock(&portdata->lock);
- /* unblock a writer */
- usb_serial_port_softint(port);
- }
- }
- intfdata->suspended = 0;
- spin_unlock_irq(&intfdata->susp_lock);
-
- return ec ? -EIO : 0;
-}
-#else
-#define sierra_suspend NULL
-#define sierra_resume NULL
-#endif
-
-static int sierra_reset_resume(struct usb_interface *intf)
-{
- struct usb_serial *serial = usb_get_intfdata(intf);
- dev_err(&serial->dev->dev, "%s\n", __func__);
- return usb_serial_resume(intf);
-}
-
-static struct usb_driver sierra_driver = {
- .name = "sierra",
- .probe = usb_serial_probe,
- .disconnect = usb_serial_disconnect,
- .suspend = usb_serial_suspend,
- .resume = usb_serial_resume,
- .reset_resume = sierra_reset_resume,
- .id_table = id_table,
-
- .no_dynamic_id = 1,
- .supports_autosuspend = 1,
-};
-
-
-static struct usb_serial_driver sierra_device = {
- .driver = {
- .owner = THIS_MODULE,
- .name = "sierra",
- },
- .description = "Sierra USB modem",
- .id_table = id_table,
- .usb_driver = &sierra_driver,
- .calc_num_ports = sierra_calc_num_ports,
- .probe = sierra_probe,
- .open = sierra_open,
- .close = sierra_close,
- .dtr_rts = sierra_dtr_rts,
- .write = sierra_write,
- .write_room = sierra_write_room,
- .set_termios = sierra_set_termios,
- .tiocmget = sierra_tiocmget,
- .tiocmset = sierra_tiocmset,
- .attach = sierra_startup,
- .release = sierra_release,
- .port_probe = sierra_create_sysfs_attrs,
- .port_remove = sierra_remove_sysfs_attrs,
- .suspend = sierra_suspend,
- .resume = sierra_resume,
- .read_int_callback = sierra_instat_callback,
-
-};
-
-/* Functions used by new usb-serial code. */
-static int __init sierra_init(void)
-{
- int retval;
- retval = usb_serial_register(&sierra_device);
- if (retval)
- goto failed_device_register;
-
- retval = usb_register(&sierra_driver);
- if (retval)
- goto failed_driver_register;
-
- printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_VERSION ":"
- DRIVER_DESC "\n");
-
- return 0;
-
-failed_driver_register:
- usb_serial_deregister(&sierra_device);
-failed_device_register:
- return retval;
-}
-
-static void __exit sierra_exit(void)
-{
- usb_deregister(&sierra_driver);
- usb_serial_deregister(&sierra_device);
-}
-
-module_init(sierra_init);
-module_exit(sierra_exit);
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");
-
-module_param(nmea, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(nmea, "NMEA streaming");
-
-module_param(debug, bool, S_IRUGO | S_IWUSR);
-MODULE_PARM_DESC(debug, "Debug messages");
diff --git a/package/system/sierra-directip/src/sierra_net.c b/package/system/sierra-directip/src/sierra_net.c
deleted file mode 100644
index f6057d918..000000000
--- a/package/system/sierra-directip/src/sierra_net.c
+++ /dev/null
@@ -1,1123 +0,0 @@
-/*
- * USB-to-WWAN Driver for Sierra Wireless modems
- *
- * Copyright (C) 2008 - 2011 Paxton Smith, Matthew Safar, Rory Filer
- * <linux@sierrawireless.com>
- *
- * Portions of this based on the cdc_ether driver by David Brownell (2003-2005)
- * and Ole Andre Vadla Ravnas (ActiveSync) (2006).
- *
- * IMPORTANT DISCLAIMER: This driver is not commercially supported by
- * Sierra Wireless. Use at your own risk.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#define DRIVER_VERSION "v.3.2"
-#define DRIVER_AUTHOR "Paxton Smith, Matthew Safar, Rory Filer"
-#define DRIVER_DESC "USB-to-WWAN Driver for Sierra Wireless modems"
-static const char driver_name[] = "sierra_net";
-
-/* if defined debug messages enabled */
-/*#define DEBUG*/
-/* more debug messages */
-/*#define VERBOSE*/
-/* Uncomment to force power level set to auto when attaching a device */
-/*#define POWER_LEVEL_AUTO*/
-
-#include <linux/module.h>
-#include <linux/etherdevice.h>
-#include <linux/ethtool.h>
-#include <linux/mii.h>
-#include <linux/sched.h>
-#include <linux/timer.h>
-#include <linux/usb.h>
-#include <linux/usb/cdc.h>
-#include <net/ip.h>
-#include <net/udp.h>
-#include <asm/unaligned.h>
-#include <linux/usb/usbnet.h>
-
-#define SWI_USB_REQUEST_GET_FW_ATTR 0x06
-#define SWI_GET_FW_ATTR_MASK 0x08
-#define SWI_GET_FW_ATTR_APM 0x2
-
-/* atomic counter partially included in MAC address to make sure 2 devices
- * do not end up with the same MAC - concept breaks in case of > 255 ifaces
- */
-static atomic_t iface_counter = ATOMIC_INIT(0);
-
-/*
- * SYNC Timer Delay definition used to set the expiry time
- */
-#define SIERRA_NET_SYNCDELAY (2*HZ)
-
-/* Max. MTU supported. The modem buffers are limited to 1500 */
-#define SIERRA_NET_MAX_SUPPORTED_MTU 1500
-
-/* The SIERRA_NET_USBCTL_BUF_LEN defines a buffer size allocated for control
- * message reception ... and thus the max. received packet.
- * (May be the cause for parse_hip returning -EINVAL)
- */
-#define SIERRA_NET_USBCTL_BUF_LEN 1024
-
-/* The SIERRA_NET_RX_URB_SZ defines the receive urb size
- * for optimal throughput.
- */
-#define SIERRA_NET_RX_URB_SZ 1540
-
-/* list of interface numbers - used for constructing interface lists */
-struct sierra_net_iface_info {
- const u32 infolen; /* number of interface numbers on list */
- const u8 *ifaceinfo; /* pointer to the array holding the numbers */
-};
-
-struct sierra_net_info_data {
- u16 rx_urb_size;
- struct sierra_net_iface_info whitelist;
-};
-
-/* Private data structure */
-struct sierra_net_data {
-
- u8 ethr_hdr_tmpl[ETH_HLEN]; /* ethernet header template for rx'd pkts */
-
- u16 link_up; /* air link up or down */
- u8 tx_hdr_template[4]; /* part of HIP hdr for tx'd packets */
-
- u8 sync_msg[4]; /* SYNC message */
- u8 shdwn_msg[4]; /* Shutdown message */
-
- /* Backpointer to the container */
- struct usbnet *usbnet;
-
- u8 ifnum; /* interface number */
-
-/* Bit masks, must be a power of 2 */
-#define SIERRA_NET_EVENT_RESP_AVAIL 0x01
-#define SIERRA_NET_TIMER_EXPIRY 0x02
- unsigned long kevent_flags;
- struct work_struct sierra_net_kevent;
- struct timer_list sync_timer; /* For retrying SYNC sequence */
-};
-
-struct param {
- int is_present;
- union {
- void *ptr;
- u32 dword;
- u16 word;
- u8 byte;
- };
-};
-
-/* HIP message type */
-#define SIERRA_NET_HIP_EXTENDEDID 0x7F
-#define SIERRA_NET_HIP_HSYNC_ID 0x60 /* Modem -> host */
-#define SIERRA_NET_HIP_RESTART_ID 0x62 /* Modem -> host */
-#define SIERRA_NET_HIP_MSYNC_ID 0x20 /* Host -> modem */
-#define SIERRA_NET_HIP_SHUTD_ID 0x26 /* Host -> modem */
-
-#define SIERRA_NET_HIP_EXT_IP_IN_ID 0x0202
-#define SIERRA_NET_HIP_EXT_IP_OUT_ID 0x0002
-
-/* 3G UMTS Link Sense Indication definitions */
-#define SIERRA_NET_HIP_LSI_UMTSID 0x78
-
-/* Reverse Channel Grant Indication HIP message */
-#define SIERRA_NET_HIP_RCGI 0x64
-
-/* LSI Protocol types */
-#define SIERRA_NET_PROTOCOL_UMTS 0x01
-/* LSI Coverage */
-#define SIERRA_NET_COVERAGE_NONE 0x00
-#define SIERRA_NET_COVERAGE_NOPACKET 0x01
-
-/* LSI Session */
-#define SIERRA_NET_SESSION_IDLE 0x00
-/* LSI Link types */
-#define SIERRA_NET_AS_LINK_TYPE_IPv4 0x00
-#define SIERRA_NET_AS_LINK_TYPE_IPv6 0x02
-
-struct lsi_umts {
- u8 protocol;
- u8 unused1;
- __be16 length;
- /* eventually use a union for the rest - assume umts for now */
- u8 coverage;
- u8 unused2[41];
- u8 session_state;
- u8 unused3[33];
- u8 link_type;
- u8 pdp_addr_len; /* NW-supplied PDP address len */
- u8 pdp_addr[16]; /* NW-supplied PDP address (bigendian)) */
- u8 unused4[23];
- u8 dns1_addr_len; /* NW-supplied 1st DNS address len (bigendian) */
- u8 dns1_addr[16]; /* NW-supplied 1st DNS address */
- u8 dns2_addr_len; /* NW-supplied 2nd DNS address len */
- u8 dns2_addr[16]; /* NW-supplied 2nd DNS address (bigendian)*/
- u8 wins1_addr_len; /* NW-supplied 1st Wins address len */
- u8 wins1_addr[16]; /* NW-supplied 1st Wins address (bigendian)*/
- u8 wins2_addr_len; /* NW-supplied 2nd Wins address len */
- u8 wins2_addr[16]; /* NW-supplied 2nd Wins address (bigendian) */
- u8 unused5[4];
- u8 gw_addr_len; /* NW-supplied GW address len */
- u8 gw_addr[16]; /* NW-supplied GW address (bigendian) */
- u8 reserved[8];
-} __packed;
-
-#define SIERRA_NET_LSI_COMMON_LEN 4
-#define SIERRA_NET_LSI_UMTS_LEN (sizeof(struct lsi_umts))
-#define SIERRA_NET_LSI_UMTS_STATUS_LEN \
- (SIERRA_NET_LSI_UMTS_LEN - SIERRA_NET_LSI_COMMON_LEN)
-
-/* Forward definitions */
-static void sierra_sync_timer(unsigned long syncdata);
-static int sierra_net_change_mtu(struct net_device *net, int new_mtu);
-
-/* Our own net device operations structure */
-static const struct net_device_ops sierra_net_device_ops = {
- .ndo_open = usbnet_open,
- .ndo_stop = usbnet_stop,
- .ndo_start_xmit = usbnet_start_xmit,
- .ndo_tx_timeout = usbnet_tx_timeout,
- .ndo_change_mtu = sierra_net_change_mtu,
- .ndo_set_mac_address = eth_mac_addr,
- .ndo_validate_addr = eth_validate_addr,
-};
-
-/* get private data associated with passed in usbnet device */
-static inline struct sierra_net_data *sierra_net_get_private(struct usbnet *dev)
-{
- return (struct sierra_net_data *)dev->data[0];
-}
-
-/* set private data associated with passed in usbnet device */
-static inline void sierra_net_set_private(struct usbnet *dev,
- struct sierra_net_data *priv)
-{
- dev->data[0] = (unsigned long)priv;
-}
-
-/* is packet IP */
-static inline int is_ip(struct sk_buff *skb)
-{
- return ((skb->protocol == cpu_to_be16(ETH_P_IP)) ||
- (skb->protocol == cpu_to_be16(ETH_P_IPV6)));
-}
-
-/*
- * check passed in packet and make sure that:
- * - it is linear (no scatter/gather)
- * - it is ethernet (mac_header properly set)
- */
-static int check_ethip_packet(struct sk_buff *skb, struct usbnet *dev)
-{
- skb_reset_mac_header(skb); /* ethernet header */
-
- if (skb_is_nonlinear(skb)) {
- netdev_err(dev->net, "Non linear buffer-dropping\n");
- return 0;
- }
-
- if (!pskb_may_pull(skb, ETH_HLEN))
- return 0;
- skb->protocol = eth_hdr(skb)->h_proto;
-
- return 1;
-}
-
-static const u8 *save16bit(struct param *p, const u8 *datap)
-{
- p->is_present = 1;
- p->word = get_unaligned_be16(datap);
- return datap + sizeof(p->word);
-}
-
-static const u8 *save8bit(struct param *p, const u8 *datap)
-{
- p->is_present = 1;
- p->byte = *datap;
- return datap + sizeof(p->byte);
-}
-
-/*----------------------------------------------------------------------------*
- * BEGIN HIP *
- *----------------------------------------------------------------------------*/
-/* HIP header */
-#define SIERRA_NET_HIP_HDR_LEN 4
-/* Extended HIP header */
-#define SIERRA_NET_HIP_EXT_HDR_LEN 6
-
-struct hip_hdr {
- int hdrlen;
- struct param payload_len;
- struct param msgid;
- struct param msgspecific;
- struct param extmsgid;
-};
-
-static int parse_hip(const u8 *buf, const u32 buflen, struct hip_hdr *hh)
-{
- const u8 *curp = buf;
- int padded;
-
- if (buflen < SIERRA_NET_HIP_HDR_LEN)
- return -EPROTO;
-
- curp = save16bit(&hh->payload_len, curp);
- curp = save8bit(&hh->msgid, curp);
- curp = save8bit(&hh->msgspecific, curp);
-
- padded = hh->msgid.byte & 0x80;
- hh->msgid.byte &= 0x7F; /* 7 bits */
-
- hh->extmsgid.is_present = (hh->msgid.byte == SIERRA_NET_HIP_EXTENDEDID);
- if (hh->extmsgid.is_present) {
- if (buflen < SIERRA_NET_HIP_EXT_HDR_LEN)
- return -EPROTO;
-
- hh->payload_len.word &= 0x3FFF; /* 14 bits */
-
- curp = save16bit(&hh->extmsgid, curp);
- hh->extmsgid.word &= 0x03FF; /* 10 bits */
-
- hh->hdrlen = SIERRA_NET_HIP_EXT_HDR_LEN;
- } else {
- hh->payload_len.word &= 0x07FF; /* 11 bits */
- hh->hdrlen = SIERRA_NET_HIP_HDR_LEN;
- }
-
- if (padded) {
- hh->hdrlen++;
- hh->payload_len.word--;
- }
-
- /* if real packet shorter than the claimed length */
- if (buflen < (hh->hdrlen + hh->payload_len.word))
- return -EINVAL;
-
- return 0;
-}
-
-static void build_hip(u8 *buf, const u16 payloadlen,
- struct sierra_net_data *priv)
-{
- /* the following doesn't have the full functionality. We
- * currently build only one kind of header, so it is faster this way
- */
- put_unaligned_be16(payloadlen, buf);
- memcpy(buf+2, priv->tx_hdr_template, sizeof(priv->tx_hdr_template));
-}
-/*----------------------------------------------------------------------------*
- * END HIP *
- *----------------------------------------------------------------------------*/
-/* This should come out before going to kernel.org */
-static void sierra_net_printk_buf(u8 *buf, u16 len)
-{
-#ifdef VERBOSE
- u16 i;
- u16 k;
-
- for (i = k = 0; i < len / 4; i++, k += 4) {
- printk(KERN_DEBUG "%02x%02x%02x%02x ",
- buf[k+0], buf[k+1], buf[k+2], buf[k+3]);
- }
-
- for (; k < len; k++)
- printk(KERN_DEBUG "%02x", buf[k]);
-
- printk("\n");
-#endif
-}
-
-static int sierra_net_send_cmd(struct usbnet *dev,
- u8 *cmd, int cmdlen, const char * cmd_name)
-{
- struct sierra_net_data *priv = sierra_net_get_private(dev);
- int status;
-
- usb_autopm_get_interface(dev->intf);
- status = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0),
- USB_CDC_SEND_ENCAPSULATED_COMMAND,
- USB_DIR_OUT|USB_TYPE_CLASS|USB_RECIP_INTERFACE, 0,
- priv->ifnum, cmd, cmdlen, USB_CTRL_SET_TIMEOUT);
- usb_autopm_put_interface(dev->intf);
-
- if (status != cmdlen && status != -ENODEV)
- netdev_err(dev->net, "Submit %s failed %d\n", cmd_name, status);
-
- return status;
-}
-
-static int sierra_net_send_sync(struct usbnet *dev)
-{
- int status;
- struct sierra_net_data *priv = sierra_net_get_private(dev);
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
-
- status = sierra_net_send_cmd(dev, priv->sync_msg,
- sizeof(priv->sync_msg), "SYNC");
- return status;
-}
-
-static void sierra_net_send_shutdown(struct usbnet *dev)
-{
- struct sierra_net_data *priv = sierra_net_get_private(dev);
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
-
- sierra_net_send_cmd(dev, priv->shdwn_msg,
- sizeof(priv->shdwn_msg), "Shutdown");
-}
-
-static void sierra_net_set_ctx_index(struct sierra_net_data *priv, u8 ctx_ix)
-{
- dev_dbg(&(priv->usbnet->udev->dev), "%s %d", __func__, ctx_ix);
- priv->tx_hdr_template[0] = 0x3F;
- priv->tx_hdr_template[1] = ctx_ix;
- *((u16 *)&priv->tx_hdr_template[2]) =
- cpu_to_be16(SIERRA_NET_HIP_EXT_IP_OUT_ID);
-}
-
-static inline int sierra_net_is_valid_addrlen(u8 len)
-{
- return (len == sizeof(struct in_addr));
-}
-
-static int sierra_net_parse_lsi(struct usbnet *dev, char *data, int datalen)
-{
- struct lsi_umts *lsi = (struct lsi_umts *)data;
-
- if (datalen < sizeof(struct lsi_umts)) {
- netdev_err(dev->net, "%s: Data length %d, exp %Zu\n",
- __func__, datalen,
- sizeof(struct lsi_umts));
- return -1;
- }
-
- if (lsi->length != cpu_to_be16(SIERRA_NET_LSI_UMTS_STATUS_LEN)) {
- netdev_err(dev->net, "%s: LSI_UMTS_STATUS_LEN %d, exp %u\n",
- __func__, be16_to_cpu(lsi->length),
- (u32)SIERRA_NET_LSI_UMTS_STATUS_LEN);
- return -1;
- }
-
- /* Validate the protocol - only support UMTS for now */
- if (lsi->protocol != SIERRA_NET_PROTOCOL_UMTS) {
- netdev_err(dev->net, "Protocol unsupported, 0x%02x\n",
- lsi->protocol);
- return -1;
- }
-
- /* Validate the link type */
- if ((lsi->link_type != SIERRA_NET_AS_LINK_TYPE_IPv4) &&
- (lsi->link_type != SIERRA_NET_AS_LINK_TYPE_IPv6)) {
- netdev_err(dev->net, "Link unavailable: 0x%02x",
- lsi->link_type);
- return 0;
- }
-
- /* Validate the coverage */
- if (lsi->coverage == SIERRA_NET_COVERAGE_NONE
- || lsi->coverage == SIERRA_NET_COVERAGE_NOPACKET) {
- netdev_err(dev->net, "No coverage, 0x%02x\n", lsi->coverage);
- return 0;
- }
-
- /* Validate the session state */
- if (lsi->session_state == SIERRA_NET_SESSION_IDLE) {
- netdev_err(dev->net, "Session idle, 0x%02x\n",
- lsi->session_state);
- return 0;
- }
-
- /* Set link_sense true */
- return 1;
-}
-
-static void sierra_net_handle_lsi(struct usbnet *dev, char *data,
- struct hip_hdr *hh)
-{
- struct sierra_net_data *priv = sierra_net_get_private(dev);
- int link_up;
-
- link_up = sierra_net_parse_lsi(dev, data + hh->hdrlen,
- hh->payload_len.word);
- if (link_up < 0) {
- netdev_err(dev->net, "Invalid LSI\n");
- return;
- }
- if (link_up) {
- sierra_net_set_ctx_index(priv, hh->msgspecific.byte);
- priv->link_up = 1;
- netif_carrier_on(dev->net);
- } else {
- priv->link_up = 0;
- netif_carrier_off(dev->net);
- }
-}
-
-static void sierra_net_dosync(struct usbnet *dev)
-{
- int status;
- struct sierra_net_data *priv = sierra_net_get_private(dev);
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
-
- /* tell modem we are ready */
- status = sierra_net_send_sync(dev);
- if (status < 0)
- netdev_err(dev->net,
- "Send SYNC failed, status %d\n", status);
- status = sierra_net_send_sync(dev);
- if (status < 0)
- netdev_err(dev->net,
- "Send SYNC failed, status %d\n", status);
-
- /* Now, start a timer and make sure we get the Restart Indication */
- priv->sync_timer.function = sierra_sync_timer;
- priv->sync_timer.data = (unsigned long) dev;
- priv->sync_timer.expires = jiffies + SIERRA_NET_SYNCDELAY;
- add_timer(&priv->sync_timer);
-}
-
-static void sierra_net_kevent(struct work_struct *work)
-{
- struct sierra_net_data *priv =
- container_of(work, struct sierra_net_data, sierra_net_kevent);
- struct usbnet *dev = priv->usbnet;
- int len;
- int err;
- u8 *buf;
- u8 ifnum;
-
- if (test_bit(SIERRA_NET_EVENT_RESP_AVAIL, &priv->kevent_flags)) {
- clear_bit(SIERRA_NET_EVENT_RESP_AVAIL, &priv->kevent_flags);
-
- /* Query the modem for the LSI message */
- buf = kzalloc(SIERRA_NET_USBCTL_BUF_LEN, GFP_KERNEL);
- if (!buf) {
- netdev_err(dev->net,
- "failed to allocate buf for LS msg\n");
- return;
- }
- ifnum = priv->ifnum;
- usb_autopm_get_interface(dev->intf);
- len = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0),
- USB_CDC_GET_ENCAPSULATED_RESPONSE,
- USB_DIR_IN|USB_TYPE_CLASS|USB_RECIP_INTERFACE,
- 0, ifnum, buf, SIERRA_NET_USBCTL_BUF_LEN,
- USB_CTRL_SET_TIMEOUT);
- usb_autopm_put_interface(dev->intf);
-
- if (unlikely(len < 0)) {
- netdev_err(dev->net,
- "usb_control_msg failed, status %d\n", len);
- } else {
- struct hip_hdr hh;
-
- dev_dbg(&dev->udev->dev, "%s: Received status message,"
- " %04x bytes", __func__, len);
- sierra_net_printk_buf(buf, len);
-
- err = parse_hip(buf, len, &hh);
- if (err) {
- netdev_err(dev->net, "%s: Bad packet,"
- " parse result %d\n", __func__, err);
- kfree(buf);
- return;
- }
-
- /* Validate packet length */
- if (len != hh.hdrlen + hh.payload_len.word) {
- netdev_err(dev->net, "%s: Bad packet, received"
- " %d, expected %d\n", __func__, len,
- hh.hdrlen + hh.payload_len.word);
- kfree(buf);
- return;
- }
-
- /* Switch on received message types */
- switch (hh.msgid.byte) {
- case SIERRA_NET_HIP_LSI_UMTSID:
- dev_dbg(&dev->udev->dev, "LSI for ctx:%d",
- hh.msgspecific.byte);
- sierra_net_handle_lsi(dev, buf, &hh);
- break;
- case SIERRA_NET_HIP_RESTART_ID:
- dev_dbg(&dev->udev->dev, "Restart reported: %d,"
- " stopping sync timer",
- hh.msgspecific.byte);
- /* Got sync resp - stop timer & clear mask */
- del_timer_sync(&priv->sync_timer);
- clear_bit(SIERRA_NET_TIMER_EXPIRY,
- &priv->kevent_flags);
- break;
- case SIERRA_NET_HIP_HSYNC_ID:
- dev_dbg(&dev->udev->dev, "SYNC received");
- err = sierra_net_send_sync(dev);
- if (err < 0)
- netdev_err(dev->net,
- "Send SYNC failed %d\n", err);
- break;
- case SIERRA_NET_HIP_EXTENDEDID:
- netdev_err(dev->net, "Unrecognized HIP msg, "
- "extmsgid 0x%04x\n", hh.extmsgid.word);
- break;
- case SIERRA_NET_HIP_RCGI:
- /* Ignored. It is a firmware
- * workaround to solve a Windows driver bug and
- * may be removed in the future.
- */
- break;
- default:
- netdev_err(dev->net, "Unrecognized HIP msg, "
- "msgid 0x%02x\n", hh.msgid.byte);
- break;
- }
- }
- kfree(buf);
- }
- /* The sync timer bit might be set */
- if (test_bit(SIERRA_NET_TIMER_EXPIRY, &priv->kevent_flags)) {
- clear_bit(SIERRA_NET_TIMER_EXPIRY, &priv->kevent_flags);
- dev_dbg(&dev->udev->dev, "Deferred sync timer expiry");
- sierra_net_dosync(priv->usbnet);
- }
-
- if (priv->kevent_flags)
- dev_dbg(&dev->udev->dev, "sierra_net_kevent done, "
- "kevent_flags = 0x%lx", priv->kevent_flags);
-}
-
-static void sierra_net_defer_kevent(struct usbnet *dev, int work)
-{
- struct sierra_net_data *priv = sierra_net_get_private(dev);
-
- set_bit(work, &priv->kevent_flags);
- if (!schedule_work(&priv->sierra_net_kevent))
- dev_dbg(&dev->udev->dev, "sierra_net_kevent %d may have been dropped", work);
- else
- dev_dbg(&dev->udev->dev, "sierra_net_kevent %d scheduled", work);
-}
-
-/*
- * Sync Retransmit Timer Handler. On expiry, kick the work queue
- */
-void sierra_sync_timer(unsigned long syncdata)
-{
- struct usbnet *dev = (struct usbnet *)syncdata;
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
- /* Kick the tasklet */
- sierra_net_defer_kevent(dev, SIERRA_NET_TIMER_EXPIRY);
-}
-
-static void sierra_net_status(struct usbnet *dev, struct urb *urb)
-{
- struct usb_cdc_notification *event;
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
- sierra_net_printk_buf(urb->transfer_buffer, urb->actual_length);
-
- if (urb->actual_length < sizeof *event)
- return;
-
- /* Add cases to handle other standard notifications. */
- event = urb->transfer_buffer;
- switch (event->bNotificationType) {
- case USB_CDC_NOTIFY_NETWORK_CONNECTION:
- case USB_CDC_NOTIFY_SPEED_CHANGE:
- /* USB 305 sends those */
- break;
- case USB_CDC_NOTIFY_RESPONSE_AVAILABLE:
- sierra_net_defer_kevent(dev, SIERRA_NET_EVENT_RESP_AVAIL);
- break;
- default:
- netdev_err(dev->net, ": unexpected notification %02x!\n",
- event->bNotificationType);
- break;
- }
-}
-
-static void sierra_net_get_drvinfo(struct net_device *net,
- struct ethtool_drvinfo *info)
-{
- /* Inherit standard device info */
- usbnet_get_drvinfo(net, info);
- strncpy(info->driver, driver_name, sizeof info->driver);
- strncpy(info->version, DRIVER_VERSION, sizeof info->version);
-}
-
-static u32 sierra_net_get_link(struct net_device *net)
-{
- struct usbnet *dev = netdev_priv(net);
- /* Report link is down whenever the interface is down */
- return sierra_net_get_private(dev)->link_up && netif_running(net);
-}
-
-static struct ethtool_ops sierra_net_ethtool_ops = {
- .get_drvinfo = sierra_net_get_drvinfo,
- .get_link = sierra_net_get_link,
- .get_msglevel = usbnet_get_msglevel,
- .set_msglevel = usbnet_set_msglevel,
- .get_settings = usbnet_get_settings,
- .set_settings = usbnet_set_settings,
- .nway_reset = usbnet_nway_reset,
-};
-
-/* MTU can not be more than 1500 bytes, enforce it. */
-static int sierra_net_change_mtu(struct net_device *net, int new_mtu)
-{
- if (new_mtu > SIERRA_NET_MAX_SUPPORTED_MTU)
- return -EINVAL;
-
- return usbnet_change_mtu(net, new_mtu);
-}
-
-static int is_whitelisted(const u8 ifnum,
- const struct sierra_net_iface_info *whitelist)
-{
- if (whitelist) {
- const u8 *list = whitelist->ifaceinfo;
- int i;
-
- for (i = 0; i < whitelist->infolen; i++) {
- if (list[i] == ifnum)
- return 1;
- }
- }
- return 0;
-}
-
-static int sierra_net_get_fw_attr(struct usbnet *dev, u16 *datap)
-{
- int result = 0;
- u16 *attrdata;
-
- attrdata = kmalloc(sizeof(*attrdata), GFP_KERNEL);
- if (!attrdata)
- return -ENOMEM;
-
- usb_autopm_get_interface(dev->intf);
- result = usb_control_msg(
- dev->udev,
- usb_rcvctrlpipe(dev->udev, 0),
- /* _u8 vendor specific request */
- SWI_USB_REQUEST_GET_FW_ATTR,
- USB_DIR_IN | USB_TYPE_VENDOR, /* __u8 request type */
- 0x0000, /* __u16 value not used */
- 0x0000, /* __u16 index not used */
- attrdata, /* char *data */
- sizeof(*attrdata), /* __u16 size */
- USB_CTRL_SET_TIMEOUT); /* int timeout */
- usb_autopm_put_interface(dev->intf);
-
- if (result < 0) {
- kfree(attrdata);
- return -EIO;
- }
-
- *datap = *attrdata;
-
- kfree(attrdata);
- return result;
-}
-
-static int sierra_net_manage_power(struct usbnet *dev, int on)
-{
- dev->intf->needs_remote_wakeup = on;
- return 0;
-}
-
-/*
- * collects the bulk endpoints, the status endpoint.
- */
-static int sierra_net_bind(struct usbnet *dev, struct usb_interface *intf)
-{
- u8 ifacenum;
- u8 numendpoints;
- u16 fwattr = 0;
- int status;
- struct ethhdr *eth;
- struct sierra_net_data *priv;
- static const u8 sync_tmplate[sizeof(priv->sync_msg)] = {
- 0x00, 0x00, SIERRA_NET_HIP_MSYNC_ID, 0x00};
- static const u8 shdwn_tmplate[sizeof(priv->shdwn_msg)] = {
- 0x00, 0x00, SIERRA_NET_HIP_SHUTD_ID, 0x00};
-
- struct sierra_net_info_data *data =
- (struct sierra_net_info_data *)dev->driver_info->data;
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
-
- ifacenum = intf->cur_altsetting->desc.bInterfaceNumber;
- /* We only accept certain interfaces */
- if (!is_whitelisted(ifacenum, &data->whitelist)) {
- dev_dbg(&dev->udev->dev, "Ignoring interface: %d", ifacenum);
- return -ENODEV;
- }
- numendpoints = intf->cur_altsetting->desc.bNumEndpoints;
- /* We have three endpoints, bulk in and out, and a status */
- if (numendpoints != 3) {
- dev_err(&dev->udev->dev, "Expected 3 endpoints, found: %d",
- numendpoints);
- return -ENODEV;
- }
- /* Status endpoint set in usbnet_get_endpoints() */
- dev->status = NULL;
- status = usbnet_get_endpoints(dev, intf);
- if (status < 0) {
- dev_err(&dev->udev->dev, "Error in usbnet_get_endpoints (%d)",
- status);
- return -ENODEV;
- }
- /* Initialize sierra private data */
- priv = kzalloc(sizeof *priv, GFP_KERNEL);
- if (!priv) {
- dev_err(&dev->udev->dev, "No memory");
- return -ENOMEM;
- }
-
- priv->usbnet = dev;
- priv->ifnum = ifacenum;
- /* override change_mtu with our own routine - need to bound check */
- /* replace structure to our own structure where we have our own
- * routine - need to bound check
- */
- dev->net->netdev_ops = &sierra_net_device_ops;
-
- /* change MAC addr to include, ifacenum, and to be unique */
- dev->net->dev_addr[ETH_ALEN-2] = atomic_inc_return(&iface_counter);
- dev->net->dev_addr[ETH_ALEN-1] = ifacenum;
-
- /* we will have to manufacture ethernet headers, prepare template */
- eth = (struct ethhdr *)priv->ethr_hdr_tmpl;
- memcpy(&eth->h_dest, dev->net->dev_addr, ETH_ALEN);
- eth->h_proto = cpu_to_be16(ETH_P_IP);
-
- /* prepare shutdown message template */
- memcpy(priv->shdwn_msg, shdwn_tmplate, sizeof(priv->shdwn_msg));
- /* set context index initially to 0 - prepares tx hdr template */
- sierra_net_set_ctx_index(priv, 0);
-
- /* decrease the rx_urb_size and max_tx_size to 4k on USB 1.1 */
- dev->rx_urb_size = data->rx_urb_size;
- if (dev->udev->speed != USB_SPEED_HIGH)
- dev->rx_urb_size = min_t(size_t, 4096, data->rx_urb_size);
-
- dev->net->hard_header_len += SIERRA_NET_HIP_EXT_HDR_LEN;
- dev->hard_mtu = dev->net->mtu + dev->net->hard_header_len;
-
- /* Set up the netdev */
- dev->net->flags |= IFF_NOARP;
- dev->net->flags |= IFF_MULTICAST;
- dev->net->ethtool_ops = &sierra_net_ethtool_ops;
- netif_carrier_off(dev->net);
-
- sierra_net_set_private(dev, priv);
-
- priv->kevent_flags = 0;
-
- /* Use the shared workqueue */
- INIT_WORK(&priv->sierra_net_kevent, sierra_net_kevent);
-
- /* Only need to do this once */
- init_timer(&priv->sync_timer);
- /* verify fw attributes */
- status = sierra_net_get_fw_attr(dev, &fwattr);
- dev_dbg(&dev->udev->dev, "Fw attr: %x\n", fwattr);
- if (status == sizeof(fwattr) && (fwattr & SWI_GET_FW_ATTR_APM)) {
-/*******************************************************************************
- * If you want the default /sys/bus/usb/devices/.../.../power/level to be forced
- * to auto, the following needs to be compiled in.
- */
-#ifdef POWER_LEVEL_AUTO
- /* make power level default be 'auto' */
- dev_dbg(&dev->udev->dev, "Enabling APM");
- usb_enable_autosuspend(dev->udev);
-#endif
- } else {
- dev_info(&intf->dev, "Disabling APM - not supported");
- usb_disable_autosuspend(dev->udev);
- }
- /* test whether firmware supports DHCP */
- if (!(status == sizeof(fwattr) && (fwattr & SWI_GET_FW_ATTR_MASK))) {
- /* found incompatible firmware version */
- dev_err(&dev->udev->dev, "Incompatible driver and firmware"
- " versions\n");
- kfree(priv);
- return -ENODEV;
- }
- /* prepare sync message from template */
- memcpy(priv->sync_msg, sync_tmplate, sizeof(priv->sync_msg));
-
- return 0;
-}
-
-static void sierra_net_unbind(struct usbnet *dev, struct usb_interface *intf)
-{
- struct sierra_net_data *priv = sierra_net_get_private(dev);
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
-
- sierra_net_set_private(dev, NULL);
-
- kfree(priv);
-}
-
-static int sierra_net_open(struct usbnet *dev)
-{
- dev_dbg(&dev->udev->dev, "%s", __func__);
-
- /* initiate the sync sequence */
- sierra_net_dosync(dev);
-
- return 0;
-}
-
-static int sierra_net_stop(struct usbnet *dev)
-{
- struct sierra_net_data *priv = sierra_net_get_private(dev);
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
-
- /* Kill the timer then flush the work queue */
- del_timer_sync(&priv->sync_timer);
-
- cancel_work_sync(&priv->sierra_net_kevent);
-
- /* tell modem we are going away */
- sierra_net_send_shutdown(dev);
-
- return 0;
-}
-
-static struct sk_buff *sierra_net_skb_clone(struct usbnet *dev,
- struct sk_buff *skb, int len)
-{
- struct sk_buff *new_skb;
-
- /* clone skb */
- new_skb = skb_clone(skb, GFP_ATOMIC);
-
- /* remove len bytes from original */
- skb_pull(skb, len);
-
- /* trim next packet to it's length */
- if (new_skb) {
- skb_trim(new_skb, len);
- } else {
- if (netif_msg_rx_err(dev))
- netdev_err(dev->net, "failed to get skb\n");
- dev->net->stats.rx_dropped++;
- }
-
- return new_skb;
-}
-
-/* ---------------------------- Receive data path ----------------------*/
-static int sierra_net_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
-{
- int err;
- struct hip_hdr hh;
- struct sk_buff *new_skb;
- struct ethhdr *eth;
- struct iphdr *ip;
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
-
- sierra_net_printk_buf(skb->data, skb->len);
-
- /* could contain multiple packets */
- while (likely(skb->len)) {
- err = parse_hip(skb->data, skb->len, &hh);
- if (err) {
- if (netif_msg_rx_err(dev))
- netdev_err(dev->net, "Invalid HIP header %d\n",
- err);
- /* dev->net->stats.rx_errors incremented by caller */
- dev->net->stats.rx_length_errors++;
- return 0;
- }
-
- /* Validate Extended HIP header */
- if (!hh.extmsgid.is_present
- || hh.extmsgid.word != SIERRA_NET_HIP_EXT_IP_IN_ID) {
- if (netif_msg_rx_err(dev))
- netdev_err(dev->net, "HIP/ETH: Invalid pkt\n");
-
- dev->net->stats.rx_frame_errors++;
- /* dev->net->stats.rx_errors incremented by caller */;
- return 0;
- }
-
- skb_pull(skb, hh.hdrlen);
-
- /* We are going to accept this packet, prepare it */
- memcpy(skb->data, sierra_net_get_private(dev)->ethr_hdr_tmpl,
- ETH_HLEN);
-
- ip = (struct iphdr *)((char *)skb->data + ETH_HLEN);
- if(ip->version == 6) {
- eth = (struct ethhdr *)skb->data;
- eth->h_proto = cpu_to_be16(ETH_P_IPV6);
- }
-
- /* Last packet in batch handled by usbnet */
- if (hh.payload_len.word == skb->len)
- return 1;
-
- new_skb = sierra_net_skb_clone(dev, skb, hh.payload_len.word);
- if (new_skb)
- usbnet_skb_return(dev, new_skb);
-
- } /* while */
-
- return 0;
-}
-
-/* ---------------------------- Transmit data path ----------------------*/
-struct sk_buff *sierra_net_tx_fixup(struct usbnet *dev, struct sk_buff *skb,
- gfp_t flags)
-{
- struct sierra_net_data *priv = sierra_net_get_private(dev);
- u16 len;
- bool need_tail;
-
- dev_dbg(&dev->udev->dev, "%s", __func__);
- if (priv->link_up && check_ethip_packet(skb, dev) && is_ip(skb)) {
- /* enough head room as is? */
- if (SIERRA_NET_HIP_EXT_HDR_LEN <= skb_headroom(skb)) {
- /* Save the Eth/IP length and set up HIP hdr */
- len = skb->len;
- skb_push(skb, SIERRA_NET_HIP_EXT_HDR_LEN);
- /* Handle ZLP issue */
- need_tail = ((len + SIERRA_NET_HIP_EXT_HDR_LEN)
- % dev->maxpacket == 0);
- if (need_tail) {
- if (unlikely(skb_tailroom(skb) == 0)) {
- netdev_err(dev->net, "tx_fixup:"
- "no room for packet\n");
- dev_kfree_skb_any(skb);
- return NULL;
- } else {
- skb->data[skb->len] = 0;
- __skb_put(skb, 1);
- len = len + 1;
- }
- }
- build_hip(skb->data, len, priv);
-
- sierra_net_printk_buf(skb->data, skb->len);
- return skb;
- } else {
- /*
- * compensate in the future if necessary
- */
- netdev_err(dev->net, "tx_fixup: no room for HIP\n");
- } /* headroom */
- }
-
- if (!priv->link_up)
- dev->net->stats.tx_carrier_errors++;
-
- /* tx_dropped incremented by usbnet */
-
- /* filter the packet out, release it */
- dev_kfree_skb_any(skb);
- return NULL;
-}
-
-static int sierra_net_reset_resume(struct usb_interface *intf)
-{
- struct usbnet *dev = usb_get_intfdata(intf);
- netdev_err(dev->net, "%s\n", __func__);
- return usbnet_resume(intf);
-}
-
-static const u8 sierra_net_ifnum_list[] = { 7, 10, 11 };
-static const struct sierra_net_info_data sierra_net_info_data_direct_ip = {
- /* .rx_urb_size = 8 * 1024, */
- .rx_urb_size = SIERRA_NET_RX_URB_SZ,
- .whitelist = {
- .infolen = ARRAY_SIZE(sierra_net_ifnum_list),
- .ifaceinfo = sierra_net_ifnum_list
- }
-};
-
-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,
- .unbind = sierra_net_unbind,
- .status = sierra_net_status,
- .rx_fixup = sierra_net_rx_fixup,
- .tx_fixup = sierra_net_tx_fixup,
- .manage_power = sierra_net_manage_power,
- .stop = sierra_net_stop,
- .check_connect = sierra_net_open,
- .data = (unsigned long)&sierra_net_info_data_direct_ip,
-};
-
-static const struct usb_device_id products[] = {
- {USB_DEVICE(0x1199, 0x68A3), /* Sierra Wireless Direct IP modem */
- .driver_info = (unsigned long) &sierra_net_info_direct_ip},
- {USB_DEVICE(0xF3D, 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(0xF3D, 0x68AA), /* AT&T Direct IP LTE modem */
- .driver_info = (unsigned long) &sierra_net_info_direct_ip},
-
- {}, /* last item */
-};
-MODULE_DEVICE_TABLE(usb, products);
-
-/* We are based on usbnet, so let it handle the USB driver specifics */
-static struct usb_driver sierra_net_driver = {
- .name = "sierra_net",
- .id_table = products,
- .probe = usbnet_probe,
- .disconnect = usbnet_disconnect,
- .suspend = usbnet_suspend,
- .resume = usbnet_resume,
- .reset_resume = sierra_net_reset_resume,
- .no_dynamic_id = 1,
- .supports_autosuspend = 1,
-};
-
-static int __init sierra_net_init(void)
-{
- BUILD_BUG_ON(FIELD_SIZEOF(struct usbnet, data)
- < sizeof(struct cdc_state));
-
- return usb_register(&sierra_net_driver);
-}
-
-static void __exit sierra_net_exit(void)
-{
- usb_deregister(&sierra_net_driver);
-}
-
-module_exit(sierra_net_exit);
-module_init(sierra_net_init);
-
-MODULE_AUTHOR(DRIVER_AUTHOR);
-MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_VERSION(DRIVER_VERSION);
-MODULE_LICENSE("GPL");