aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorKristian Evensen <kristian.evensen@gmail.com>2016-07-14 10:23:03 +0200
committerDavid S. Miller <davem@davemloft.net>2016-07-16 20:03:04 -0700
commita5a18bdf7453d505783e40e47ebb84bfdd35f93b (patch)
tree8665fdf76228b8825bfdbf3ec01b1a6530755a37 /drivers/net/usb
parentMerge branch 'bridge-rx-simplify-fwd-consolidate' (diff)
downloadlinux-dev-a5a18bdf7453d505783e40e47ebb84bfdd35f93b.tar.xz
linux-dev-a5a18bdf7453d505783e40e47ebb84bfdd35f93b.zip
rndis_host: Set valid random MAC on buggy devices
Some devices of the same type all export the same, random MAC address. This behavior has been seen on the ZTE MF910, MF823 and MF831, and there are probably more devices out there. Fix this by generating a valid random MAC address if we read a random MAC from device. Also, changed the memcpy() to ether_addr_copy(), as pointed out by checkpatch. Suggested-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/rndis_host.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c
index 524a47a28120..4f4f71b2966b 100644
--- a/drivers/net/usb/rndis_host.c
+++ b/drivers/net/usb/rndis_host.c
@@ -428,7 +428,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 (bp[0] & 0x02)
+ 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);