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 <net/netlink.h>
 #include <net/cfg80211.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);
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,