| Message ID | 1681762947-13882-1-git-send-email-quic_msinada@quicinc.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | b100722a777f6455d913666a376f81342b2cb995 |
| Delegated to: | Kalle Valo |
| Headers | show |
| Series | wifi: ath11k: Remove disabling of 80+80 and 160 MHz | expand |
On Mon, Apr 17, 2023 at 10:23 PM Muna Sinada <quic_msinada@quicinc.com> wrote: > > This is a regression fix for 80+80 and 160 MHz support bits being > cleared, therefore not adverised. Remove disable of 80+80 and 160 MHz > capability flags and assign valid center frequency 2 similar to > VHT80_80. > > Fixes: 38dfe775d0ab ("wifi: ath11k: push MU-MIMO params from hostapd to hardware") > Reported-by: Robert Marko <robert.marko@sartura.hr> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=217299 > Co-developed-by: P Praneesh <quic_ppranees@quicinc.com> > Signed-off-by: P Praneesh <quic_ppranees@quicinc.com> > Signed-off-by: Muna Sinada <quic_msinada@quicinc.com> > --- Tested-by: Robert Marko <robert.marko@sartura.hr> #IPQ8074 WLAN.HK.2.9.0.1-01385-QCAHKSWPL_SILICONZ-1 Regards, Robert
Muna Sinada <quic_msinada@quicinc.com> wrote: > This is a regression fix for 80+80 and 160 MHz support bits being > cleared, therefore not adverised. Remove disable of 80+80 and 160 MHz > capability flags and assign valid center frequency 2 similar to > VHT80_80. > > Fixes: 38dfe775d0ab ("wifi: ath11k: push MU-MIMO params from hostapd to hardware") > Reported-by: Robert Marko <robert.marko@sartura.hr> > Tested-by: Robert Marko <robert.marko@sartura.hr> # IPQ8074 WLAN.HK.2.9.0.1-01385-QCAHKSWPL_SILICONZ-1 > Link: https://bugzilla.kernel.org/show_bug.cgi?id=217299 > Co-developed-by: P Praneesh <quic_ppranees@quicinc.com> > Signed-off-by: P Praneesh <quic_ppranees@quicinc.com> > Signed-off-by: Muna Sinada <quic_msinada@quicinc.com> > Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com> Patch applied to ath-next branch of ath.git, thanks. b100722a777f wifi: ath11k: Remove disabling of 80+80 and 160 MHz
diff --git a/drivers/net/wireless/ath/ath11k/mac.c b/drivers/net/wireless/ath/ath11k/mac.c index cad832e0e6b8..4f0bf62eb29f 100644 --- a/drivers/net/wireless/ath/ath11k/mac.c +++ b/drivers/net/wireless/ath/ath11k/mac.c @@ -5552,10 +5552,6 @@ static int ath11k_mac_copy_he_cap(struct ath11k *ar, he_cap_elem->mac_cap_info[1] &= IEEE80211_HE_MAC_CAP1_TF_MAC_PAD_DUR_MASK; - he_cap_elem->phy_cap_info[0] &= - ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_160MHZ_IN_5G; - he_cap_elem->phy_cap_info[0] &= - ~IEEE80211_HE_PHY_CAP0_CHANNEL_WIDTH_SET_80PLUS80_MHZ_IN_5G; he_cap_elem->phy_cap_info[5] &= ~IEEE80211_HE_PHY_CAP5_BEAMFORMEE_NUM_SND_DIM_UNDER_80MHZ_MASK; diff --git a/drivers/net/wireless/ath/ath11k/wmi.c b/drivers/net/wireless/ath/ath11k/wmi.c index 27f3fceb33c5..fcc153df56d0 100644 --- a/drivers/net/wireless/ath/ath11k/wmi.c +++ b/drivers/net/wireless/ath/ath11k/wmi.c @@ -865,7 +865,8 @@ static void ath11k_wmi_put_wmi_channel(struct wmi_channel *chan, chan->band_center_freq2 = arg->channel.band_center_freq1; - } else if (arg->channel.mode == MODE_11AC_VHT80_80) { + } else if ((arg->channel.mode == MODE_11AC_VHT80_80) || + (arg->channel.mode == MODE_11AX_HE80_80)) { chan->band_center_freq2 = arg->channel.band_center_freq2; } else { chan->band_center_freq2 = 0;
This is a regression fix for 80+80 and 160 MHz support bits being cleared, therefore not adverised. Remove disable of 80+80 and 160 MHz capability flags and assign valid center frequency 2 similar to VHT80_80. Fixes: 38dfe775d0ab ("wifi: ath11k: push MU-MIMO params from hostapd to hardware") Reported-by: Robert Marko <robert.marko@sartura.hr> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217299 Co-developed-by: P Praneesh <quic_ppranees@quicinc.com> Signed-off-by: P Praneesh <quic_ppranees@quicinc.com> Signed-off-by: Muna Sinada <quic_msinada@quicinc.com> --- drivers/net/wireless/ath/ath11k/mac.c | 4 ---- drivers/net/wireless/ath/ath11k/wmi.c | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-)