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
This commit is contained in:
Pragaspathi Thilagaraj
2022-03-18 12:02:22 +05:30
committed by Madan Koyyalamudi
parent aa27094cab
commit e58618ef1d
2 changed files with 3 additions and 8 deletions

View File

@@ -29,9 +29,7 @@
#include <net/netlink.h> #include <net/netlink.h>
#include <net/cfg80211.h> #include <net/cfg80211.h>
#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0)) || \ #if defined(CFG80211_PASN_SUPPORT) && defined(WIFI_POS_CONVERGED)
defined(CFG80211_PASN_SUPPORT)) && \
defined(WIFI_POS_CONVERGED)
void void
wlan_wifi_pos_cfg80211_set_wiphy_ext_feature(struct wiphy *wiphy, wlan_wifi_pos_cfg80211_set_wiphy_ext_feature(struct wiphy *wiphy,
struct wlan_objmgr_psoc *psoc); struct wlan_objmgr_psoc *psoc);

View File

@@ -25,18 +25,15 @@
#include "wlan_objmgr_psoc_obj.h" #include "wlan_objmgr_psoc_obj.h"
#include "wlan_cfg80211_wifi_pos.h" #include "wlan_cfg80211_wifi_pos.h"
#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 14, 0)) || \ #if defined(CFG80211_PASN_SUPPORT) && defined(WIFI_POS_CONVERGED)
defined(CFG80211_PASN_SUPPORT)) && \
defined(WIFI_POS_CONVERGED)
void void
wlan_wifi_pos_cfg80211_set_wiphy_ext_feature(struct wiphy *wiphy, wlan_wifi_pos_cfg80211_set_wiphy_ext_feature(struct wiphy *wiphy,
struct wlan_objmgr_psoc *psoc) struct wlan_objmgr_psoc *psoc)
{ {
if (wlan_psoc_nif_fw_ext2_cap_get(psoc, if (wlan_psoc_nif_fw_ext2_cap_get(psoc,
WLAN_RTT_11AZ_MAC_SEC_SUPPORT)) { WLAN_RTT_11AZ_MAC_SEC_SUPPORT)) {
wiphy_ext_feature_set(wiphy, NL80211_EXT_FEATURE_SECURE_RTT);
wiphy_ext_feature_set(wiphy, 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, if (wlan_psoc_nif_fw_ext2_cap_get(psoc,