From: "Bjørn Mork" <bjorn@mork.no>
To: netdev@vger.kernel.org
Cc: linux-usb@vger.kernel.org, wxcafe@wxcafe.net, oliver@neukum.org,
"Miguel Rodríguez Pérez" <miguel@det.uvigo.gal>,
"Bjørn Mork" <bjorn@mork.no>
Subject: [PATCH v5 net-next 1/5] net: cdc_ether: use dev->intf to get interface information
Date: Wed, 15 Jul 2020 20:40:56 +0200 [thread overview]
Message-ID: <20200715184100.109349-2-bjorn@mork.no> (raw)
In-Reply-To: <20200715184100.109349-1-bjorn@mork.no>
From: Miguel Rodríguez Pérez <miguel@det.uvigo.gal>
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>
---
drivers/net/usb/cdc_ether.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index a657943c9f01..2afe258e3648 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -65,8 +65,6 @@ static const u8 mbm_guid[16] = {
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;
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_TYPE_CLASS | USB_RECIP_INTERFACE,
cdc_filter,
- intf->cur_altsetting->desc.bInterfaceNumber,
+ dev->intf->cur_altsetting->desc.bInterfaceNumber,
NULL,
0,
USB_CTRL_SET_TIMEOUT
--
2.27.0
next prev parent reply other threads:[~2020-07-15 18:41 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 18:40 [PATCH v5 net-next 0/5] usbnet: multicast filter support for cdc ncm devices Bjørn Mork
2020-07-15 18:40 ` Bjørn Mork [this message]
2020-07-15 18:40 ` [PATCH v5 net-next 2/5] net: cdc_ether: export usbnet_cdc_update_filter Bjørn Mork
2020-07-21 9:00 ` Oliver Neukum
2020-07-24 14:18 ` Bjørn Mork
2020-07-27 13:03 ` Oliver Neukum
2020-07-15 18:40 ` [PATCH v5 net-next 3/5] net: usbnet: export usbnet_set_rx_mode() Bjørn Mork
2020-07-15 18:40 ` [PATCH v5 net-next 4/5] net: cdc_ncm: add .ndo_set_rx_mode to cdc_ncm_netdev_ops Bjørn Mork
2020-07-15 18:41 ` [PATCH v5 net-next 5/5] net: cdc_ncm: hook into set_rx_mode to admit multicast traffic Bjørn Mork
2020-07-17 19:43 ` [PATCH v5 net-next 0/5] usbnet: multicast filter support for cdc ncm devices David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200715184100.109349-2-bjorn@mork.no \
--to=bjorn@mork.no \
--cc=linux-usb@vger.kernel.org \
--cc=miguel@det.uvigo.gal \
--cc=netdev@vger.kernel.org \
--cc=oliver@neukum.org \
--cc=wxcafe@wxcafe.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.