2dcd955aea
This commit refreshes and updates the VHT160 ath10k support fix patches and adds a number of backports from ath-next: * 8ed05ed06fca ath10k: handle tdls peer events * 229329ff345f ath10k: wmi: modify svc bitmap parsing for wcn3990 * 14d65775687c ath10k: advertise TDLS wider bandwidth support for 5GHz * bc64d05220f3 ath10k: debugfs support to get final TPC stats for 10.4 variants * 8b2d93dd2261 ath10k: Fix kernel panic while using worker (ath10k_sta_rc_update_wk) * 4b190675ad06 ath10k: fix kernel panic while reading tpc_stats * be8cce96f14d ath10k: add support to configure channel dwell time * f40105e67478 ath: add support to get the detected radar specifications * 6f6eb1bcbeff ath10k: DFS Host Confirmation * 260e629bbf44 ath10k: fix memory leak of tpc_stats * 38441fb6fcbb ath10k: support use of channel 173 * 2e9bcd0d7324 ath10k: fix spectral scan for QCA9984 and QCA9888 chipsets Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com> [move backported patches in the 3xx number space, bring in upstream order, replace incomplete patch files with git format-patch ones, rewrite commit message, fix subject] Signed-off-by: Jo-Philipp Wich <jo@mein.io>
53 lines
2.3 KiB
Diff
53 lines
2.3 KiB
Diff
From: Sebastian Gottschall <s.gottschall@dd-wrt.com>
|
|
|
|
starting with firmware 10.4.3.4.x series QCA changed the handling of the channel property band_center_freq1 and band_center_freq2 in vht160 operation mode
|
|
likelly for backward compatiblity with vht80 only capable clients.
|
|
this patch adjusts the handling to get vht160 to work again with official qca firmwares newer than 3.3
|
|
consider that this patch will not work with older firmwares anymore. to avoid undefined behaviour this we disable vht160 capability for outdated firmwares
|
|
Signed-off-by: Sebastian Gottschall <s.gottschall@dd-wrt.com>
|
|
|
|
v2: fix trailing whitespace issue and fix some typos within the commit note
|
|
---
|
|
drivers/net/wireless/ath/ath10k/mac.c | 7 -------
|
|
drivers/net/wireless/ath/ath10k/wmi.c | 11 ++++++++---
|
|
2 files changed, 8 insertions(+), 10 deletions(-)
|
|
--- a/drivers/net/wireless/ath/ath10k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath10k/mac.c
|
|
@@ -4445,13 +4445,6 @@ static struct ieee80211_sta_vht_cap ath1
|
|
vht_cap.cap |= val;
|
|
}
|
|
|
|
- /* Currently the firmware seems to be buggy, don't enable 80+80
|
|
- * mode until that's resolved.
|
|
- */
|
|
- if ((ar->vht_cap_info & IEEE80211_VHT_CAP_SHORT_GI_160) &&
|
|
- (ar->vht_cap_info & IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_MASK) == 0)
|
|
- vht_cap.cap |= IEEE80211_VHT_CAP_SUPP_CHAN_WIDTH_160MHZ;
|
|
-
|
|
mcs_map = 0;
|
|
for (i = 0; i < 8; i++) {
|
|
if ((i < ar->num_rf_chains) && (ar->cfg_tx_chainmask & BIT(i)))
|
|
--- a/drivers/net/wireless/ath/ath10k/wmi.c
|
|
+++ b/drivers/net/wireless/ath/ath10k/wmi.c
|
|
@@ -1672,13 +1672,18 @@ void ath10k_wmi_put_wmi_channel(struct w
|
|
flags |= WMI_CHAN_FLAG_HT40_PLUS;
|
|
if (arg->chan_radar)
|
|
flags |= WMI_CHAN_FLAG_DFS;
|
|
-
|
|
+ ch->band_center_freq2 = 0;
|
|
ch->mhz = __cpu_to_le32(arg->freq);
|
|
ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1);
|
|
if (arg->mode == MODE_11AC_VHT80_80)
|
|
ch->band_center_freq2 = __cpu_to_le32(arg->band_center_freq2);
|
|
- else
|
|
- ch->band_center_freq2 = 0;
|
|
+ if (arg->mode == MODE_11AC_VHT160) {
|
|
+ if (arg->freq < arg->band_center_freq1)
|
|
+ ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1 - 40);
|
|
+ else
|
|
+ ch->band_center_freq1 = __cpu_to_le32(arg->band_center_freq1 + 40);
|
|
+ ch->band_center_freq2 = __cpu_to_le32(arg->band_center_freq1);
|
|
+ }
|
|
ch->min_power = arg->min_power;
|
|
ch->max_power = arg->max_power;
|
|
ch->reg_power = arg->max_reg_power;
|