From e58618ef1d53e6d119d9c341b20364a76e8fb04e Mon Sep 17 00:00:00 2001 From: Pragaspathi Thilagaraj Date: Fri, 18 Mar 2022 12:02:22 +0530 Subject: [PATCH] qcacmn: Use correct wiphy feature flag Use NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE instead of NL80211_EXT_FEATURE_PROTECTION_OF_RANGING_NEGOTIATION. Also remove NL80211_EXT_FEATURE_SECURE_RTT advertisement which is not required. Change-Id: I5ba3da86125719f410c925ef40441acddc40ab9a CRs-Fixed: 3154060 --- os_if/linux/wifi_pos/inc/wlan_cfg80211_wifi_pos.h | 4 +--- os_if/linux/wifi_pos/src/wlan_cfg80211_wifi_pos.c | 7 ++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/os_if/linux/wifi_pos/inc/wlan_cfg80211_wifi_pos.h b/os_if/linux/wifi_pos/inc/wlan_cfg80211_wifi_pos.h index de42a54205..9ced3f6bcb 100644 --- a/os_if/linux/wifi_pos/inc/wlan_cfg80211_wifi_pos.h +++ b/os_if/linux/wifi_pos/inc/wlan_cfg80211_wifi_pos.h @@ -29,9 +29,7 @@ #include #include -#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0)) || \ - defined(CFG80211_PASN_SUPPORT)) && \ - defined(WIFI_POS_CONVERGED) +#if defined(CFG80211_PASN_SUPPORT) && defined(WIFI_POS_CONVERGED) void wlan_wifi_pos_cfg80211_set_wiphy_ext_feature(struct wiphy *wiphy, struct wlan_objmgr_psoc *psoc); diff --git a/os_if/linux/wifi_pos/src/wlan_cfg80211_wifi_pos.c b/os_if/linux/wifi_pos/src/wlan_cfg80211_wifi_pos.c index 74d46c2edf..fcc8556837 100644 --- a/os_if/linux/wifi_pos/src/wlan_cfg80211_wifi_pos.c +++ b/os_if/linux/wifi_pos/src/wlan_cfg80211_wifi_pos.c @@ -25,18 +25,15 @@ #include "wlan_objmgr_psoc_obj.h" #include "wlan_cfg80211_wifi_pos.h" -#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0)) || \ - defined(CFG80211_PASN_SUPPORT)) && \ - defined(WIFI_POS_CONVERGED) +#if defined(CFG80211_PASN_SUPPORT) && defined(WIFI_POS_CONVERGED) void wlan_wifi_pos_cfg80211_set_wiphy_ext_feature(struct wiphy *wiphy, struct wlan_objmgr_psoc *psoc) { if (wlan_psoc_nif_fw_ext2_cap_get(psoc, WLAN_RTT_11AZ_MAC_SEC_SUPPORT)) { - wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SECURE_RTT); wiphy_ext_feature_set(wiphy, - NL80211_EXT_FEATURE_PROTECTION_OF_RANGING_NEGOTIATION); + NL80211_EXT_FEATURE_PROT_RANGE_NEGO_AND_MEASURE); } if (wlan_psoc_nif_fw_ext2_cap_get(psoc,