diff options
| author | Eran Harary <eran.harary@intel.com> | 2015-02-08 11:41:43 +0200 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-03-12 09:57:30 +0200 |
| commit | 8ba2d7a1dd5defd7a9cbc400004cc112fc9ff3b5 (patch) | |
| tree | 3462d611cfb7ce7d766d2daafeeeafdd819cd0df /drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | |
| parent | 5711cac489d06cc9c3cdcd513c810b7148beb49d (diff) | |
| download | op-kernel-dev-8ba2d7a1dd5defd7a9cbc400004cc112fc9ff3b5.zip op-kernel-dev-8ba2d7a1dd5defd7a9cbc400004cc112fc9ff3b5.tar.gz | |
iwlwifi: mvm: take the MAC address from HW registers
For some configurations, the driver should get the MAC
address from the hardware registers and not from the
regular locations. Since the parsing of the MAC address
is the same regardless of its source, continue the regular
code path (parsing) after we read the registers.
Signed-off-by: Eran Harary <eran.harary@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-nvm-parse.h')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-nvm-parse.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h index 18c3ff2..c995d2c 100644 --- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h +++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h @@ -79,7 +79,8 @@ iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg, const __le16 *nvm_calib, const __le16 *regulatory, const __le16 *mac_override, const __le16 *phy_sku, u8 tx_chains, u8 rx_chains, - bool lar_fw_supported, bool is_family_8000_a_step); + bool lar_fw_supported, bool is_family_8000_a_step, + u32 mac_addr0, u32 mac_addr1); /** * iwl_parse_mcc_info - parse MCC (mobile country code) info coming from FW |
