ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2025-01-14 00:40:12 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
9405fb079b
openwrt/package/kernel/ath10k-ct/patches/164-ath10k-commit-rates-from-mac80211.patch

90 lines
3.2 KiB
Diff
Raw Normal View History

ath10k-ct: fix incorrect multicast/broadcast rate setting If no mcast_rate is set for the wifi-iface then there is no rate_idx (0) set for the bss. This can break for example 5GHz meshpoint interfaces because 0 maps to a CCK rate (11Mbit/s). It must also be avoided that the ath10k-ct internal state for the rates is not synced with the mac80211 rates state. Otherwise, the user specified rate (e.g. a wifi-iface mcast_rate for a meshpoint interface) will only be set on startup. And a short while after that, ath10k-ct specific code in ath10k_check_apply_special_rates is missing a valid rate in its own structures and is then recalculating a new default rate. This default rate is in most situations not the requested rate. Fixes: 4df3c71cd4c5 ("ath10k-ct: Update to 2018-12-11 and use version based on 4.19") Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-02-25 19:42:28 +00:00
From: Sven Eckelmann <sven@narfation.org>
Date: Tue, 26 Feb 2019 08:06:35 +0100
Subject: ath10k-ct: apply mac80211 rates to ath10k-ct rate state
The rates from mac80211 have to be copied to the state of ath10k-ct or
otherwise the ath10k_check_apply_special_rates function overwrites
them again with some default values. This breaks for example the
mcast_rate set for a wifi-iface.
Signed-off-by: Sven Eckelmann <sven@narfation.org>
--- a/ath10k-4.19/mac.c
+++ b/ath10k-4.19/mac.c
ath10k-ct: update to 2020-01-29 Changes: ath10k-ct: Support better RSSI measurements. When used with recent firmware, these changes allow the driver to query per-chain noise-floor from the radio to better calculate the per-chain RSSI. The per-chain RSSI is then summed to provide the 'combined RSSI'. This gives better per-chain RSSI as well as combined RSSI, especially when running with more than 20Mhz bandwidths. Refresh patches. Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq806x+qca9984,ipq4019+qca9986] Signed-off-by: Michael Yartys <michael.yartys@protonmail.com>
2020-01-29 22:19:30 +00:00
@@ -6625,6 +6625,7 @@ static void ath10k_bss_info_changed(stru
ath10k-ct: fix incorrect multicast/broadcast rate setting If no mcast_rate is set for the wifi-iface then there is no rate_idx (0) set for the bss. This can break for example 5GHz meshpoint interfaces because 0 maps to a CCK rate (11Mbit/s). It must also be avoided that the ath10k-ct internal state for the rates is not synced with the mac80211 rates state. Otherwise, the user specified rate (e.g. a wifi-iface mcast_rate for a meshpoint interface) will only be set on startup. And a short while after that, ath10k-ct specific code in ath10k_check_apply_special_rates is missing a valid rate in its own structures and is then recalculating a new default rate. This default rate is in most situations not the requested rate. Fixes: 4df3c71cd4c5 ("ath10k-ct: Update to 2018-12-11 and use version based on 4.19") Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-02-25 19:42:28 +00:00
"mac vdev %d mcast_rate %x\n",
arvif->vdev_id, rate);
+ arvif->mcast_rate[band] = rate;
vdev_param = ar->wmi.vdev_param->mcast_data_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
vdev_param, rate);
ath10k-ct: update to 2020-01-29 Changes: ath10k-ct: Support better RSSI measurements. When used with recent firmware, these changes allow the driver to query per-chain noise-floor from the radio to better calculate the per-chain RSSI. The per-chain RSSI is then summed to provide the 'combined RSSI'. This gives better per-chain RSSI as well as combined RSSI, especially when running with more than 20Mhz bandwidths. Refresh patches. Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq806x+qca9984,ipq4019+qca9986] Signed-off-by: Michael Yartys <michael.yartys@protonmail.com>
2020-01-29 22:19:30 +00:00
@@ -6633,6 +6634,7 @@ static void ath10k_bss_info_changed(stru
ath10k-ct: fix incorrect multicast/broadcast rate setting If no mcast_rate is set for the wifi-iface then there is no rate_idx (0) set for the bss. This can break for example 5GHz meshpoint interfaces because 0 maps to a CCK rate (11Mbit/s). It must also be avoided that the ath10k-ct internal state for the rates is not synced with the mac80211 rates state. Otherwise, the user specified rate (e.g. a wifi-iface mcast_rate for a meshpoint interface) will only be set on startup. And a short while after that, ath10k-ct specific code in ath10k_check_apply_special_rates is missing a valid rate in its own structures and is then recalculating a new default rate. This default rate is in most situations not the requested rate. Fixes: 4df3c71cd4c5 ("ath10k-ct: Update to 2018-12-11 and use version based on 4.19") Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-02-25 19:42:28 +00:00
"failed to set mcast rate on vdev %i: %d\n",
arvif->vdev_id, ret);
+ arvif->bcast_rate[band] = rate;
vdev_param = ar->wmi.vdev_param->bcast_data_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
vdev_param, rate);
ath10k-ct: update to 2020-01-29 Changes: ath10k-ct: Support better RSSI measurements. When used with recent firmware, these changes allow the driver to query per-chain noise-floor from the radio to better calculate the per-chain RSSI. The per-chain RSSI is then summed to provide the 'combined RSSI'. This gives better per-chain RSSI as well as combined RSSI, especially when running with more than 20Mhz bandwidths. Refresh patches. Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq806x+qca9984,ipq4019+qca9986] Signed-off-by: Michael Yartys <michael.yartys@protonmail.com>
2020-01-29 22:19:30 +00:00
@@ -6659,6 +6661,7 @@ static void ath10k_bss_info_changed(stru
ath10k-ct: fix incorrect multicast/broadcast rate setting If no mcast_rate is set for the wifi-iface then there is no rate_idx (0) set for the bss. This can break for example 5GHz meshpoint interfaces because 0 maps to a CCK rate (11Mbit/s). It must also be avoided that the ath10k-ct internal state for the rates is not synced with the mac80211 rates state. Otherwise, the user specified rate (e.g. a wifi-iface mcast_rate for a meshpoint interface) will only be set on startup. And a short while after that, ath10k-ct specific code in ath10k_check_apply_special_rates is missing a valid rate in its own structures and is then recalculating a new default rate. This default rate is in most situations not the requested rate. Fixes: 4df3c71cd4c5 ("ath10k-ct: Update to 2018-12-11 and use version based on 4.19") Signed-off-by: Sven Eckelmann <sven@narfation.org>
2019-02-25 19:42:28 +00:00
return;
}
+ arvif->mgt_rate[def.chan->band] = hw_rate_code;
vdev_param = ar->wmi.vdev_param->mgmt_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
hw_rate_code);
ath10k-ct: switch to version 5.2 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-07-07 11:48:20 +00:00
--- a/ath10k-5.2/mac.c
+++ b/ath10k-5.2/mac.c
ath10k-ct: update to 2020-01-29 Changes: ath10k-ct: Support better RSSI measurements. When used with recent firmware, these changes allow the driver to query per-chain noise-floor from the radio to better calculate the per-chain RSSI. The per-chain RSSI is then summed to provide the 'combined RSSI'. This gives better per-chain RSSI as well as combined RSSI, especially when running with more than 20Mhz bandwidths. Refresh patches. Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq806x+qca9984,ipq4019+qca9986] Signed-off-by: Michael Yartys <michael.yartys@protonmail.com>
2020-01-29 22:19:30 +00:00
@@ -6742,6 +6742,7 @@ static void ath10k_bss_info_changed(stru
ath10k-ct: switch to version 5.2 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-07-07 11:48:20 +00:00
"mac vdev %d mcast_rate %x\n",
arvif->vdev_id, rate);
+ arvif->mcast_rate[band] = rate;
vdev_param = ar->wmi.vdev_param->mcast_data_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
vdev_param, rate);
ath10k-ct: update to 2020-01-29 Changes: ath10k-ct: Support better RSSI measurements. When used with recent firmware, these changes allow the driver to query per-chain noise-floor from the radio to better calculate the per-chain RSSI. The per-chain RSSI is then summed to provide the 'combined RSSI'. This gives better per-chain RSSI as well as combined RSSI, especially when running with more than 20Mhz bandwidths. Refresh patches. Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq806x+qca9984,ipq4019+qca9986] Signed-off-by: Michael Yartys <michael.yartys@protonmail.com>
2020-01-29 22:19:30 +00:00
@@ -6750,6 +6751,7 @@ static void ath10k_bss_info_changed(stru
ath10k-ct: switch to version 5.2 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-07-07 11:48:20 +00:00
"failed to set mcast rate on vdev %i: %d\n",
arvif->vdev_id, ret);
+ arvif->bcast_rate[band] = rate;
vdev_param = ar->wmi.vdev_param->bcast_data_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
vdev_param, rate);
ath10k-ct: update to 2020-01-29 Changes: ath10k-ct: Support better RSSI measurements. When used with recent firmware, these changes allow the driver to query per-chain noise-floor from the radio to better calculate the per-chain RSSI. The per-chain RSSI is then summed to provide the 'combined RSSI'. This gives better per-chain RSSI as well as combined RSSI, especially when running with more than 20Mhz bandwidths. Refresh patches. Tested-by: Stefan Lippers-Hollmann <s.l-h@gmx.de> [ipq806x+qca9984,ipq4019+qca9986] Signed-off-by: Michael Yartys <michael.yartys@protonmail.com>
2020-01-29 22:19:30 +00:00
@@ -6776,6 +6778,7 @@ static void ath10k_bss_info_changed(stru
ath10k-ct: switch to version 5.2 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-07-07 11:48:20 +00:00
return;
}
+ arvif->mgt_rate[def.chan->band] = hw_rate_code;
vdev_param = ar->wmi.vdev_param->mgmt_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
hw_rate_code);
ath10k-ct: Use ath10k-ct version 5.4 This makes ath10k-ct use the version based on kernel 5.4 by default. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
2019-11-09 16:06:06 +00:00
--- a/ath10k-5.4/mac.c
+++ b/ath10k-5.4/mac.c
@@ -6793,6 +6793,7 @@ static void ath10k_bss_info_changed(stru
"mac vdev %d mcast_rate %x\n",
arvif->vdev_id, rate);
+ arvif->mcast_rate[band] = rate;
vdev_param = ar->wmi.vdev_param->mcast_data_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
vdev_param, rate);
@@ -6801,6 +6802,7 @@ static void ath10k_bss_info_changed(stru
"failed to set mcast rate on vdev %i: %d\n",
arvif->vdev_id, ret);
+ arvif->bcast_rate[band] = rate;
vdev_param = ar->wmi.vdev_param->bcast_data_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id,
vdev_param, rate);
@@ -6827,6 +6829,7 @@ static void ath10k_bss_info_changed(stru
return;
}
+ arvif->mgt_rate[def.chan->band] = hw_rate_code;
vdev_param = ar->wmi.vdev_param->mgmt_rate;
ret = ath10k_wmi_vdev_set_param(ar, arvif->vdev_id, vdev_param,
hw_rate_code);
Reference in New Issue Copy Permalink