51 lines
2.2 KiB
Diff
51 lines
2.2 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
|
||
|
|
---
|
||
|
|
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
|
||
|
|
@@ -4416,13 +4416,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
|
||
|
|
@@ -1660,13 +1660,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;
|