UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: cdc_ether: use dev->intf to get interface information 

usbnet_cdc_update_filter was getting the interface number from the
usb_interface struct in cdc_state->control. However, cdc_ncm does
not initialize that structure in its bind function, but uses
cdc_ncm_ctx instead. Getting intf directly from struct usbnet solves
the problem.

Signed-off-by: Miguel Rodríguez Pérez <miguel@det.uvigo.gal>
Signed-off-by: Bjørn Mork <bjorn@mork.no>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Miguel Rodríguez Pérez 2020-07-15 20:40:56 +02:00 committed by David S. Miller
parent eac87c413b
commit 0226009ce0
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/usb/cdc_ether.c
View File

@ -65,8 +65,6 @@ static const u8 mbm_guid[16] = {
static void usbnet_cdc_update_filter(struct usbnet *dev) static void usbnet_cdc_update_filter(struct usbnet *dev)
{ {
struct cdc_state *info = (void *) &dev->data;
struct usb_interface *intf = info->control;
struct net_device *net = dev->net; struct net_device *net = dev->net;
u16 cdc_filter = USB_CDC_PACKET_TYPE_DIRECTED u16 cdc_filter = USB_CDC_PACKET_TYPE_DIRECTED
@ -86,7 +84,7 @@ static void usbnet_cdc_update_filter(struct usbnet *dev)
USB_CDC_SET_ETHERNET_PACKET_FILTER, USB_CDC_SET_ETHERNET_PACKET_FILTER,
USB_TYPE_CLASS | USB_RECIP_INTERFACE, USB_TYPE_CLASS | USB_RECIP_INTERFACE,
cdc_filter, cdc_filter,
intf->cur_altsetting->desc.bInterfaceNumber, dev->intf->cur_altsetting->desc.bInterfaceNumber,
NULL, NULL,
0, 0,
USB_CTRL_SET_TIMEOUT USB_CTRL_SET_TIMEOUT