brcmfmac: set wiphy's addresses to provide valid MACs

Broadcom's firmware requires every BSS to use MAC address with unique
last few bits. The amount of bits may depend on a particular firmware,
it was verified to be 2 for BCM43602 one.
If this condition won't be fulfilled firmware will reject such MAC:
brcmfmac: _brcmf_set_mac_address: Setting cur_etheraddr failed, -52

We don't want to simply set addr_mask as it would also disallow using
locally administrated bit. Instead let's build a list of addresses
manually enabling 0x2 bit for extra interfaces.

Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
index d86d1f1f1c91d70ea803cfd07737ecaab6699400..ffe526070d6f19a99de1a777129a51692e508147 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c
@@ -5785,6 +5785,7 @@ static void brcmf_wiphy_wowl_params(struct wiphy *wiphy)
 
 static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)
 {
+       struct brcmf_pub *drvr = ifp->drvr;
        struct ieee80211_supported_band *band;
        __le32 bandlist[3];
        u32 n_bands;
@@ -5798,6 +5799,19 @@ static int brcmf_setup_wiphy(struct wiphy *wiphy, struct brcmf_if *ifp)
        if (err)
                return err;
 
+       for (i = 0; i < wiphy->iface_combinations->max_interfaces &&
+            i < ARRAY_SIZE(drvr->addresses); i++) {
+               u8 *addr = drvr->addresses[i].addr;
+
+               memcpy(addr, drvr->mac, ETH_ALEN);
+               if (i) {
+                       addr[0] |= BIT(1);
+                       addr[ETH_ALEN - 1] ^= i;
+               }
+       }
+       wiphy->addresses = drvr->addresses;
+       wiphy->n_addresses = i;
+
        wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
        wiphy->cipher_suites = __wl_cipher_suites;
        wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);

diff --git a/drivers/net/wireless/brcm80211/brcmfmac/core.h b/drivers/net/wireless/brcm80211/brcmfmac/core.h
index fd74a9c6e9ac62ac310c688f5fade1acbf7c7d73..746304121cdbf99bf02845462689737c21272c02 100644 (file)
--- a/drivers/net/wireless/brcm80211/brcmfmac/core.h
+++ b/drivers/net/wireless/brcm80211/brcmfmac/core.h
@@ -21,6 +21,7 @@
 #ifndef BRCMFMAC_CORE_H
 #define BRCMFMAC_CORE_H
 
+#include <net/cfg80211.h>
 #include "fweh.h"
 
 #define TOE_TX_CSUM_OL         0x00000001
@@ -118,6 +119,8 @@ struct brcmf_pub {
        /* Multicast data packets sent to dongle */
        unsigned long tx_multicast;
 
+       struct mac_address addresses[BRCMF_MAX_IFS];
+
        struct brcmf_if *iflist[BRCMF_MAX_IFS];
 
        struct mutex proto_block;