diff options
Diffstat (limited to 'drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c')
| -rw-r--r-- | drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 16 | 
1 files changed, 8 insertions, 8 deletions
| diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c index af684f80b0cc..fc75d049046d 100644 --- a/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +++ b/drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c @@ -232,7 +232,7 @@ enum iwl_reg_capa_flags_v2 {  	REG_CAPA_V2_MCS_9_ALLOWED	= BIT(6),  	REG_CAPA_V2_WEATHER_DISABLED	= BIT(7),  	REG_CAPA_V2_40MHZ_ALLOWED	= BIT(8), -	REG_CAPA_V2_11AX_DISABLED	= BIT(13), +	REG_CAPA_V2_11AX_DISABLED	= BIT(10),  };  /* @@ -550,9 +550,9 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {  					IEEE80211_HE_MAC_CAP2_32BIT_BA_BITMAP,  				.mac_cap_info[3] =  					IEEE80211_HE_MAC_CAP3_OMI_CONTROL | -					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2, +					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2,  				.mac_cap_info[4] = -					IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU | +					IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU |  					IEEE80211_HE_MAC_CAP4_MULTI_TID_AGG_TX_QOS_B39,  				.mac_cap_info[5] =  					IEEE80211_HE_MAC_CAP5_MULTI_TID_AGG_TX_QOS_B40 | @@ -583,11 +583,11 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {  					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_2 |  					IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_ABOVE_80MHZ_2,  				.phy_cap_info[6] = -					IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMER_FB | -					IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMER_FB | +					IEEE80211_HE_PHY_CAP6_TRIG_SU_BEAMFORMING_FB | +					IEEE80211_HE_PHY_CAP6_TRIG_MU_BEAMFORMING_PARTIAL_BW_FB |  					IEEE80211_HE_PHY_CAP6_PPE_THRESHOLD_PRESENT,  				.phy_cap_info[7] = -					IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_AR | +					IEEE80211_HE_PHY_CAP7_POWER_BOOST_FACTOR_SUPP |  					IEEE80211_HE_PHY_CAP7_HE_SU_MU_PPDU_4XLTF_AND_08_US_GI |  					IEEE80211_HE_PHY_CAP7_MAX_NC_1,  				.phy_cap_info[8] = @@ -636,9 +636,9 @@ static const struct ieee80211_sband_iftype_data iwl_he_capa[] = {  					IEEE80211_HE_MAC_CAP2_BSR,  				.mac_cap_info[3] =  					IEEE80211_HE_MAC_CAP3_OMI_CONTROL | -					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_VHT_2, +					IEEE80211_HE_MAC_CAP3_MAX_AMPDU_LEN_EXP_EXT_2,  				.mac_cap_info[4] = -					IEEE80211_HE_MAC_CAP4_AMDSU_IN_AMPDU, +					IEEE80211_HE_MAC_CAP4_AMSDU_IN_AMPDU,  				.mac_cap_info[5] =  					IEEE80211_HE_MAC_CAP5_UL_2x996_TONE_RU,  				.phy_cap_info[0] = | 
