Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 375a2bd2 authored by Michael Straube's avatar Michael Straube Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: refactor rtw_macaddr_cfg() 



Using is_broadcast_ether_addr() and is_zero_ether_addr() instead of
testing each byte of the mac[] array for 0xff and 0x00 shortens the
code and improves readability.

If np == NULL, of_get_property() returns NULL, hence the "np" check
is not needed.

Instead of a fixed default mac address use a random one to reduce the
likelihood of mac address collision.

Thanks to Joe Perches and Dan Carpenter.

Suggested-by: default avatarJoe Perches <joe@perches.com>
Suggested-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: default avatarMichael Straube <straube.linux@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 05ccc706

drivers/staging/rtl8723bs/core/rtw_ieee80211.c

+4 −15
Original line number Diff line number Diff line
@@ -1177,24 +1177,13 @@ void rtw_macaddr_cfg(struct device *dev, u8 *mac_addr) 
		memcpy(mac, mac_addr, ETH_ALEN);

	}



	if (((mac[0] == 0xff) && (mac[1] == 0xff) && (mac[2] == 0xff) &&

	     (mac[3] == 0xff) && (mac[4] == 0xff) && (mac[5] == 0xff)) ||

	    ((mac[0] == 0x00) && (mac[1] == 0x00) && (mac[2] == 0x00) &&

	     (mac[3] == 0x00) && (mac[4] == 0x00) && (mac[5] == 0x00))) {

		if (np &&

		    (addr = of_get_property(np, "local-mac-address", &len)) &&

	if (is_broadcast_ether_addr(mac) || is_zero_ether_addr(mac)) {

		if ((addr = of_get_property(np, "local-mac-address", &len)) &&

		    len == ETH_ALEN) {

			memcpy(mac_addr, addr, ETH_ALEN);

		} else {

			mac[0] = 0x00;

			mac[1] = 0xe0;

			mac[2] = 0x4c;

			mac[3] = 0x87;

			mac[4] = 0x00;

			mac[5] = 0x00;

			/*  use default mac addresss */

			memcpy(mac_addr, mac, ETH_ALEN);

			DBG_871X("MAC Address from efuse error, assign default one !!!\n");

			eth_random_addr(mac_addr);

			DBG_871X("MAC Address from efuse error, assign random one !!!\n");

		}

	}