Merge branch 'cdc_mbim-next'
Bjørn Mork says:
====================
cdc_mbim: cleanups and new features
This series depends on commit 6b5eeb7f87 ("net: cdc_mbim: handle
unaccelerated VLAN tagged frames"), which is currently in "net" but
not yet in "net-next".
Patch 4 might have a minor context collision with the "cdc_ncm: add
buffer tuning and stats using ethtool" series I just posted for
review. Please let me know if I should submit an adjusted version
in either direction. These two series' are otherwise completely
independent of each other.
The major new feature here is in patch 1, which I hope will solve
some problems with the original design without changing the existing
API, optionally allowing IP session 0 to be treated like any other
MBIM session.
The rest are some minor cleanups and finally some documentation of
the current driver APIs, after this series has been applied. I
started feeling a bit more mortal than usual lately, which probably
is healthy, and realized that I should put some of the stuff in my
head in a somewhat less volatile storage.
v2:
Fixed patch 1 so that it actually does what it claims to do. This time
it is even tested for functionality, and not just build tested...
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
commit
4b9734e547
|
|
@ -0,0 +1,339 @@
|
|||
cdc_mbim - Driver for CDC MBIM Mobile Broadband modems
|
||||
========================================================
|
||||
|
||||
The cdc_mbim driver supports USB devices conforming to the "Universal
|
||||
Serial Bus Communications Class Subclass Specification for Mobile
|
||||
Broadband Interface Model" [1], which is a further development of
|
||||
"Universal Serial Bus Communications Class Subclass Specifications for
|
||||
Network Control Model Devices" [2] optimized for Mobile Broadband
|
||||
devices, aka "3G/LTE modems".
|
||||
|
||||
|
||||
Command Line Parameters
|
||||
=======================
|
||||
|
||||
The cdc_mbim driver has no parameters of its own. But the probing
|
||||
behaviour for NCM 1.0 backwards compatible MBIM functions (an
|
||||
"NCM/MBIM function" as defined in section 3.2 of [1]) is affected
|
||||
by a cdc_ncm driver parameter:
|
||||
|
||||
prefer_mbim
|
||||
-----------
|
||||
Type: Boolean
|
||||
Valid Range: N/Y (0-1)
|
||||
Default Value: Y (MBIM is preferred)
|
||||
|
||||
This parameter sets the system policy for NCM/MBIM functions. Such
|
||||
functions will be handled by either the cdc_ncm driver or the cdc_mbim
|
||||
driver depending on the prefer_mbim setting. Setting prefer_mbim=N
|
||||
makes the cdc_mbim driver ignore these functions and lets the cdc_ncm
|
||||
driver handle them instead.
|
||||
|
||||
The parameter is writable, and can be changed at any time. A manual
|
||||
unbind/bind is required to make the change effective for NCM/MBIM
|
||||
functions bound to the "wrong" driver
|
||||
|
||||
|
||||
Basic usage
|
||||
===========
|
||||
|
||||
MBIM functions are inactive when unmanaged. The cdc_mbim driver only
|
||||
provides an userspace interface to the MBIM control channel, and will
|
||||
not participate in the management of the function. This implies that a
|
||||
userspace MBIM management application always is required to enable a
|
||||
MBIM function.
|
||||
|
||||
Such userspace applications includes, but are not limited to:
|
||||
- mbimcli (included with the libmbim [3] library), and
|
||||
- ModemManager [4]
|
||||
|
||||
Establishing a MBIM IP session reequires at least these actions by the
|
||||
management application:
|
||||
- open the control channel
|
||||
- configure network connection settings
|
||||
- connect to network
|
||||
- configure IP interface
|
||||
|
||||
Management application development
|
||||
----------------------------------
|
||||
The driver <-> userspace interfaces are described below. The MBIM
|
||||
control channel protocol is described in [1].
|
||||
|
||||
|
||||
MBIM control channel userspace ABI
|
||||
==================================
|
||||
|
||||
/dev/cdc-wdmX character device
|
||||
------------------------------
|
||||
The driver creates a two-way pipe to the MBIM function control channel
|
||||
using the cdc-wdm driver as a subdriver. The userspace end of the
|
||||
control channel pipe is a /dev/cdc-wdmX character device.
|
||||
|
||||
The cdc_mbim driver does not process or police messages on the control
|
||||
channel. The channel is fully delegated to the userspace management
|
||||
application. It is therefore up to this application to ensure that it
|
||||
complies with all the control channel requirements in [1].
|
||||
|
||||
The cdc-wdmX device is created as a child of the MBIM control
|
||||
interface USB device. The character device associated with a specific
|
||||
MBIM function can be looked up using sysfs. For example:
|
||||
|
||||
bjorn@nemi:~$ ls /sys/bus/usb/drivers/cdc_mbim/2-4:2.12/usbmisc
|
||||
cdc-wdm0
|
||||
|
||||
bjorn@nemi:~$ grep . /sys/bus/usb/drivers/cdc_mbim/2-4:2.12/usbmisc/cdc-wdm0/dev
|
||||
180:0
|
||||
|
||||
|
||||
USB configuration descriptors
|
||||
-----------------------------
|
||||
The wMaxControlMessage field of the CDC MBIM functional descriptor
|
||||
limits the maximum control message size. The managament application is
|
||||
responsible for negotiating a control message size complying with the
|
||||
requirements in section 9.3.1 of [1], taking this descriptor field
|
||||
into consideration.
|
||||
|
||||
The userspace application can access the CDC MBIM functional
|
||||
descriptor of a MBIM function using either of the two USB
|
||||
configuration descriptor kernel interfaces described in [6] or [7].
|
||||
|
||||
See also the ioctl documentation below.
|
||||
|
||||
|
||||
Fragmentation
|
||||
-------------
|
||||
The userspace application is responsible for all control message
|
||||
fragmentation and defragmentaion, as described in section 9.5 of [1].
|
||||
|
||||
|
||||
/dev/cdc-wdmX write()
|
||||
---------------------
|
||||
The MBIM control messages from the management application *must not*
|
||||
exceed the negotiated control message size.
|
||||
|
||||
|
||||
/dev/cdc-wdmX read()
|
||||
--------------------
|
||||
The management application *must* accept control messages of up the
|
||||
negotiated control message size.
|
||||
|
||||
|
||||
/dev/cdc-wdmX ioctl()
|
||||
--------------------
|
||||
IOCTL_WDM_MAX_COMMAND: Get Maximum Command Size
|
||||
This ioctl returns the wMaxControlMessage field of the CDC MBIM
|
||||
functional descriptor for MBIM devices. This is intended as a
|
||||
convenience, eliminating the need to parse the USB descriptors from
|
||||
userspace.
|
||||
|
||||
#include <stdio.h>
|
||||
#include <fcntl.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <linux/types.h>
|
||||
#include <linux/usb/cdc-wdm.h>
|
||||
int main()
|
||||
{
|
||||
__u16 max;
|
||||
int fd = open("/dev/cdc-wdm0", O_RDWR);
|
||||
if (!ioctl(fd, IOCTL_WDM_MAX_COMMAND, &max))
|
||||
printf("wMaxControlMessage is %d\n", max);
|
||||
}
|
||||
|
||||
|
||||
Custom device services
|
||||
----------------------
|
||||
The MBIM specification allows vendors to freely define additional
|
||||
services. This is fully supported by the cdc_mbim driver.
|
||||
|
||||
Support for new MBIM services, including vendor specified services, is
|
||||
implemented entirely in userspace, like the rest of the MBIM control
|
||||
protocol
|
||||
|
||||
New services should be registered in the MBIM Registry [5].
|
||||
|
||||
|
||||
|
||||
MBIM data channel userspace ABI
|
||||
===============================
|
||||
|
||||
wwanY network device
|
||||
--------------------
|
||||
The cdc_mbim driver represents the MBIM data channel as a single
|
||||
network device of the "wwan" type. This network device is initially
|
||||
mapped to MBIM IP session 0.
|
||||
|
||||
|
||||
Multiplexed IP sessions (IPS)
|
||||
-----------------------------
|
||||
MBIM allows multiplexing up to 256 IP sessions over a single USB data
|
||||
channel. The cdc_mbim driver models such IP sessions as 802.1q VLAN
|
||||
subdevices of the master wwanY device, mapping MBIM IP session Z to
|
||||
VLAN ID Z for all values of Z greater than 0.
|
||||
|
||||
The device maximum Z is given in the MBIM_DEVICE_CAPS_INFO structure
|
||||
described in section 10.5.1 of [1].
|
||||
|
||||
The userspace management application is responsible for adding new
|
||||
VLAN links prior to establishing MBIM IP sessions where the SessionId
|
||||
is greater than 0. These links can be added by using the normal VLAN
|
||||
kernel interfaces, either ioctl or netlink.
|
||||
|
||||
For example, adding a link for a MBIM IP session with SessionId 3:
|
||||
|
||||
ip link add link wwan0 name wwan0.3 type vlan id 3
|
||||
|
||||
The driver will automatically map the "wwan0.3" network device to MBIM
|
||||
IP session 3.
|
||||
|
||||
|
||||
Device Service Streams (DSS)
|
||||
----------------------------
|
||||
MBIM also allows up to 256 non-IP data streams to be multiplexed over
|
||||
the same shared USB data channel. The cdc_mbim driver models these
|
||||
sessions as another set of 802.1q VLAN subdevices of the master wwanY
|
||||
device, mapping MBIM DSS session A to VLAN ID (256 + A) for all values
|
||||
of A.
|
||||
|
||||
The device maximum A is given in the MBIM_DEVICE_SERVICES_INFO
|
||||
structure described in section 10.5.29 of [1].
|
||||
|
||||
The DSS VLAN subdevices are used as a practical interface between the
|
||||
shared MBIM data channel and a MBIM DSS aware userspace application.
|
||||
It is not intended to be presented as-is to an end user. The
|
||||
assumption is that an userspace application initiating a DSS session
|
||||
also takes care of the necessary framing of the DSS data, presenting
|
||||
the stream to the end user in an appropriate way for the stream type.
|
||||
|
||||
The network device ABI requires a dummy ethernet header for every DSS
|
||||
data frame being transported. The contents of this header is
|
||||
arbitrary, with the following exceptions:
|
||||
- TX frames using an IP protocol (0x0800 or 0x86dd) will be dropped
|
||||
- RX frames will have the protocol field set to ETH_P_802_3 (but will
|
||||
not be properly formatted 802.3 frames)
|
||||
- RX frames will have the destination address set to the hardware
|
||||
address of the master device
|
||||
|
||||
The DSS supporting userspace management application is responsible for
|
||||
adding the dummy ethernet header on TX and stripping it on RX.
|
||||
|
||||
This is a simple example using tools commonly available, exporting
|
||||
DssSessionId 5 as a pty character device pointed to by a /dev/nmea
|
||||
symlink:
|
||||
|
||||
ip link add link wwan0 name wwan0.dss5 type vlan id 261
|
||||
ip link set dev wwan0.dss5 up
|
||||
socat INTERFACE:wwan0.dss5,type=2 PTY:,echo=0,link=/dev/nmea
|
||||
|
||||
This is only an example, most suitable for testing out a DSS
|
||||
service. Userspace applications supporting specific MBIM DSS services
|
||||
are expected to use the tools and programming interfaces required by
|
||||
that service.
|
||||
|
||||
Note that adding VLAN links for DSS sessions is entirely optional. A
|
||||
management application may instead choose to bind a packet socket
|
||||
directly to the master network device, using the received VLAN tags to
|
||||
map frames to the correct DSS session and adding 18 byte VLAN ethernet
|
||||
headers with the appropriate tag on TX. In this case using a socket
|
||||
filter is recommended, matching only the DSS VLAN subset. This avoid
|
||||
unnecessary copying of unrelated IP session data to userspace. For
|
||||
example:
|
||||
|
||||
static struct sock_filter dssfilter[] = {
|
||||
/* use special negative offsets to get VLAN tag */
|
||||
BPF_STMT(BPF_LD|BPF_B|BPF_ABS, SKF_AD_OFF + SKF_AD_VLAN_TAG_PRESENT),
|
||||
BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, 1, 0, 6), /* true */
|
||||
|
||||
/* verify DSS VLAN range */
|
||||
BPF_STMT(BPF_LD|BPF_H|BPF_ABS, SKF_AD_OFF + SKF_AD_VLAN_TAG),
|
||||
BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 256, 0, 4), /* 256 is first DSS VLAN */
|
||||
BPF_JUMP(BPF_JMP|BPF_JGE|BPF_K, 512, 3, 0), /* 511 is last DSS VLAN */
|
||||
|
||||
/* verify ethertype */
|
||||
BPF_STMT(BPF_LD|BPF_H|BPF_ABS, 2 * ETH_ALEN),
|
||||
BPF_JUMP(BPF_JMP|BPF_JEQ|BPF_K, ETH_P_802_3, 0, 1),
|
||||
|
||||
BPF_STMT(BPF_RET|BPF_K, (u_int)-1), /* accept */
|
||||
BPF_STMT(BPF_RET|BPF_K, 0), /* ignore */
|
||||
};
|
||||
|
||||
|
||||
|
||||
Tagged IP session 0 VLAN
|
||||
------------------------
|
||||
As described above, MBIM IP session 0 is treated as special by the
|
||||
driver. It is initially mapped to untagged frames on the wwanY
|
||||
network device.
|
||||
|
||||
This mapping implies a few restrictions on multiplexed IPS and DSS
|
||||
sessions, which may not always be practical:
|
||||
- no IPS or DSS session can use a frame size greater than the MTU on
|
||||
IP session 0
|
||||
- no IPS or DSS session can be in the up state unless the network
|
||||
device representing IP session 0 also is up
|
||||
|
||||
These problems can be avoided by optionally making the driver map IP
|
||||
session 0 to a VLAN subdevice, similar to all other IP sessions. This
|
||||
behaviour is triggered by adding a VLAN link for the magic VLAN ID
|
||||
4094. The driver will then immediately start mapping MBIM IP session
|
||||
0 to this VLAN, and will drop untagged frames on the master wwanY
|
||||
device.
|
||||
|
||||
Tip: It might be less confusing to the end user to name this VLAN
|
||||
subdevice after the MBIM SessionID instead of the VLAN ID. For
|
||||
example:
|
||||
|
||||
ip link add link wwan0 name wwan0.0 type vlan id 4094
|
||||
|
||||
|
||||
VLAN mapping
|
||||
------------
|
||||
|
||||
Summarizing the cdc_mbim driver mapping described above, we have this
|
||||
relationship between VLAN tags on the wwanY network device and MBIM
|
||||
sessions on the shared USB data channel:
|
||||
|
||||
VLAN ID MBIM type MBIM SessionID Notes
|
||||
---------------------------------------------------------
|
||||
untagged IPS 0 a)
|
||||
1 - 255 IPS 1 - 255 <VLANID>
|
||||
256 - 511 DSS 0 - 255 <VLANID - 256>
|
||||
512 - 4093 b)
|
||||
4094 IPS 0 c)
|
||||
|
||||
a) if no VLAN ID 4094 link exists, else dropped
|
||||
b) unsupported VLAN range, unconditionally dropped
|
||||
c) if a VLAN ID 4094 link exists, else dropped
|
||||
|
||||
|
||||
|
||||
|
||||
References
|
||||
==========
|
||||
|
||||
[1] USB Implementers Forum, Inc. - "Universal Serial Bus
|
||||
Communications Class Subclass Specification for Mobile Broadband
|
||||
Interface Model", Revision 1.0 (Errata 1), May 1, 2013
|
||||
- http://www.usb.org/developers/docs/devclass_docs/
|
||||
|
||||
[2] USB Implementers Forum, Inc. - "Universal Serial Bus
|
||||
Communications Class Subclass Specifications for Network Control
|
||||
Model Devices", Revision 1.0 (Errata 1), November 24, 2010
|
||||
- http://www.usb.org/developers/docs/devclass_docs/
|
||||
|
||||
[3] libmbim - "a glib-based library for talking to WWAN modems and
|
||||
devices which speak the Mobile Interface Broadband Model (MBIM)
|
||||
protocol"
|
||||
- http://www.freedesktop.org/wiki/Software/libmbim/
|
||||
|
||||
[4] ModemManager - "a DBus-activated daemon which controls mobile
|
||||
broadband (2G/3G/4G) devices and connections"
|
||||
- http://www.freedesktop.org/wiki/Software/ModemManager/
|
||||
|
||||
[5] "MBIM (Mobile Broadband Interface Model) Registry"
|
||||
- http://compliance.usb.org/mbim/
|
||||
|
||||
[6] "/proc/bus/usb filesystem output"
|
||||
- Documentation/usb/proc_usb_info.txt
|
||||
|
||||
[7] "/sys/bus/usb/devices/.../descriptors"
|
||||
- Documentation/ABI/stable/sysfs-bus-usb
|
||||
|
|
@ -24,13 +24,21 @@
|
|||
#include <net/ipv6.h>
|
||||
#include <net/addrconf.h>
|
||||
|
||||
/* alternative VLAN for IP session 0 if not untagged */
|
||||
#define MBIM_IPS0_VID 4094
|
||||
|
||||
/* driver specific data - must match cdc_ncm usage */
|
||||
struct cdc_mbim_state {
|
||||
struct cdc_ncm_ctx *ctx;
|
||||
atomic_t pmcount;
|
||||
struct usb_driver *subdriver;
|
||||
struct usb_interface *control;
|
||||
struct usb_interface *data;
|
||||
unsigned long _unused;
|
||||
unsigned long flags;
|
||||
};
|
||||
|
||||
/* flags for the cdc_mbim_state.flags field */
|
||||
enum cdc_mbim_flags {
|
||||
FLAG_IPS0_VLAN = 1 << 0, /* IP session 0 is tagged */
|
||||
};
|
||||
|
||||
/* using a counter to merge subdriver requests with our own into a combined state */
|
||||
|
|
@ -62,16 +70,91 @@ static int cdc_mbim_wdm_manage_power(struct usb_interface *intf, int status)
|
|||
return cdc_mbim_manage_power(dev, status);
|
||||
}
|
||||
|
||||
static int cdc_mbim_rx_add_vid(struct net_device *netdev, __be16 proto, u16 vid)
|
||||
{
|
||||
struct usbnet *dev = netdev_priv(netdev);
|
||||
struct cdc_mbim_state *info = (void *)&dev->data;
|
||||
|
||||
/* creation of this VLAN is a request to tag IP session 0 */
|
||||
if (vid == MBIM_IPS0_VID)
|
||||
info->flags |= FLAG_IPS0_VLAN;
|
||||
else
|
||||
if (vid >= 512) /* we don't map these to MBIM session */
|
||||
return -EINVAL;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cdc_mbim_rx_kill_vid(struct net_device *netdev, __be16 proto, u16 vid)
|
||||
{
|
||||
struct usbnet *dev = netdev_priv(netdev);
|
||||
struct cdc_mbim_state *info = (void *)&dev->data;
|
||||
|
||||
/* this is a request for an untagged IP session 0 */
|
||||
if (vid == MBIM_IPS0_VID)
|
||||
info->flags &= ~FLAG_IPS0_VLAN;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct net_device_ops cdc_mbim_netdev_ops = {
|
||||
.ndo_open = usbnet_open,
|
||||
.ndo_stop = usbnet_stop,
|
||||
.ndo_start_xmit = usbnet_start_xmit,
|
||||
.ndo_tx_timeout = usbnet_tx_timeout,
|
||||
.ndo_change_mtu = usbnet_change_mtu,
|
||||
.ndo_set_mac_address = eth_mac_addr,
|
||||
.ndo_validate_addr = eth_validate_addr,
|
||||
.ndo_vlan_rx_add_vid = cdc_mbim_rx_add_vid,
|
||||
.ndo_vlan_rx_kill_vid = cdc_mbim_rx_kill_vid,
|
||||
};
|
||||
|
||||
/* Change the control interface altsetting and update the .driver_info
|
||||
* pointer if the matching entry after changing class codes points to
|
||||
* a different struct
|
||||
*/
|
||||
static int cdc_mbim_set_ctrlalt(struct usbnet *dev, struct usb_interface *intf, u8 alt)
|
||||
{
|
||||
struct usb_driver *driver = to_usb_driver(intf->dev.driver);
|
||||
const struct usb_device_id *id;
|
||||
struct driver_info *info;
|
||||
int ret;
|
||||
|
||||
ret = usb_set_interface(dev->udev,
|
||||
intf->cur_altsetting->desc.bInterfaceNumber,
|
||||
alt);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
id = usb_match_id(intf, driver->id_table);
|
||||
if (!id)
|
||||
return -ENODEV;
|
||||
|
||||
info = (struct driver_info *)id->driver_info;
|
||||
if (info != dev->driver_info) {
|
||||
dev_dbg(&intf->dev, "driver_info updated to '%s'\n",
|
||||
info->description);
|
||||
dev->driver_info = info;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int cdc_mbim_bind(struct usbnet *dev, struct usb_interface *intf)
|
||||
{
|
||||
struct cdc_ncm_ctx *ctx;
|
||||
struct usb_driver *subdriver = ERR_PTR(-ENODEV);
|
||||
int ret = -ENODEV;
|
||||
u8 data_altsetting = cdc_ncm_select_altsetting(dev, intf);
|
||||
u8 data_altsetting = 1;
|
||||
struct cdc_mbim_state *info = (void *)&dev->data;
|
||||
|
||||
/* Probably NCM, defer for cdc_ncm_bind */
|
||||
/* should we change control altsetting on a NCM/MBIM function? */
|
||||
if (cdc_ncm_select_altsetting(intf) == CDC_NCM_COMM_ALTSETTING_MBIM) {
|
||||
data_altsetting = CDC_NCM_DATA_ALTSETTING_MBIM;
|
||||
ret = cdc_mbim_set_ctrlalt(dev, intf, CDC_NCM_COMM_ALTSETTING_MBIM);
|
||||
if (ret)
|
||||
goto err;
|
||||
ret = -ENODEV;
|
||||
}
|
||||
|
||||
/* we will hit this for NCM/MBIM functions if prefer_mbim is false */
|
||||
if (!cdc_ncm_comm_intf_is_mbim(intf->cur_altsetting))
|
||||
goto err;
|
||||
|
||||
|
|
@ -101,7 +184,10 @@ static int cdc_mbim_bind(struct usbnet *dev, struct usb_interface *intf)
|
|||
dev->net->flags |= IFF_NOARP;
|
||||
|
||||
/* no need to put the VLAN tci in the packet headers */
|
||||
dev->net->features |= NETIF_F_HW_VLAN_CTAG_TX;
|
||||
dev->net->features |= NETIF_F_HW_VLAN_CTAG_TX | NETIF_F_HW_VLAN_CTAG_FILTER;
|
||||
|
||||
/* monitor VLAN additions and removals */
|
||||
dev->net->netdev_ops = &cdc_mbim_netdev_ops;
|
||||
err:
|
||||
return ret;
|
||||
}
|
||||
|
|
@ -164,12 +250,24 @@ static struct sk_buff *cdc_mbim_tx_fixup(struct usbnet *dev, struct sk_buff *skb
|
|||
skb_pull(skb, ETH_HLEN);
|
||||
}
|
||||
|
||||
/* Is IP session <0> tagged too? */
|
||||
if (info->flags & FLAG_IPS0_VLAN) {
|
||||
/* drop all untagged packets */
|
||||
if (!tci)
|
||||
goto error;
|
||||
/* map MBIM_IPS0_VID to IPS<0> */
|
||||
if (tci == MBIM_IPS0_VID)
|
||||
tci = 0;
|
||||
}
|
||||
|
||||
/* mapping VLANs to MBIM sessions:
|
||||
* no tag => IPS session <0>
|
||||
* no tag => IPS session <0> if !FLAG_IPS0_VLAN
|
||||
* 1 - 255 => IPS session <vlanid>
|
||||
* 256 - 511 => DSS session <vlanid - 256>
|
||||
* 512 - 4095 => unsupported, drop
|
||||
* 512 - 4093 => unsupported, drop
|
||||
* 4094 => IPS session <0> if FLAG_IPS0_VLAN
|
||||
*/
|
||||
|
||||
switch (tci & 0x0f00) {
|
||||
case 0x0000: /* VLAN ID 0 - 255 */
|
||||
if (!is_ip)
|
||||
|
|
@ -178,6 +276,8 @@ static struct sk_buff *cdc_mbim_tx_fixup(struct usbnet *dev, struct sk_buff *skb
|
|||
c[3] = tci;
|
||||
break;
|
||||
case 0x0100: /* VLAN ID 256 - 511 */
|
||||
if (is_ip)
|
||||
goto error;
|
||||
sign = cpu_to_le32(USB_CDC_MBIM_NDP16_DSS_SIGN);
|
||||
c = (u8 *)&sign;
|
||||
c[3] = tci;
|
||||
|
|
@ -268,7 +368,7 @@ static struct sk_buff *cdc_mbim_process_dgram(struct usbnet *dev, u8 *buf, size_
|
|||
__be16 proto = htons(ETH_P_802_3);
|
||||
struct sk_buff *skb = NULL;
|
||||
|
||||
if (tci < 256) { /* IPS session? */
|
||||
if (tci < 256 || tci == MBIM_IPS0_VID) { /* IPS session? */
|
||||
if (len < sizeof(struct iphdr))
|
||||
goto err;
|
||||
|
||||
|
|
@ -338,6 +438,9 @@ next_ndp:
|
|||
case cpu_to_le32(USB_CDC_MBIM_NDP16_IPS_SIGN):
|
||||
c = (u8 *)&ndp16->dwSignature;
|
||||
tci = c[3];
|
||||
/* tag IPS<0> packets too if MBIM_IPS0_VID exists */
|
||||
if (!tci && info->flags & FLAG_IPS0_VLAN)
|
||||
tci = MBIM_IPS0_VID;
|
||||
break;
|
||||
case cpu_to_le32(USB_CDC_MBIM_NDP16_DSS_SIGN):
|
||||
c = (u8 *)&ndp16->dwSignature;
|
||||
|
|
|
|||
|
|
@ -541,10 +541,10 @@ void cdc_ncm_unbind(struct usbnet *dev, struct usb_interface *intf)
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(cdc_ncm_unbind);
|
||||
|
||||
/* Select the MBIM altsetting iff it is preferred and available,
|
||||
* returning the number of the corresponding data interface altsetting
|
||||
/* Return the number of the MBIM control interface altsetting iff it
|
||||
* is preferred and available,
|
||||
*/
|
||||
u8 cdc_ncm_select_altsetting(struct usbnet *dev, struct usb_interface *intf)
|
||||
u8 cdc_ncm_select_altsetting(struct usb_interface *intf)
|
||||
{
|
||||
struct usb_host_interface *alt;
|
||||
|
||||
|
|
@ -563,15 +563,15 @@ u8 cdc_ncm_select_altsetting(struct usbnet *dev, struct usb_interface *intf)
|
|||
* the rules given in section 6 (USB Device Model) of this
|
||||
* specification."
|
||||
*/
|
||||
if (prefer_mbim && intf->num_altsetting == 2) {
|
||||
if (intf->num_altsetting < 2)
|
||||
return intf->cur_altsetting->desc.bAlternateSetting;
|
||||
|
||||
if (prefer_mbim) {
|
||||
alt = usb_altnum_to_altsetting(intf, CDC_NCM_COMM_ALTSETTING_MBIM);
|
||||
if (alt && cdc_ncm_comm_intf_is_mbim(alt) &&
|
||||
!usb_set_interface(dev->udev,
|
||||
intf->cur_altsetting->desc.bInterfaceNumber,
|
||||
CDC_NCM_COMM_ALTSETTING_MBIM))
|
||||
return CDC_NCM_DATA_ALTSETTING_MBIM;
|
||||
if (alt && cdc_ncm_comm_intf_is_mbim(alt))
|
||||
return CDC_NCM_COMM_ALTSETTING_MBIM;
|
||||
}
|
||||
return CDC_NCM_DATA_ALTSETTING_NCM;
|
||||
return CDC_NCM_COMM_ALTSETTING_NCM;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(cdc_ncm_select_altsetting);
|
||||
|
||||
|
|
@ -580,12 +580,11 @@ static int cdc_ncm_bind(struct usbnet *dev, struct usb_interface *intf)
|
|||
int ret;
|
||||
|
||||
/* MBIM backwards compatible function? */
|
||||
cdc_ncm_select_altsetting(dev, intf);
|
||||
if (cdc_ncm_comm_intf_is_mbim(intf->cur_altsetting))
|
||||
if (cdc_ncm_select_altsetting(intf) != CDC_NCM_COMM_ALTSETTING_NCM)
|
||||
return -ENODEV;
|
||||
|
||||
/* NCM data altsetting is always 1 */
|
||||
ret = cdc_ncm_bind_common(dev, intf, 1);
|
||||
/* The NCM data altsetting is fixed */
|
||||
ret = cdc_ncm_bind_common(dev, intf, CDC_NCM_DATA_ALTSETTING_NCM);
|
||||
|
||||
/*
|
||||
* We should get an event when network connection is "connected" or
|
||||
|
|
|
|||
|
|
@ -121,7 +121,7 @@ struct cdc_ncm_ctx {
|
|||
u16 connected;
|
||||
};
|
||||
|
||||
u8 cdc_ncm_select_altsetting(struct usbnet *dev, struct usb_interface *intf);
|
||||
u8 cdc_ncm_select_altsetting(struct usb_interface *intf);
|
||||
int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_altsetting);
|
||||
void cdc_ncm_unbind(struct usbnet *dev, struct usb_interface *intf);
|
||||
struct sk_buff *cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign);
|
||||
|
|
|
|||
Loading…
Reference in New Issue