diff options
| author | Liad Kaufman | 2015-05-20 14:50:07 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach | 2015-05-21 21:27:02 +0200 |
| commit | 18f84673fb0fb3b4727ecf53a7455874172899d4 (patch) | |
| tree | cac006fd407e1a5ad5c6eff2838ea77f3350ed32 /drivers/net | |
| parent | iwlwifi: mvm: Free fw_status after use to avoid memory leak (diff) | |
| download | kernel-qcow2-linux-18f84673fb0fb3b4727ecf53a7455874172899d4.tar.gz kernel-qcow2-linux-18f84673fb0fb3b4727ecf53a7455874172899d4.tar.xz kernel-qcow2-linux-18f84673fb0fb3b4727ecf53a7455874172899d4.zip | |
iwlwifi: nvm: force mac from otp in case nvm mac is reserved
Take the MAC address from the OTP even if one is present in
the NVM, if that MAC address happens to be a reserved one.
Signed-off-by: Liad Kaufman <liad.kaufman@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-nvm-parse.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c index cf86f3cdbb8e..75e96db6626b 100644 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.c @@ -533,6 +533,10 @@ static void iwl_set_hw_address_family_8000(struct device *dev, const u8 *hw_addr; if (mac_override) { + static const u8 reserved_mac[] = { + 0x02, 0xcc, 0xaa, 0xff, 0xee, 0x00 + }; + hw_addr = (const u8 *)(mac_override + MAC_ADDRESS_OVERRIDE_FAMILY_8000); @@ -544,7 +548,12 @@ static void iwl_set_hw_address_family_8000(struct device *dev, data->hw_addr[4] = hw_addr[5]; data->hw_addr[5] = hw_addr[4]; - if (is_valid_ether_addr(data->hw_addr)) + /* + * Force the use of the OTP MAC address in case of reserved MAC + * address in the NVM, or if address is given but invalid. + */ + if (is_valid_ether_addr(data->hw_addr) && + memcmp(reserved_mac, hw_addr, ETH_ALEN) != 0) return; IWL_ERR_DEV(dev, |