summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
diff options
context:
space:
mode:
authorEran Harary <eran.harary@intel.com>2014-02-04 14:21:38 +0200
committerEmmanuel Grumbach <emmanuel.grumbach@intel.com>2014-02-13 13:49:37 +0200
commit77db0a3c27dc0f027e5f3956f4ba77246c89a548 (patch)
tree343938182601b80be4b451661e4efaa19fc35b6a /drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
parent7303dd7f312f0d07a4bf45c62608d5233b5e8062 (diff)
downloadop-kernel-dev-77db0a3c27dc0f027e5f3956f4ba77246c89a548.zip
op-kernel-dev-77db0a3c27dc0f027e5f3956f4ba77246c89a548.tar.gz
iwlwifi: mvm: new NVM format in family 8000
Support the changes below: - Fields and sections structure were changed. - the NVM file built from DWord instead of Words. - sections header format was changed. Signed-off-by: Eran Harary <eran.harary@intel.com> Reviewed-by: Johannes Berg <johannes.berg@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.h3
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 0c4399a..c9c45a3 100644
--- a/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
+++ b/drivers/net/wireless/iwlwifi/iwl-nvm-parse.h
@@ -75,6 +75,7 @@
struct iwl_nvm_data *
iwl_parse_nvm_data(struct device *dev, const struct iwl_cfg *cfg,
const __le16 *nvm_hw, const __le16 *nvm_sw,
- const __le16 *nvm_calib, u8 tx_chains, u8 rx_chains);
+ const __le16 *nvm_calib, const __le16 *regulatory,
+ const __le16 *mac_override, u8 tx_chains, u8 rx_chains);
#endif /* __iwl_nvm_parse_h__ */
OpenPOWER on IntegriCloud