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 --- 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 b4df32e18461..e688fb99c61d 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c @@ -404,25 +404,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 5544af1f4aa5..7beea6d0e731 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c @@ -2347,6 +2347,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.54.0