[PATCH net-next 3/4] net: usb: usbnet: add cdc_state to struct usbnet
From: Oliver Neukum <oneukum@suse.com>
Date: 2026-07-02 14:31:50
Also in:
linux-usb, lkml
Subsystem:
the rest, usb "usbnet" driver framework, usb subsystem · Maintainers:
Linus Torvalds, Oliver Neukum, Greg Kroah-Hartman
This allows centralisation of code using cdc_state in usbnet, reducing code duplication. No functional change intended. Signed-off-by: Oliver Neukum <oneukum@suse.com> --- include/linux/usb/usbnet.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
index bbf799ccf3b3..79f48eb388ee 100644
--- a/include/linux/usb/usbnet.h
+++ b/include/linux/usb/usbnet.h@@ -16,6 +16,14 @@ #include <linux/usb.h> #include <linux/spinlock.h> +struct cdc_state { + struct usb_cdc_header_desc *header; + struct usb_cdc_union_desc *u; + struct usb_cdc_ether_desc *ether; + struct usb_interface *control; + struct usb_interface *data; +}; + /* interface from usbnet core to each USB networking link we handle */ struct usbnet { /* housekeeping */
@@ -41,6 +49,7 @@ struct usbnet { /* protocol/interface state */ struct net_device *net; int msg_enable; + struct cdc_state cdc; /* too common to leave out*/ unsigned long data[5]; u32 xid; u32 hard_mtu; /* count any extra framing */
@@ -211,13 +220,6 @@ extern int usbnet_write_cmd_async(struct usbnet *dev, u8 cmd, u8 reqtype, * (notably, using multiple interfaces according to the CDC * union descriptor) get some helper code. */ -struct cdc_state { - struct usb_cdc_header_desc *header; - struct usb_cdc_union_desc *u; - struct usb_cdc_ether_desc *ether; - struct usb_interface *control; - struct usb_interface *data; -}; extern void usbnet_cdc_update_filter(struct usbnet *dev); extern int usbnet_generic_cdc_bind(struct usbnet *, struct usb_interface *);
--
2.54.0