Commit 64b97df9 authored by Lech Perczak's avatar Lech Perczak Committed by Paolo Abeni
Browse files

cdc_ether: export usbnet_cdc_zte_rx_fixup 



Commit bfe9b9d2 ("cdc_ether: Improve ZTE MF823/831/910 handling")
introduces a workaround for certain ZTE modems reporting invalid MAC
addresses over CDC-ECM.
The same issue was present on their RNDIS interface,which was fixed in
commit a5a18bdf ("rndis_host: Set valid random MAC on buggy devices").

However, internal modem of ZTE MF286R router, on its RNDIS interface, also
exhibits a second issue fixed already in CDC-ECM, of the device not
respecting configured random MAC address. In order to share the fixup for
this with rndis_host driver, export the workaround function, which will
be re-used in the following commit in rndis_host.

Cc: Kristian Evensen <kristian.evensen@gmail.com>
Cc: Bjørn Mork <bjorn@mork.no>
Cc: Oliver Neukum <oliver@neukum.org>
Signed-off-by: default avatarLech Perczak <lech.perczak@gmail.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 9386ebcc

drivers/net/usb/cdc_ether.c

+2 −1
Original line number Diff line number Diff line
@@ -479,7 +479,7 @@ static int usbnet_cdc_zte_bind(struct usbnet *dev, struct usb_interface *intf) 
 * device MAC address has been updated). Always set MAC address to that of the

 * device.

 */

static int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb)

int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb)

{

	if (skb->len < ETH_HLEN || !(skb->data[0] & 0x02))

		return 1;
@@ -489,6 +489,7 @@ static int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb) 


	return 1;

}

EXPORT_SYMBOL_GPL(usbnet_cdc_zte_rx_fixup);



/* Ensure correct link state

 *

include/linux/usb/usbnet.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ extern int usbnet_ether_cdc_bind(struct usbnet *dev, struct usb_interface *intf) 
extern int usbnet_cdc_bind(struct usbnet *, struct usb_interface *);

extern void usbnet_cdc_unbind(struct usbnet *, struct usb_interface *);

extern void usbnet_cdc_status(struct usbnet *, struct urb *);

extern int usbnet_cdc_zte_rx_fixup(struct usbnet *dev, struct sk_buff *skb);



/* CDC and RNDIS support the same host-chosen packet filters for IN transfers */

#define	DEFAULT_FILTER	(USB_CDC_PACKET_TYPE_BROADCAST \