Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ca89f1f authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach
Browse files

iwlwifi: nvm: fix VHT capability antenna-dependent fields 



As the antenna dependent fields depend on the firmware file and not
the NVM, use those fields in the VHT capability creation.

Additionally, fix the STBC and antenna pattern consistency fields.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 9a3daf82

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

+11 −8
Original line number Original line Diff line number Diff line
@@ -299,9 +299,11 @@ static int iwl_init_channel_map(struct device *dev, const struct iwl_cfg *cfg, 




static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg,

static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg,

				  struct iwl_nvm_data *data,

				  struct iwl_nvm_data *data,

				  struct ieee80211_sta_vht_cap *vht_cap)

				  struct ieee80211_sta_vht_cap *vht_cap,

				  u8 tx_chains, u8 rx_chains)

{

{

	int num_ants = num_of_ant(data->valid_rx_ant);

	int num_rx_ants = num_of_ant(rx_chains);

	int num_tx_ants = num_of_ant(tx_chains);





	vht_cap->vht_supported = true;

	vht_cap->vht_supported = true;
@@ -311,8 +313,10 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, 
		       3 << IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT |

		       3 << IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT |

		       7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;

		       7 << IEEE80211_VHT_CAP_MAX_A_MPDU_LENGTH_EXPONENT_SHIFT;





	if (num_ants > 1)

	if (num_tx_ants > 1)

		vht_cap->cap |= IEEE80211_VHT_CAP_TXSTBC;

		vht_cap->cap |= IEEE80211_VHT_CAP_TXSTBC;

	else

		vht_cap->cap |= IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;





	if (iwlwifi_mod_params.amsdu_size_8K)

	if (iwlwifi_mod_params.amsdu_size_8K)

		vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991;

		vht_cap->cap |= IEEE80211_VHT_CAP_MAX_MPDU_LENGTH_7991;
@@ -327,10 +331,8 @@ static void iwl_init_vht_hw_capab(const struct iwl_cfg *cfg, 
			    IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 |

			    IEEE80211_VHT_MCS_NOT_SUPPORTED << 12 |

			    IEEE80211_VHT_MCS_NOT_SUPPORTED << 14);

			    IEEE80211_VHT_MCS_NOT_SUPPORTED << 14);





	if (num_ants == 1 ||

	if (num_rx_ants == 1 || cfg->rx_with_siso_diversity) {

	    cfg->rx_with_siso_diversity) {

		vht_cap->cap |= IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN;

		vht_cap->cap |= IEEE80211_VHT_CAP_RX_ANTENNA_PATTERN |

				IEEE80211_VHT_CAP_TX_ANTENNA_PATTERN;

		/* this works because NOT_SUPPORTED == 3 */

		/* this works because NOT_SUPPORTED == 3 */

		vht_cap->vht_mcs.rx_mcs_map |=

		vht_cap->vht_mcs.rx_mcs_map |=

			cpu_to_le16(IEEE80211_VHT_MCS_NOT_SUPPORTED << 2);

			cpu_to_le16(IEEE80211_VHT_MCS_NOT_SUPPORTED << 2);
@@ -375,7 +377,8 @@ static void iwl_init_sbands(struct device *dev, const struct iwl_cfg *cfg, 
	iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_5GHZ,

	iwl_init_ht_hw_capab(cfg, data, &sband->ht_cap, IEEE80211_BAND_5GHZ,

			     tx_chains, rx_chains);

			     tx_chains, rx_chains);

	if (enable_vht)

	if (enable_vht)

		iwl_init_vht_hw_capab(cfg, data, &sband->vht_cap);

		iwl_init_vht_hw_capab(cfg, data, &sband->vht_cap,

				      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",