mirror of
https://github.com/openwrt/openwrt.git
synced 2025-01-31 00:24:12 +00:00
7e42fdcafe
This updates mac80211 to version 6.1.110-1. This code is based on Linux 6.1.110 and contains all fixes included in the upstream wireless subsystem from that kernel version. This includes many bugfixes and also some security fixes. The removed patches are already integrated in upstream Linux 6.1.110. The following patches were integrated in upstream Linux: subsys/311-v6.2-wifi-mac80211-fix-and-simplify-unencrypted-drop-chec.patch subsys/312-v6.3-wifi-cfg80211-move-A-MSDU-check-in-ieee80211_data_to.patch subsys/313-v6.3-wifi-cfg80211-factor-out-bridge-tunnel-RFC1042-heade.patch subsys/314-v6.3-wifi-mac80211-remove-mesh-forwarding-congestion-chec.patch subsys/315-v6.3-wifi-mac80211-fix-receiving-A-MSDU-frames-on-mesh-in.patch subsys/316-v6.3-wifi-mac80211-add-a-workaround-for-receiving-non-sta.patch subsys/321-mac80211-fix-mesh-forwarding.patch subsys/322-wifi-mac80211-fix-mesh-path-discovery-based-on-unica.patch subsys/329-wifi-mac80211-fix-receiving-mesh-packets-in-forwardi.patch subsys/339-wifi-cfg80211-fix-receving-mesh-packets-without-RFC1.patch subsys/350-v6.3-wifi-mac80211-Allow-NSS-change-only-up-to-capability.patch subsys/351-v6.9-wifi-mac80211-track-capability-opmode-NSS-separately.patch Link: https://github.com/openwrt/openwrt/pull/16368 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
118 lines
3.8 KiB
Diff
118 lines
3.8 KiB
Diff
From 813968c24126cc5c8320cd5db0e262069a535063 Mon Sep 17 00:00:00 2001
|
|
From: Ganesh Babu Jothiram <quic_gjothira@quicinc.com>
|
|
Date: Fri, 24 Mar 2023 16:57:00 +0200
|
|
Subject: [PATCH] wifi: ath11k: Configure the FTM responder role using firmware
|
|
capability flag
|
|
|
|
Fine Time Measurement(FTM) is offloaded feature to firmware.
|
|
Hence, the configuration of FTM responder role is done using
|
|
firmware capability flag instead of hw param.
|
|
|
|
Tested-on: QCN9074 hw1.0 PCI WLAN.HK.2.7.0.1-01744-QCAHKSWPL_SILICONZ-1
|
|
|
|
Signed-off-by: Ganesh Babu Jothiram <quic_gjothira@quicinc.com>
|
|
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
|
|
Link: https://lore.kernel.org/r/20230317072034.8217-1-quic_gjothira@quicinc.com
|
|
---
|
|
drivers/net/wireless/ath/ath11k/core.c | 8 --------
|
|
drivers/net/wireless/ath/ath11k/hw.h | 1 -
|
|
drivers/net/wireless/ath/ath11k/mac.c | 4 ++--
|
|
3 files changed, 2 insertions(+), 11 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/core.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/core.c
|
|
@@ -116,7 +116,6 @@ static const struct ath11k_hw_params ath
|
|
.tcl_ring_retry = true,
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
- .ftm_responder = true,
|
|
},
|
|
{
|
|
.hw_rev = ATH11K_HW_IPQ6018_HW10,
|
|
@@ -199,7 +198,6 @@ static const struct ath11k_hw_params ath
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
.support_fw_mac_sequence = false,
|
|
- .ftm_responder = true,
|
|
},
|
|
{
|
|
.name = "qca6390 hw2.0",
|
|
@@ -284,7 +282,6 @@ static const struct ath11k_hw_params ath
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
.support_fw_mac_sequence = true,
|
|
- .ftm_responder = false,
|
|
},
|
|
{
|
|
.name = "qcn9074 hw1.0",
|
|
@@ -366,7 +363,6 @@ static const struct ath11k_hw_params ath
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
.support_fw_mac_sequence = false,
|
|
- .ftm_responder = true,
|
|
},
|
|
{
|
|
.name = "wcn6855 hw2.0",
|
|
@@ -451,7 +447,6 @@ static const struct ath11k_hw_params ath
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
.support_fw_mac_sequence = true,
|
|
- .ftm_responder = false,
|
|
},
|
|
{
|
|
.name = "wcn6855 hw2.1",
|
|
@@ -534,7 +529,6 @@ static const struct ath11k_hw_params ath
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
.support_fw_mac_sequence = true,
|
|
- .ftm_responder = false,
|
|
},
|
|
{
|
|
.name = "wcn6750 hw1.0",
|
|
@@ -615,7 +609,6 @@ static const struct ath11k_hw_params ath
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE_WCN6750,
|
|
.smp2p_wow_exit = true,
|
|
.support_fw_mac_sequence = true,
|
|
- .ftm_responder = false,
|
|
},
|
|
{
|
|
.hw_rev = ATH11K_HW_IPQ5018_HW10,
|
|
@@ -695,7 +688,6 @@ static const struct ath11k_hw_params ath
|
|
.tx_ring_size = DP_TCL_DATA_RING_SIZE,
|
|
.smp2p_wow_exit = false,
|
|
.support_fw_mac_sequence = false,
|
|
- .ftm_responder = true,
|
|
},
|
|
};
|
|
|
|
--- a/drivers/net/wireless/ath/ath11k/hw.h
|
|
+++ b/drivers/net/wireless/ath/ath11k/hw.h
|
|
@@ -224,7 +224,6 @@ struct ath11k_hw_params {
|
|
u32 tx_ring_size;
|
|
bool smp2p_wow_exit;
|
|
bool support_fw_mac_sequence;
|
|
- bool ftm_responder;
|
|
};
|
|
|
|
struct ath11k_hw_ops {
|
|
--- a/drivers/net/wireless/ath/ath11k/mac.c
|
|
+++ b/drivers/net/wireless/ath/ath11k/mac.c
|
|
@@ -3535,7 +3535,7 @@ static void ath11k_mac_op_bss_info_chang
|
|
|
|
if (changed & BSS_CHANGED_FTM_RESPONDER &&
|
|
arvif->ftm_responder != info->ftm_responder &&
|
|
- ar->ab->hw_params.ftm_responder &&
|
|
+ test_bit(WMI_TLV_SERVICE_RTT, ar->ab->wmi_ab.svc_map) &&
|
|
(vif->type == NL80211_IFTYPE_AP ||
|
|
vif->type == NL80211_IFTYPE_MESH_POINT)) {
|
|
arvif->ftm_responder = info->ftm_responder;
|
|
@@ -9246,7 +9246,7 @@ static int __ath11k_mac_register(struct
|
|
wiphy_ext_feature_set(ar->hw->wiphy,
|
|
NL80211_EXT_FEATURE_SET_SCAN_DWELL);
|
|
|
|
- if (ab->hw_params.ftm_responder)
|
|
+ if (test_bit(WMI_TLV_SERVICE_RTT, ar->ab->wmi_ab.svc_map))
|
|
wiphy_ext_feature_set(ar->hw->wiphy,
|
|
NL80211_EXT_FEATURE_ENABLE_FTM_RESPONDER);
|
|
|