AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-12-23 19:13:15 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

iwlwifi: pass trans and NVM data to HE capability parsing

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

Change-Id: Iaeff50716e783f5c0bcea86ca1c93ada1560525e
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Johannes Berg 2019-11-05 12:22:06 +01:00 committed by Luca Coelho
parent 7f1fe1d490
commit df65890856
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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) u8 tx_chains, u8 rx_chains)
{ {
sband->iftype_data = iwl_he_capa; sband->iftype_data = iwl_he_capa;
@ -728,7 +730,7 @@ static void iwl_init_sbands(struct iwl_trans *trans,
tx_chains, rx_chains); tx_chains, rx_chains);
if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax) 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 = &data->bands[NL80211_BAND_5GHZ];
sband->band = 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); tx_chains, rx_chains);
if (data->sku_cap_11ax_enable && !iwlwifi_mod_params.disable_11ax) 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) if (n_channels != n_used)
IWL_ERR_DEV(dev, "NVM: used only %d of %d channels\n", IWL_ERR_DEV(dev, "NVM: used only %d of %d channels\n",