mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
94 lines
3.2 KiB
Diff
94 lines
3.2 KiB
Diff
From 6f4d70308e5eb63c99702e93f7c0d8e55f360da2 Mon Sep 17 00:00:00 2001
|
|
From: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
|
|
Date: Tue, 28 Sep 2021 14:00:46 +0300
|
|
Subject: [PATCH] ath11k: support SMPS configuration for 6 GHz
|
|
|
|
Parse SMPS configuration from IEs and configure. Without this,
|
|
SMPS is not enabled for 6 GHz band.
|
|
|
|
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.4.0.1-01386-QCAHKSWPL_SILICONZ-1
|
|
|
|
Signed-off-by: Pradeep Kumar Chitrapu <pradeepc@codeaurora.org>
|
|
Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
Link: https://lore.kernel.org/r/20210913175510.193005-3-jouni@codeaurora.org
|
|
---
|
|
drivers/net/wireless/ath/ath11k/mac.c | 31 ++++++++++++++++++---------
|
|
1 file changed, 21 insertions(+), 10 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -2074,11 +2074,16 @@ static void ath11k_peer_assoc_h_smps(str
|
|
const struct ieee80211_sta_ht_cap *ht_cap = &sta->ht_cap;
|
|
int smps;
|
|
|
|
- if (!ht_cap->ht_supported)
|
|
+ if (!ht_cap->ht_supported && !sta->he_6ghz_capa.capa)
|
|
return;
|
|
|
|
- smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
|
|
- smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
|
|
+ if (ht_cap->ht_supported) {
|
|
+ smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
|
|
+ smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
|
|
+ } else {
|
|
+ smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS,
|
|
+ le16_to_cpu(sta->he_6ghz_capa.capa));
|
|
+ }
|
|
|
|
switch (smps) {
|
|
case WLAN_HT_CAP_SM_PS_STATIC:
|
|
@@ -2366,15 +2371,20 @@ static void ath11k_peer_assoc_prepare(st
|
|
|
|
static int ath11k_setup_peer_smps(struct ath11k *ar, struct ath11k_vif *arvif,
|
|
const u8 *addr,
|
|
- const struct ieee80211_sta_ht_cap *ht_cap)
|
|
+ const struct ieee80211_sta_ht_cap *ht_cap,
|
|
+ u16 he_6ghz_capa)
|
|
{
|
|
int smps;
|
|
|
|
- if (!ht_cap->ht_supported)
|
|
+ if (!ht_cap->ht_supported && !he_6ghz_capa)
|
|
return 0;
|
|
|
|
- smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
|
|
- smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
|
|
+ if (ht_cap->ht_supported) {
|
|
+ smps = ht_cap->cap & IEEE80211_HT_CAP_SM_PS;
|
|
+ smps >>= IEEE80211_HT_CAP_SM_PS_SHIFT;
|
|
+ } else {
|
|
+ smps = FIELD_GET(IEEE80211_HE_6GHZ_CAP_SM_PS, he_6ghz_capa);
|
|
+ }
|
|
|
|
if (smps >= ARRAY_SIZE(ath11k_smps_map))
|
|
return -EINVAL;
|
|
@@ -2427,7 +2437,8 @@ static void ath11k_bss_assoc(struct ieee
|
|
}
|
|
|
|
ret = ath11k_setup_peer_smps(ar, arvif, bss_conf->bssid,
|
|
- &ap_sta->ht_cap);
|
|
+ &ap_sta->ht_cap,
|
|
+ le16_to_cpu(ap_sta->he_6ghz_capa.capa));
|
|
if (ret) {
|
|
ath11k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n",
|
|
arvif->vdev_id, ret);
|
|
@@ -3720,7 +3731,7 @@ static int ath11k_station_assoc(struct a
|
|
return 0;
|
|
|
|
ret = ath11k_setup_peer_smps(ar, arvif, sta->addr,
|
|
- &sta->ht_cap);
|
|
+ &sta->ht_cap, le16_to_cpu(sta->he_6ghz_capa.capa));
|
|
if (ret) {
|
|
ath11k_warn(ar->ab, "failed to setup peer SMPS for vdev %d: %d\n",
|
|
arvif->vdev_id, ret);
|
|
@@ -7671,7 +7682,7 @@ static int __ath11k_mac_register(struct
|
|
* for each band for a dual band capable radio. It will be tricky to
|
|
* handle it when the ht capability different for each band.
|
|
*/
|
|
- if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS)
|
|
+ if (ht_cap & WMI_HT_CAP_DYNAMIC_SMPS || ar->supports_6ghz)
|
|
ar->hw->wiphy->features |= NL80211_FEATURE_DYNAMIC_SMPS;
|
|
|
|
ar->hw->wiphy->max_scan_ssids = WLAN_SCAN_PARAMS_MAX_SSID;
|