staging: rtl8188eu: refactor rtw_macaddr_cfg()

Use ether_addr_copy() instead of memcpy() to copy the mac address.

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.

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

Signed-off-by: Michael Straube <straube.linux@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
index 711ebb0ad6406403f92244baeccf5487535a3326..e6dff44e00fd54d13efebfa75865aa12dd0fb95b 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
+++ b/drivers/staging/rtl8188eu/core/rtw_ieee80211.c
@@ -917,25 +917,15 @@ void rtw_macaddr_cfg(u8 *mac_addr)
 
        if (rtw_initmac && mac_pton(rtw_initmac, mac)) {
                /* Users specify the mac address */
-               memcpy(mac_addr, mac, ETH_ALEN);
+               ether_addr_copy(mac_addr, mac);
        } else {
                /* Use the mac address stored in the Efuse */
-               memcpy(mac, mac_addr, ETH_ALEN);
+               ether_addr_copy(mac, mac_addr);
        }
 
-       if (((mac[0] == 0xff) && (mac[1] == 0xff) && (mac[2] == 0xff) &&
-            (mac[3] == 0xff) && (mac[4] == 0xff) && (mac[5] == 0xff)) ||
-           ((mac[0] == 0x0) && (mac[1] == 0x0) && (mac[2] == 0x0) &&
-            (mac[3] == 0x0) && (mac[4] == 0x0) && (mac[5] == 0x0))) {
-               mac[0] = 0x00;
-               mac[1] = 0xe0;
-               mac[2] = 0x4c;
-               mac[3] = 0x87;
-               mac[4] = 0x00;
-               mac[5] = 0x00;
-               /*  use default mac address */
-               memcpy(mac_addr, mac, ETH_ALEN);
-               DBG_88E("MAC Address from efuse error, assign default one !!!\n");
+       if (is_broadcast_ether_addr(mac) || is_zero_ether_addr(mac)) {
+               eth_random_addr(mac_addr);
+               DBG_88E("MAC Address from efuse error, assign random one !!!\n");
        }
 
        DBG_88E("%s MAC Address  = %pM\n", __func__, (mac_addr));