Kristian Evensen <kristian.evensen@xxxxxxxxx> writes:
> From: Kristian Evensen <kristian.evensen@xxxxxxxxx>
>
> All ZTE MF910 mifis, at least on some revisions, export the same MAC
> address (36:4b:50:b7:ef:da). Check for this MAC address and set a random
> MAC if detected.
>
> Also, changed the memcpy() to ether_addr_copy(), as pointed out by
> checkpatch.
>
> Signed-off-by: Kristian Evensen <kristian.evensen@xxxxxxxxx>
> ---
> drivers/net/usb/rndis_host.c | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
> index 524a47a281..85bdbdf 100644
> --- a/drivers/net/usb/rndis_host.c
> +++ b/drivers/net/usb/rndis_host.c
> @@ -295,6 +295,9 @@ static const struct net_device_ops rndis_netdev_ops = {
> .ndo_validate_addr = eth_validate_addr,
> };
>
> +/* well-known buggy ZTE MF910 MAC address */
> +static const u8 buggy_zte_addr[ETH_ALEN] = {0x36, 0x4b, 0x50, 0xb7, 0xef, 0xda};
> +
> int
> generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
> {
> @@ -428,7 +431,11 @@ generic_rndis_bind(struct usbnet *dev, struct usb_interface *intf, int flags)
> dev_err(&intf->dev, "rndis get ethaddr, %d\n", retval);
> goto halt_fail_and_release;
> }
> - memcpy(net->dev_addr, bp, ETH_ALEN);
> +
> + if (ether_addr_equal(bp, buggy_zte_addr))
> + eth_hw_addr_random(net);
> + else
> + ether_addr_copy(net->dev_addr, bp);
>
> /* set a nonzero filter to enable data transfers */
> memset(u.set, 0, sizeof *u.set);
Or how about the more generic?:
if (bp[0] & 0x02)
eth_hw_addr_random(net);
else
ether_addr_copy(net->dev_addr, bp);
That would catch similar screwups from other vendors too.
Bjørn
--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
