Commit df658908 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: pass trans and NVM data to HE capability parsing 



We'll need this data in the future, pass the values.

Change-Id: Iaeff50716e783f5c0bcea86ca1c93ada1560525e
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 7f1fe1d4

drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c

+5 −3
Original line number Diff line number Diff line
@@ -684,7 +684,9 @@ static struct ieee80211_sband_iftype_data iwl_he_capa[] = { 
	},

};



static void iwl_init_he_hw_capab(struct ieee80211_supported_band *sband,

static void iwl_init_he_hw_capab(struct iwl_trans *trans,

				 struct iwl_nvm_data *data,

				 struct ieee80211_supported_band *sband,

				 u8 tx_chains, u8 rx_chains)

{

	sband->iftype_data = iwl_he_capa;
@@ -728,7 +730,7 @@ static void iwl_init_sbands(struct iwl_trans *trans, 
			     tx_chains, rx_chains);



	if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax)

		iwl_init_he_hw_capab(sband, tx_chains, rx_chains);

		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains);



	sband = &data->bands[NL80211_BAND_5GHZ];

	sband->band = NL80211_BAND_5GHZ;
@@ -743,7 +745,7 @@ static void iwl_init_sbands(struct iwl_trans *trans, 
				      tx_chains, rx_chains);



	if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax)

		iwl_init_he_hw_capab(sband, tx_chains, rx_chains);

		iwl_init_he_hw_capab(trans, data, sband, tx_chains, rx_chains);



	if (n_channels != n_used)

		IWL_ERR_DEV(dev, "NVM: used only %d of %d channels\n",