[RFC net-next 2/2] net: usb: centralize usbnet_cdc_zte_rx_fixup in usbnet
From: Oliver Neukum <oneukum@suse.com>
Date: 2026-02-11 10:43:51
Subsystem:
networking drivers, the rest, usb "usbnet" driver framework, usb cdc ethernet driver, usb networking drivers · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds, Oliver Neukum
This helper is used by multiple drivers using usbnet. It is better to be provided by usbnet than one of them. Signed-off-by: Oliver Neukum <oneukum@suse.com> --- drivers/net/usb/cdc_ether.c | 19 ------------------- drivers/net/usb/usbnet.c | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 3149fa2b6ac1..505a653d9482 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c@@ -398,25 +398,6 @@ static int usbnet_cdc_zte_bind(struct usbnet *dev, struct usb_interface *intf) return status; } -/* Make sure packets have correct destination MAC address - * - * A firmware bug observed on some devices (ZTE MF823/831/910) is that the - * device sends packets with a static, bogus, random MAC address (event if - * device MAC address has been updated). Always set MAC address to that of the - * device. - */ -int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb) -{ - if (skb->len < ETH_HLEN || !(skb->data[0] & 0x02)) - return 1; - - skb_reset_mac_header(skb); - ether_addr_copy(eth_hdr(skb)->h_dest, dev->net->dev_addr); - - return 1; -} -EXPORT_SYMBOL_GPL(usbnet_cdc_zte_rx_fixup); - /* Ensure correct link state * * Some devices (ZTE MF823/831/910) export two carrier on notifications when
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 09905d07f10f..974c6204cef9 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c@@ -2346,6 +2346,25 @@ void usbnet_cdc_status(struct usbnet *dev, struct urb *urb) } } EXPORT_SYMBOL_GPL(usbnet_cdc_status); + +/* Make sure packets have correct destination MAC address + * + * A firmware bug observed on some devices (ZTE MF823/831/910) is that the + * device sends packets with a static, bogus, random MAC address (event if + * device MAC address has been updated). Always set MAC address to that of the + * device. + */ +int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb) +{ + if (skb->len < ETH_HLEN || !(skb->data[0] & 0x02)) + return 1; + + skb_reset_mac_header(skb); + ether_addr_copy(eth_hdr(skb)->h_dest, dev->net->dev_addr); + + return 1; +} +EXPORT_SYMBOL_GPL(usbnet_cdc_zte_rx_fixup); /*-------------------------------------------------------------------------*/ static int __init usbnet_init(void)
--
2.53.0