qcacld-3.0: Remove feature flag WLAN_FEATURE_11W for pmf

Remove all of the conditional compilation for pmf since this
feature is mandatory for future scope from protocol point
of view.

Change-Id: Id3a2127e9ecb343ad2a0354dcbc331c22167d7fb
CRs-Fixed: 2852630

Kbuild

@@ -2972,8 +2972,6 @@ endif
 
 cppflags-$(CONFIG_QCA_SUPPORT_TXRX_DRIVER_TCP_DEL_ACK) += -DQCA_SUPPORT_TXRX_DRIVER_TCP_DEL_ACK
 
-cppflags-$(CONFIG_WLAN_FEATURE_11W) += -DWLAN_FEATURE_11W
-
 cppflags-$(CONFIG_QCA_TXDESC_SANITY_CHECKS) += -DQCA_SUPPORT_TXDESC_SANITY_CHECKS
 
 cppflags-$(CONFIG_QCOM_LTE_COEX) += -DFEATURE_WLAN_CH_AVOID

components/mlme/core/src/wlan_mlme_main.c

@@ -337,7 +337,6 @@ static void mlme_init_ratemask_cfg(struct wlan_objmgr_psoc *psoc,
 			  ratemask_cfg->higher32_2);
 }
 
-#ifdef WLAN_FEATURE_11W
 static void mlme_init_pmf_cfg(struct wlan_objmgr_psoc *psoc,
 			      struct wlan_mlme_generic *gen)
 {
@@ -346,16 +345,6 @@ static void mlme_init_pmf_cfg(struct wlan_objmgr_psoc *psoc,
 	gen->pmf_sa_query_retry_interval =
 		cfg_get(psoc, CFG_PMF_SA_QUERY_RETRY_INTERVAL);
 }
-#else
-static void mlme_init_pmf_cfg(struct wlan_objmgr_psoc *psoc,
-			      struct wlan_mlme_generic *gen)
-{
-	gen->pmf_sa_query_max_retries =
-		cfg_default(CFG_PMF_SA_QUERY_MAX_RETRIES);
-	gen->pmf_sa_query_retry_interval =
-		cfg_default(CFG_PMF_SA_QUERY_RETRY_INTERVAL);
-}
-#endif /*WLAN_FEATURE_11W*/
 
 #ifdef WLAN_FEATURE_LPSS
 static inline void

components/mlme/dispatcher/inc/cfg_mlme_generic.h

@@ -23,13 +23,8 @@
 #ifndef __CFG_MLME_GENERIC_H
 #define __CFG_MLME_GENERIC_H
 
-#ifdef WLAN_FEATURE_11W
 #define CFG_PMF_SA_QUERY_MAX_RETRIES_TYPE	CFG_INI_UINT
 #define CFG_PMF_SA_QUERY_RETRY_INTERVAL_TYPE	CFG_INI_UINT
-#else
-#define CFG_PMF_SA_QUERY_MAX_RETRIES_TYPE	CFG_UINT
-#define CFG_PMF_SA_QUERY_RETRY_INTERVAL_TYPE	CFG_UINT
-#endif /*WLAN_FEATURE_11W*/
 
 /**
  * enum monitor_mode_concurrency - Monitor mode concurrency

configs/default_defconfig

@@ -341,14 +341,6 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 
 endif
 
-#Flag to enable Protected Management Frames (11w) feature
-ifeq ($(CONFIG_ROME_IF),usb)
-	CONFIG_WLAN_FEATURE_11W := y
-endif
-ifeq ($(CONFIG_ROME_IF),sdio)
-	CONFIG_WLAN_FEATURE_11W := y
-endif
-
 #Flag to enable the tx desc sanity check
 ifeq ($(CONFIG_ROME_IF),usb)
 	CONFIG_QCA_TXDESC_SANITY_CHECKS := y

configs/genoa.common

@@ -15,7 +15,6 @@ CONFIG_QCACLD_FEATURE_GREEN_AP := n
 CONFIG_CRYPTO_COMPONENT := y
 CONFIG_QCOM_VOWIFI_11R := y
 CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
 CONFIG_QCOM_LTE_COEX := n
 CONFIG_WLAN_FEATURE_LPSS := n
 CONFIG_QCACLD_FEATURE_NAN := y

configs/qca6174_defconfig

@@ -137,8 +137,6 @@ CONFIG_WLAN_FEATURE_ACTION_OUI := y
 CONFIG_WLAN_FEATURE_FILS := y
 ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	ifeq (y,$(findstring y,$(CONFIG_CNSS) $(CONFIG_CNSS2) $(CONFIG_ICNSS)))
-	#Flag to enable Protected Management Frames (11w) feature
-	CONFIG_WLAN_FEATURE_11W := y
 	#Flag to enable LTE CoEx feature
 	CONFIG_QCOM_LTE_COEX := y
 		ifneq ($(CONFIG_MOBILE_ROUTER), y)
@@ -148,8 +146,6 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	endif
 
 	ifeq (m,$(findstring m,$(CONFIG_CNSS2)))
-	#Flag to enable Protected Management Frames (11w) feature
-	CONFIG_WLAN_FEATURE_11W := y
 	#Flag to enable LTE CoEx feature
 	CONFIG_QCOM_LTE_COEX := y
 		ifneq ($(CONFIG_MOBILE_ROUTER), y)
@@ -159,14 +155,6 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	endif
 endif
 
-#Flag to enable Protected Management Frames (11w) feature
-ifeq ($(CONFIG_ROME_IF),usb)
-	CONFIG_WLAN_FEATURE_11W := y
-endif
-ifeq ($(CONFIG_ROME_IF),sdio)
-	CONFIG_WLAN_FEATURE_11W := y
-endif
-
 #Flag to enable the tx desc sanity check
 ifeq ($(CONFIG_ROME_IF),usb)
 	CONFIG_QCA_TXDESC_SANITY_CHECKS := y

configs/qca6390_defconfig

@@ -162,8 +162,6 @@ CONFIG_WLAN_FEATURE_ACTION_OUI := y
 CONFIG_WLAN_FEATURE_FILS := y
 ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	ifeq (y,$(findstring y,$(CONFIG_CNSS) $(CONFIG_CNSS2) $(CONFIG_ICNSS)))
-	#Flag to enable Protected Management Frames (11w) feature
-	CONFIG_WLAN_FEATURE_11W := y
 	#Flag to enable LTE CoEx feature
 	CONFIG_QCOM_LTE_COEX := y
 		ifneq ($(CONFIG_MOBILE_ROUTER), y)
@@ -173,8 +171,6 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	endif
 
 	ifeq (m,$(findstring m,$(CONFIG_CNSS2)))
-	#Flag to enable Protected Management Frames (11w) feature
-	CONFIG_WLAN_FEATURE_11W := y
 	#Flag to enable LTE CoEx feature
 	CONFIG_QCOM_LTE_COEX := y
 		ifneq ($(CONFIG_MOBILE_ROUTER), y)
@@ -184,14 +180,6 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	endif
 endif
 
-#Flag to enable Protected Management Frames (11w) feature
-ifeq ($(CONFIG_ROME_IF),usb)
-	CONFIG_WLAN_FEATURE_11W := y
-endif
-ifeq ($(CONFIG_ROME_IF),sdio)
-	CONFIG_WLAN_FEATURE_11W := y
-endif
-
 #Flag to enable the tx desc sanity check
 ifeq ($(CONFIG_ROME_IF),usb)
 	CONFIG_QCA_TXDESC_SANITY_CHECKS := y

configs/qcs40x.snoc.perf_defconfig

@@ -5,7 +5,6 @@ CONFIG_QCOM_TDLS := y
 CONFIG_QCACLD_FEATURE_GREEN_AP := y
 CONFIG_QCOM_VOWIFI_11R := y
 CONFIG_WLAN_FEATURE_FILS := y
-CONFIG_WLAN_FEATURE_11W := y
 CONFIG_QCOM_LTE_COEX := n
 CONFIG_WLAN_FEATURE_LPSS := n
 CONFIG_QCACLD_FEATURE_NAN := n

configs/wear_defconfig

@@ -230,8 +230,6 @@ CONFIG_SAE_SINGLE_PMK := y
 CONFIG_WLAN_FEATURE_FILS := y
 ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	ifeq (y,$(findstring y,$(CONFIG_CNSS) $(CONFIG_CNSS2) $(CONFIG_ICNSS)$(CONFIG_ICNSS2)))
-	#Flag to enable Protected Management Frames (11w) feature
-	CONFIG_WLAN_FEATURE_11W := y
 	#Flag to enable LTE CoEx feature
 	CONFIG_QCOM_LTE_COEX := y
 		ifneq ($(CONFIG_MOBILE_ROUTER), y)
@@ -241,8 +239,6 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	endif
 
 	ifeq (m,$(findstring m,$(CONFIG_CNSS2) $(CONFIG_ICNSS2)))
-	#Flag to enable Protected Management Frames (11w) feature
-	CONFIG_WLAN_FEATURE_11W := y
 	#Flag to enable LTE CoEx feature
 	CONFIG_QCOM_LTE_COEX := y
 		ifneq ($(CONFIG_MOBILE_ROUTER), y)
@@ -252,14 +248,6 @@ ifneq ($(CONFIG_QCA_CLD_WLAN),)
 	endif
 endif
 
-#Flag to enable Protected Management Frames (11w) feature
-ifeq ($(CONFIG_ROME_IF),usb)
-	CONFIG_WLAN_FEATURE_11W := y
-endif
-ifeq ($(CONFIG_ROME_IF),sdio)
-	CONFIG_WLAN_FEATURE_11W := y
-endif
-
 #Flag to enable the tx desc sanity check
 ifeq ($(CONFIG_ROME_IF),usb)
 	CONFIG_QCA_TXDESC_SANITY_CHECKS := y

core/cds/inc/cds_utils.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -100,7 +100,6 @@ uint32_t cds_chan_to_freq(uint8_t chan);
 uint8_t cds_freq_to_chan(uint32_t freq);
 enum cds_band_type cds_chan_to_band(uint32_t chan);
 
-#ifdef WLAN_FEATURE_11W
 uint8_t cds_get_mmie_size(void);
 
 /**
@@ -110,7 +109,6 @@ uint8_t cds_get_mmie_size(void);
  */
 uint8_t cds_get_gmac_mmie_size(void);
 
-#endif /* WLAN_FEATURE_11W */
 static inline void cds_host_diag_log_work(qdf_wake_lock_t *lock, uint32_t msec,
 			    uint32_t reason) {
 	if (((cds_get_ring_log_level(RING_ID_WAKELOCK) >= WLAN_LOG_LEVEL_ACTIVE)

core/cds/src/cds_utils.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -70,7 +70,6 @@
    Function Definitions and Documentation
  * -------------------------------------------------------------------------*/
 
-#ifdef WLAN_FEATURE_11W
 uint8_t cds_get_mmie_size(void)
 {
 	return sizeof(struct ieee80211_mmie);
@@ -88,8 +87,6 @@ uint8_t cds_get_gmac_mmie_size(void)
 }
 #endif
 
-#endif /* WLAN_FEATURE_11W */
-
 uint32_t cds_chan_to_freq(uint8_t chan)
 {
 	if (chan < CDS_24_GHZ_CHANNEL_14)       /* ch 0 - ch 13 */

core/dp/txrx/ol_txrx.c

@@ -2626,7 +2626,6 @@ ol_txrx_peer_get_peer_mac_addr(void *ppeer)
 	return peer->mac_addr.raw;
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * ol_txrx_get_pn_info() - Returns pn info from peer
  * @soc_hdl: soc handle
@@ -2664,14 +2663,6 @@ ol_txrx_get_pn_info(struct cdp_soc_t *soc_hdl, uint8_t *peer_mac,
 
 	ol_txrx_peer_release_ref(peer, PEER_DEBUG_ID_OL_INTERNAL);
 }
-#else
-static void
-ol_txrx_get_pn_info(struct cdp_soc_t *soc_hdl, uint8_t *peer_mac,
-		    uint8_t vdev_id, uint8_t **last_pn_valid,
-		    uint64_t **last_pn, uint32_t **rmf_pn_replays)
-{
-}
-#endif
 
 /**
  * ol_txrx_get_opmode() - Return operation mode of vdev

core/dp/txrx/ol_txrx_types.h

@@ -1519,12 +1519,10 @@ struct ol_txrx_peer_t {
 	/* Bit to indicate if PN check is done in fw */
 	qdf_atomic_t fw_pn_check;
 
-#ifdef WLAN_FEATURE_11W
 	/* PN counter for Robust Management Frames */
 	uint64_t last_rmf_pn;
 	uint32_t rmf_pn_replays;
 	uint8_t last_rmf_pn_valid;
-#endif
 
 	/* Properties of the last received PPDU */
 	int16_t last_pkt_rssi_cmb;

core/hdd/inc/wlan_hdd_main.h

@@ -596,7 +596,6 @@ struct hdd_tx_rx_stats {
 	u64 jiffies_last_txtimeout;
 };
 
-#ifdef WLAN_FEATURE_11W
 /**
  * struct hdd_pmf_stats - Protected Management Frame statistics
  * @num_unprot_deauth_rx: Number of unprotected deauth frames received
@@ -606,7 +605,6 @@ struct hdd_pmf_stats {
 	uint8_t num_unprot_deauth_rx;
 	uint8_t num_unprot_disassoc_rx;
 };
-#endif
 
 /**
  * struct hdd_arp_stats_s - arp debug stats count
@@ -785,9 +783,7 @@ struct hdd_stats {
 	struct hdd_tcp_stats_s hdd_tcp_stats;
 	struct hdd_icmpv4_stats_s hdd_icmpv4_stats;
 	struct hdd_peer_stats peer_stats;
-#ifdef WLAN_FEATURE_11W
 	struct hdd_pmf_stats hdd_pmf_stats;
-#endif
 	struct hdd_eapol_stats_s hdd_eapol_stats;
 	struct hdd_dhcp_stats_s hdd_dhcp_stats;
 	struct pmf_bcn_protect_stats bcn_protect_stats;

core/hdd/src/wlan_hdd_assoc.c

@@ -122,13 +122,11 @@ uint8_t ccp_rsn_oui04[HDD_RSN_OUI_SIZE] = { 0x00, 0x0F, 0xAC, 0x04 };
 /* WEP-104 */
 uint8_t ccp_rsn_oui05[HDD_RSN_OUI_SIZE] = { 0x00, 0x0F, 0xAC, 0x05 };
 
-#ifdef WLAN_FEATURE_11W
 /* RSN-PSK-SHA256 */
 uint8_t ccp_rsn_oui07[HDD_RSN_OUI_SIZE] = { 0x00, 0x0F, 0xAC, 0x06 };
 
 /* RSN-8021X-SHA256 */
 uint8_t ccp_rsn_oui08[HDD_RSN_OUI_SIZE] = { 0x00, 0x0F, 0xAC, 0x05 };
-#endif
 
 /* AES-GCMP-128 */
 uint8_t ccp_rsn_oui09[HDD_RSN_OUI_SIZE] = { 0x00, 0x0F, 0xAC, 0x08 };
@@ -1668,11 +1666,9 @@ void hdd_clear_roam_profile_ie(struct hdd_adapter *adapter)
 
 	qdf_mem_zero(roam_profile->bssid_hint.bytes, QDF_MAC_ADDR_SIZE);
 
-#ifdef WLAN_FEATURE_11W
 	roam_profile->MFPEnabled = false;
 	roam_profile->MFPRequired = 0;
 	roam_profile->MFPCapable = 0;
-#endif
 
 	qdf_mem_zero(roam_profile->Keys.KeyLength, CSR_MAX_NUM_KEY);
 	qdf_mem_zero(roam_profile->Keys.KeyMaterial,
@@ -3440,8 +3436,6 @@ QDF_STATUS hdd_roam_register_tdlssta(struct hdd_adapter *adapter,
 
 #endif
 
-#ifdef WLAN_FEATURE_11W
-
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 11, 0))
 
 static void hdd_rx_unprot_disassoc(struct net_device *dev,
@@ -3527,7 +3521,6 @@ hdd_indicate_unprot_mgmt_frame(struct hdd_adapter *adapter,
 		break;
 	}
 }
-#endif /* WLAN_FEATURE_11W */
 
 #ifdef FEATURE_WLAN_ESE
 /**
@@ -3922,21 +3915,14 @@ hdd_indicate_ese_bcn_report_ind(const struct hdd_adapter *adapter,
  *
  * Return: bool
  */
-#ifdef WLAN_FEATURE_11W
 static inline bool
 hdd_is_8021x_sha256_auth_type(struct hdd_station_ctx *sta_ctx)
 {
 	return eCSR_AUTH_TYPE_RSN_8021X_SHA256 ==
 				sta_ctx->conn_info.auth_type;
 }
-#else
-static inline bool
-hdd_is_8021x_sha256_auth_type(struct hdd_station_ctx *sta_ctx)
-{
-	return false;
-}
-#endif
 #endif
+
 /*
  * hdd_roam_channel_switch_handler() - hdd channel switch handler
  * @adapter: Pointer to adapter context
@@ -4278,7 +4264,6 @@ hdd_sme_roam_callback(void *context, struct csr_roam_info *roam_info,
 		break;
 #endif
 #endif /* ndef FEATURE_CM_ENABLE */
-#ifdef WLAN_FEATURE_11W
 	case eCSR_ROAM_UNPROT_MGMT_FRAME_IND:
 		if (roam_info)
 			hdd_indicate_unprot_mgmt_frame(adapter,
@@ -4286,7 +4271,6 @@ hdd_sme_roam_callback(void *context, struct csr_roam_info *roam_info,
 					       roam_info->pbFrames,
 					       roam_info->frameType);
 		break;
-#endif
 #ifdef FEATURE_WLAN_ESE
 	case eCSR_ROAM_TSM_IE_IND:
 		if (roam_info)
@@ -4457,16 +4441,13 @@ enum csr_akm_type hdd_translate_rsn_to_csr_auth_type(uint8_t auth_suite[4])
 		auth_type = eCSR_AUTH_TYPE_CCKM_RSN;
 	} else
 #endif /* FEATURE_WLAN_ESE */
-#ifdef WLAN_FEATURE_11W
 	if (memcmp(auth_suite, ccp_rsn_oui07, 4) == 0) {
 		auth_type = eCSR_AUTH_TYPE_RSN_PSK_SHA256;
 	} else if (memcmp(auth_suite, ccp_rsn_oui08, 4) == 0) {
 		auth_type = eCSR_AUTH_TYPE_RSN_8021X_SHA256;
 	} else if (memcmp(auth_suite, ccp_rsn_oui_18, 4) == 0) {
 		auth_type = eCSR_AUTH_TYPE_OWE;
-	} else
-#endif
-	if (memcmp(auth_suite, ccp_rsn_oui_12, 4) == 0) {
+	} else if (memcmp(auth_suite, ccp_rsn_oui_12, 4) == 0) {
 		auth_type = eCSR_AUTH_TYPE_DPP_RSN;
 	} else if (memcmp(auth_suite, ccp_rsn_oui_0b, 4) == 0) {
 		/* Check for Suite B EAP 256 */
@@ -4606,7 +4587,6 @@ bool hdd_is_fils_connection(struct hdd_context *hdd_ctx,
  *
  * Return: 0 on success, error number otherwise
  */
-#ifdef WLAN_FEATURE_11W
 static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 				 u8 *bssid,
 				 eCsrEncryptionType *encrypt_type,
@@ -4614,14 +4594,6 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 				 enum csr_akm_type *auth_type,
 				 uint8_t *mfp_required, uint8_t *mfp_capable,
 				 uint16_t gen_ie_len, uint8_t *gen_ie)
-#else
-static int32_t hdd_process_genie(struct hdd_adapter *adapter,
-				 u8 *bssid,
-				 eCsrEncryptionType *encrypt_type,
-				 eCsrEncryptionType *mc_encrypt_type,
-				 enum csr_akm_type *auth_type,
-				 uint16_t gen_ie_len, uint8_t *gen_ie)
-#endif
 {
 	mac_handle_t mac_handle = hdd_adapter_get_mac_handle(adapter);
 	tDot11fIERSN dot11_rsn_ie = {0};
@@ -4678,12 +4650,10 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 			*mc_encrypt_type =
 			hdd_translate_rsn_to_csr_encryption_type(
 					dot11_rsn_ie.gp_cipher_suite);
-#ifdef WLAN_FEATURE_11W
 		*mfp_required = dot11_rsn_ie.RSN_Cap[0] &
 					WLAN_CRYPTO_RSN_CAP_MFP_REQUIRED;
 		*mfp_capable =  dot11_rsn_ie.RSN_Cap[0] &
 					WLAN_CRYPTO_RSN_CAP_MFP_ENABLED;
-#endif
 		qdf_mem_copy(&rsn_cap, dot11_rsn_ie.RSN_Cap, sizeof(rsn_cap));
 		wlan_crypto_set_vdev_param(adapter->vdev,
 					   WLAN_CRYPTO_PARAM_RSN_CAP, rsn_cap);
@@ -4730,7 +4700,6 @@ static int32_t hdd_process_genie(struct hdd_adapter *adapter,
 	return 0;
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * hdd_set_def_mfp_cap: Set default value for MFPCapable
  * @profile: Source profile
@@ -4742,12 +4711,6 @@ static void hdd_set_def_mfp_cap(
 {
 	roam_profile->MFPCapable = roam_profile->MFPEnabled;
 }
-#else
-static void hdd_set_def_mfp_cap(
-	struct csr_roam_profile *roam_profile)
-{
-}
-#endif
 
 /**
  * hdd_set_def_rsne_override() - set default encryption type and auth type
@@ -4779,7 +4742,6 @@ static void hdd_set_def_rsne_override(
 	*auth_type = eCSR_AUTH_TYPE_RSN_PSK;
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * hdd_update_values_mfp_cap: Update values for MFPCapable,MFPEnabled
  * @profile: Source profile
@@ -4795,15 +4757,7 @@ static void hdd_update_values_mfp_cap(
 	roam_profile->MFPRequired = mfp_required;
 	roam_profile->MFPCapable = mfp_capable;
 }
-#else
-static void hdd_update_values_mfp_cap(
-	struct csr_roam_profile *roam_profile,
-	uint8_t mfp_required, uint8_t mfp_capable )
-{
-}
-#endif
 
-#ifdef WLAN_FEATURE_11W
 /**
  * hdd_set_mfp_enable: Set value for MFPEnabled
  * @profile: Source profile
@@ -4823,13 +4777,7 @@ static void hdd_set_mfp_enable(struct csr_roam_profile *roam_profile)
 		roam_profile->MFPEnabled = 0;
 	}
 }
-#else
-static void hdd_set_mfp_enable(struct csr_roam_profile *roam_profile)
-{
-}
-#endif
 
-#ifdef WLAN_FEATURE_11W
 static uint32_t wlan_hdd_process_genie(struct hdd_adapter *adapter,
 				   u8 *bssid,
 				   eCsrEncryptionType *encrypt_type,
@@ -4848,25 +4796,6 @@ static uint32_t wlan_hdd_process_genie(struct hdd_adapter *adapter,
 
 	return status;
 }
-#else
-static uint32_t wlan_hdd_process_genie(struct hdd_adapter *adapter,
-				   u8 *bssid,
-				   eCsrEncryptionType *encrypt_type,
-				   eCsrEncryptionType *mc_encrypt_type,
-				   enum csr_akm_type *auth_type,
-				   uint8_t *mfp_required,
-				   uint8_t *mfp_capable,
-				   uint16_t gen_ie_len, uint8_t *gen_ie)
-{
-	uint32_t status;
-
-	status = hdd_process_genie(adapter, bssid,
-				   encrypt_type, mc_encrypt_type,
-				   auth_type, gen_ie_len, gen_ie);
-
-	return status;
-}
-#endif
 
 /**
  * hdd_set_genie_to_csr() - set genie to csr
@@ -5074,19 +5003,16 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
 				    == HDD_AUTH_KEY_MGMT_PSK)) {
 				roam_profile->AuthType.authType[0] =
 					eCSR_AUTH_TYPE_FT_RSN_PSK;
-			} else
-
-#ifdef WLAN_FEATURE_11W
-			if (rsn_auth_type == eCSR_AUTH_TYPE_RSN_PSK_SHA256) {
+			} else if (rsn_auth_type ==
+					eCSR_AUTH_TYPE_RSN_PSK_SHA256) {
 				roam_profile->AuthType.authType[0] =
 					eCSR_AUTH_TYPE_RSN_PSK_SHA256;
 			} else if (rsn_auth_type ==
 				   eCSR_AUTH_TYPE_RSN_8021X_SHA256) {
 				roam_profile->AuthType.authType[0] =
 					eCSR_AUTH_TYPE_RSN_8021X_SHA256;
-			} else
-#endif
-			if (hdd_check_fils_rsn_n_set_auth_type(roam_profile,
+			} else if (hdd_check_fils_rsn_n_set_auth_type(
+				roam_profile,
 				rsn_auth_type)) {
 				roam_profile->AuthType.authType[0] =
 					rsn_auth_type;
@@ -5126,14 +5052,12 @@ int hdd_set_csr_auth_type(struct hdd_adapter *adapter,
 				/* FT Suite-B EAP SHA 384 */
 				roam_profile->AuthType.authType[0] =
 					eCSR_AUTH_TYPE_FT_SUITEB_EAP_SHA384;
-
 			} else if ((key_mgmt & HDD_AUTH_KEY_MGMT_802_1X)
 				    == HDD_AUTH_KEY_MGMT_802_1X) {
 				roam_profile->AuthType.authType[0] =
 					eCSR_AUTH_TYPE_RSN;
-			} else
-			if ((key_mgmt & HDD_AUTH_KEY_MGMT_PSK)
-			    == HDD_AUTH_KEY_MGMT_PSK) {
+			} else if ((key_mgmt & HDD_AUTH_KEY_MGMT_PSK)
+				  == HDD_AUTH_KEY_MGMT_PSK) {
 				roam_profile->AuthType.authType[0] =
 					eCSR_AUTH_TYPE_RSN_PSK;
 			} else {

core/hdd/src/wlan_hdd_cfg80211.c

@@ -244,13 +244,11 @@ static const u32 hdd_cipher_suites[] = {
 #ifdef FEATURE_WLAN_WAPI
 	WLAN_CIPHER_SUITE_SMS4,
 #endif
-#ifdef WLAN_FEATURE_11W
 	WLAN_CIPHER_SUITE_AES_CMAC,
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0))
 	WLAN_CIPHER_SUITE_BIP_GMAC_128,
 	WLAN_CIPHER_SUITE_BIP_GMAC_256,
 #endif
-#endif
 };
 
 static const struct ieee80211_channel hdd_channels_2_4_ghz[] = {
@@ -18645,7 +18643,6 @@ void hdd_select_cbmode(struct hdd_adapter *adapter, qdf_freq_t oper_freq,
 }
 
 #ifndef FEATURE_CM_ENABLE
-#ifdef WLAN_FEATURE_11W
 /**
  * wlan_hdd_cfg80211_check_pmf_valid() - check if pmf status is ok
  * @roam_profile: pointer to roam profile
@@ -18669,13 +18666,6 @@ int wlan_hdd_cfg80211_check_pmf_valid(struct csr_roam_profile *roam_profile)
 	}
 	return 0;
 }
-#else
-static inline
-int wlan_hdd_cfg80211_check_pmf_valid(struct csr_roam_profile *roam_profile)
-{
-	return 0;
-}
-#endif
 
 /**
  * wlan_hdd_cfg80211_connect_start() - to start the association process
@@ -20241,9 +20231,7 @@ static int wlan_hdd_cfg80211_set_privacy(struct hdd_adapter *adapter,
 		hdd_err("Failed to set mcast cipher type");
 		goto release_vdev_ref;
 	}
-#ifdef WLAN_FEATURE_11W
 	roam_profile->MFPEnabled = (req->mfp == NL80211_MFP_REQUIRED);
-#endif
 
 	/*parse WPA/RSN IE, and set the correspoing fileds in Roam profile */
 	if (req->ie_len) {

core/hdd/src/wlan_hdd_cm_api.h

@@ -220,20 +220,13 @@ void hdd_cm_handle_assoc_event(struct wlan_objmgr_vdev *vdev,
  */
 void hdd_cm_netif_queue_enable(struct hdd_adapter *adapter);
 
-#ifdef WLAN_FEATURE_11W
 /**
  * hdd_cm_clear_pmf_stats() - Clear pmf stats
  * @adapter: pointer to the adapter structure
  *
  * Returns: None
  */
-
 void hdd_cm_clear_pmf_stats(struct hdd_adapter *adapter);
-#else
-static inline void hdd_cm_clear_pmf_stats(struct hdd_adapter *adapter)
-{
-}
-#endif
 
 /**
  * hdd_cm_save_connect_status() - Save connect status

core/hdd/src/wlan_hdd_cm_connect.c

@@ -279,13 +279,11 @@ void hdd_cm_netif_queue_enable(struct hdd_adapter *adapter)
 	}
 }
 
-#ifdef WLAN_FEATURE_11W
 void hdd_cm_clear_pmf_stats(struct hdd_adapter *adapter)
 {
 	qdf_mem_zero(&adapter->hdd_stats.hdd_pmf_stats,
 		     sizeof(adapter->hdd_stats.hdd_pmf_stats));
 }
-#endif
 
 void hdd_cm_save_connect_status(struct hdd_adapter *adapter,
 				uint32_t reason_code)

core/hdd/src/wlan_hdd_hostapd.c

@@ -5717,12 +5717,10 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 		goto error;
 	}
 
-#ifdef WLAN_FEATURE_11W
 	config->mfpCapable = mfp_capable;
 	config->mfpRequired = mfp_required;
 	hdd_debug("Soft AP MFP capable %d, MFP required %d",
 		  config->mfpCapable, config->mfpRequired);
-#endif
 
 	hdd_nofl_debug("SAP mac:" QDF_MAC_ADDR_FMT " SSID: %.*s BCNINTV:%d Freq:%d freq_seg0:%d freq_seg1:%d ch_width:%d HW mode:%d privacy:%d akm:%d acs_mode:%d acs_dfs_mode %d dtim period:%d",
 		       QDF_MAC_ADDR_REF(adapter->mac_addr.bytes),

core/hdd/src/wlan_hdd_wext.c

@@ -1990,7 +1990,6 @@
  */
 #define WE_GET_TDLS_PEERS    8
 #endif
-#ifdef WLAN_FEATURE_11W
 /*
  * <ioctl>
  * getPMFInfo - get the PMF info of the connected session
@@ -2015,7 +2014,6 @@
  * </ioctl>
  */
 #define WE_GET_11W_INFO      9
-#endif
 #define WE_GET_STATES        10
 /*
  * <ioctl>
@@ -6357,7 +6355,6 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		break;
 	}
 #endif
-#ifdef WLAN_FEATURE_11W
 	case WE_GET_11W_INFO:
 	{
 		struct csr_roam_profile *roam_profile =
@@ -6385,7 +6382,6 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		wrqu->data.length = strlen(extra) + 1;
 		break;
 	}
-#endif
 	case WE_GET_PHYMODE:
 	{
 		bool ch_bond24 = false, ch_bond5g = false;
@@ -9891,12 +9887,11 @@ static const struct iw_priv_args we_private_args[] = {
 	 IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN,
 	 "getTdlsPeers"},
 #endif
-#ifdef WLAN_FEATURE_11W
 	{WE_GET_11W_INFO,
 	 0,
 	 IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN,
 	 "getPMFInfo"},
-#endif
+
 	{WE_GET_STA_CXN_INFO,
 	 0,
 	 IW_PRIV_TYPE_CHAR | WE_MAX_STR_LEN,

core/mac/inc/sir_api.h

@@ -779,10 +779,8 @@ struct start_bss_req {
 	tSirNwType nwType;      /* Indicates 11a/b/g */
 	tSirMacRateSet operationalRateSet;      /* Has 11a or 11b rates */
 	tSirMacRateSet extendedRateSet; /* Has 11g rates */
-#ifdef WLAN_FEATURE_11W
 	bool pmfCapable;
 	bool pmfRequired;
-#endif
 
 	struct add_ie_params add_ie_params;
 
@@ -1950,14 +1948,12 @@ struct sir_sme_mgmt_frame_cb_req {
 	sir_mgmt_frame_ind_callback callback;
 };
 
-#ifdef WLAN_FEATURE_11W
 typedef struct sSirSmeUnprotMgmtFrameInd {
 	uint8_t sessionId;
 	uint8_t frameType;
 	uint8_t frameLen;
 	uint8_t frameBuf[1];    /* variable */
 } tSirSmeUnprotMgmtFrameInd, *tpSirSmeUnprotMgmtFrameInd;
-#endif
 
 #ifdef WLAN_FEATURE_EXTWOW_SUPPORT
 
@@ -2220,12 +2216,10 @@ typedef struct sSirSmeCandidateFoundInd {
 } tSirSmeCandidateFoundInd, *tpSirSmeCandidateFoundInd;
 #endif
 
-#ifdef WLAN_FEATURE_11W
 typedef struct sSirWlanExcludeUnencryptParam {
 	bool excludeUnencrypt;
 	struct qdf_mac_addr bssid;
 } tSirWlanExcludeUnencryptParam, *tpSirWlanExcludeUnencryptParam;
-#endif
 
 typedef enum {
 	P2P_SCAN_TYPE_SEARCH = 1,       /* P2P Search */

core/mac/inc/wni_api.h

@@ -118,9 +118,7 @@ enum eWniMsgTypes {
 	eWNI_SME_TDLS_SHOULD_TEARDOWN = SIR_SME_MSG_TYPES_BEGIN + 70,
 	eWNI_SME_TDLS_PEER_DISCONNECTED = SIR_SME_MSG_TYPES_BEGIN + 71,
 #endif
-#ifdef WLAN_FEATURE_11W
 	eWNI_SME_UNPROT_MGMT_FRM_IND = SIR_SME_MSG_TYPES_BEGIN + 74,
-#endif
 #ifdef WLAN_FEATURE_GTK_OFFLOAD
 	eWNI_PMC_GTK_OFFLOAD_GETINFO_RSP = SIR_SME_MSG_TYPES_BEGIN + 75,
 #endif /* WLAN_FEATURE_GTK_OFFLOAD */

core/mac/src/include/dph_global.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -44,12 +44,10 @@
 /* DPH Hash Index for BSS(STA's Peer) on station. */
 #define DPH_STA_HASH_INDEX_PEER   1
 
-#ifdef WLAN_FEATURE_11W
 /* DPH PMF SA Query state for station */
 #define DPH_SA_QUERY_NOT_IN_PROGRESS      1
 #define DPH_SA_QUERY_IN_PROGRESS          2
 #define DPH_SA_QUERY_TIMED_OUT            3
-#endif
 
 typedef struct sDphQosParams {
 	uint8_t addtsPresent;
@@ -158,13 +156,11 @@ typedef struct sDphHashNode {
 	uint8_t vht_160mhz_nss;
 	uint8_t vht_80p80mhz_nss;
 	uint8_t vht_extended_nss_bw_cap;
-#ifdef WLAN_FEATURE_11W
 	TX_TIMER pmfSaQueryTimer;
 	uint16_t pmfSaQueryCurrentTransId;
 	uint16_t pmfSaQueryStartTransId;
 	uint8_t pmfSaQueryState;
 	uint8_t pmfSaQueryRetryCount;
-#endif
 	uint8_t htLdpcCapable;
 	uint8_t vhtLdpcCapable;
 #ifdef FEATURE_WLAN_TDLS

core/mac/src/include/parser_api.h

@@ -458,9 +458,7 @@ typedef struct sSirAssocRsp {
 	tDot11fIEVHTOperation VHTOperation;
 	tDot11fIEExtCap ExtCap;
 	struct qos_map_set QosMapSet;
-#ifdef WLAN_FEATURE_11W
 	tDot11fIETimeoutInterval TimeoutInterval;
-#endif
 	tDot11fIERRMEnabledCap rrm_caps;
 	tDot11fIEvendor_vht_ie vendor_vht_ie;
 	tDot11fIEOBSSScanParameters obss_scanparams;

core/mac/src/include/sir_params.h

@@ -353,9 +353,7 @@ enum halmsgtype {
 
 	SIR_HAL_TRAFFIC_STATS_IND         = (SIR_HAL_ITC_MSG_TYPES_BEGIN + 141),
 
-#ifdef WLAN_FEATURE_11W
 	SIR_HAL_EXCLUDE_UNENCRYPTED_IND   = (SIR_HAL_ITC_MSG_TYPES_BEGIN + 142),
-#endif
 #ifdef FEATURE_WLAN_TDLS
 /* / PE <-> HAL TDLS messages */
 	SIR_HAL_TDLS_LINK_ESTABLISH_REQ   = (SIR_HAL_ITC_MSG_TYPES_BEGIN + 143),

core/mac/src/pe/include/lim_api.h

@@ -146,7 +146,6 @@ QDF_STATUS lim_start(struct mac_context *mac);
 QDF_STATUS pe_start(struct mac_context *mac);
 void pe_stop(struct mac_context *mac);
 
-#ifdef WLAN_FEATURE_11W
 /**
  * lim_stop_pmfcomeback_timer() - stop pmf comeback timer
  * @session: Pointer to PE session
@@ -154,11 +153,6 @@ void pe_stop(struct mac_context *mac);
  * Return: None
  */
 void lim_stop_pmfcomeback_timer(struct pe_session *session);
-#else
-static inline void lim_stop_pmfcomeback_timer(struct pe_session *session)
-{
-}
-#endif
 
 /**
  * pe_register_mgmt_rx_frm_callback() - registers callback for receiving

core/mac/src/pe/include/lim_session.h

@@ -35,7 +35,6 @@ typedef struct sPowersaveoffloadInfo {
 	uint8_t bcnmiss;
 } tPowersaveoffloadInfo, tpPowersaveoffloadInfo;
 
-#ifdef WLAN_FEATURE_11W
 struct comeback_timer_info {
 	struct mac_context *mac;
 	uint8_t vdev_id;
@@ -43,7 +42,6 @@ struct comeback_timer_info {
 	tLimMlmStates lim_prev_mlm_state;  /* Previous MLM State */
 	tLimMlmStates lim_mlm_state;       /* MLM State */
 };
-#endif /* WLAN_FEATURE_11W */
 /*--------------------------------------------------------------------------
    Include Files
    ------------------------------------------------------------------------*/
@@ -311,9 +309,7 @@ struct pe_session {
 	uint8_t limWmeEnabled:1;        /* WME */
 	uint8_t limWsmEnabled:1;        /* WSM */
 	uint8_t limHcfEnabled:1;
-#ifdef WLAN_FEATURE_11W
 	uint8_t limRmfEnabled:1;        /* 11W */
-#endif
 	uint32_t lim11hEnable;
 
 	int8_t maxTxPower;   /* MIN (Regulatory and local power constraint) */
@@ -483,10 +479,8 @@ struct pe_session {
 	/* Fast Transition (FT) */
 	tftPEContext ftPEContext;
 	bool isNonRoamReassoc;
-#ifdef WLAN_FEATURE_11W
 	qdf_mc_timer_t pmf_retry_timer;
 	struct comeback_timer_info pmf_retry_timer_info;
-#endif /* WLAN_FEATURE_11W */
 	uint8_t  is_key_installed;
 	/* timer for resetting protection fileds at regular intervals */
 	qdf_mc_timer_t protection_fields_reset_timer;

core/mac/src/pe/lim/lim_api.c

@@ -594,7 +594,6 @@ static inline void lim_nan_register_callbacks(struct mac_context *mac_ctx)
 }
 #endif
 
-#ifdef WLAN_FEATURE_11W
 void lim_stop_pmfcomeback_timer(struct pe_session *session)
 {
 	if (session->opmode != QDF_STA_MODE)
@@ -603,7 +602,6 @@ void lim_stop_pmfcomeback_timer(struct pe_session *session)
 	qdf_mc_timer_stop(&session->pmf_retry_timer);
 	session->pmf_retry_timer_info.retried = false;
 }
-#endif
 
 /*
  * pe_shutdown_notifier_cb - Shutdown notifier callback
@@ -629,7 +627,6 @@ static void pe_shutdown_notifier_cb(void *ctx)
 	}
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * is_mgmt_protected - check RMF enabled for the peer
  * @vdev_id: vdev id
@@ -676,24 +673,6 @@ static bool is_mgmt_protected(uint32_t vdev_id,
 	return protected;
 }
 
-#else
-/**
- * is_mgmt_protected - check RMF enabled for the peer
- * @vdev_id: vdev id
- * @peer_mac_addr: peer mac address
- *
- * The function check the mgmt frame protection enabled or not
- * for station mode and AP mode
- *
- * Return: true, if the connection is RMF enabled.
- */
-static bool is_mgmt_protected(uint32_t vdev_id,
-				  const uint8_t *peer_mac_addr)
-{
-	return false;
-}
-#endif
-
 static void p2p_register_callbacks(struct mac_context *mac_ctx)
 {
 	struct p2p_protocol_callbacks p2p_cb = {0};
@@ -1738,7 +1717,6 @@ void lim_ps_offload_handle_missed_beacon_ind(struct mac_context *mac,
 }
 
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
-#ifdef WLAN_FEATURE_11W
 static void pe_set_rmf_caps(struct mac_context *mac_ctx,
 			    struct pe_session *ft_session,
 			    struct roam_offload_synch_ind *roam_synch)
@@ -1805,13 +1783,6 @@ static void pe_set_rmf_caps(struct mac_context *mac_ctx,
 	ft_session->limRmfEnabled =
 		lim_get_vdev_rmf_capable(mac_ctx, ft_session);
 }
-#else
-static inline void pe_set_rmf_caps(struct mac_context *mac_ctx,
-				   struct pe_session *ft_session,
-				   struct roam_offload_synch_ind *roam_synch)
-{
-}
-#endif
 
 /**
  * sir_parse_bcn_fixed_fields() - Parse fixed fields in Beacon IE's

core/mac/src/pe/lim/lim_assoc_utils.c

@@ -2433,10 +2433,8 @@ lim_add_sta(struct mac_context *mac_ctx,
 		pe_debug("uAPSD = 0x%x, maxSpLen = %d",
 			add_sta_params->uAPSD, add_sta_params->maxSPLen);
 	}
-#ifdef WLAN_FEATURE_11W
 	add_sta_params->rmfEnabled = sta_ds->rmfEnabled;
 	pe_debug("PMF enabled %d", add_sta_params->rmfEnabled);
-#endif
 
 	pe_debug("htLdpcCapable: %d vhtLdpcCapable: %d "
 			"p2pCapableSta: %d",
@@ -2967,14 +2965,12 @@ lim_delete_dph_hash_entry(struct mac_context *mac_ctx, tSirMacAddr sta_addr,
 
 		lim_obss_send_detection_cfg(mac_ctx, session_entry, false);
 
-#ifdef WLAN_FEATURE_11W
 		if (sta_ds->rmfEnabled) {
 			pe_debug("delete pmf timer assoc-id:%d sta mac "
 				 QDF_MAC_ADDR_FMT, sta_ds->assocId,
 				 QDF_MAC_ADDR_REF(sta_ds->staAddr));
 			tx_timer_delete(&sta_ds->pmfSaQueryTimer);
 		}
-#endif
 	}
 
 	if (dph_delete_hash_entry(mac_ctx, sta_addr, sta_id,
@@ -3767,12 +3763,10 @@ QDF_STATUS lim_sta_send_add_bss(struct mac_context *mac, tpSirAssocRsp pAssocRsp
 	if (QDF_P2P_CLIENT_MODE == pe_session->opmode)
 		pAddBssParams->staContext.p2pCapableSta = 1;
 
-#ifdef WLAN_FEATURE_11W
 	if (pe_session->limRmfEnabled) {
 		pAddBssParams->rmfEnabled = 1;
 		pAddBssParams->staContext.rmfEnabled = 1;
 	}
-#endif
 
 	/* Set a new state for MLME */
 	if (eLIM_MLM_WT_ASSOC_RSP_STATE == pe_session->limMlmState)
@@ -4079,12 +4073,10 @@ QDF_STATUS lim_sta_send_add_bss_pre_assoc(struct mac_context *mac,
 	pAddBssParams->staContext.smesessionId = pe_session->smeSessionId;
 	pAddBssParams->staContext.sessionId = pe_session->peSessionId;
 
-#ifdef WLAN_FEATURE_11W
 	if (pe_session->limRmfEnabled) {
 		pAddBssParams->rmfEnabled = 1;
 		pAddBssParams->staContext.rmfEnabled = 1;
 	}
-#endif
 	/* Set a new state for MLME */
 	pe_session->limMlmState = eLIM_MLM_WT_ADD_BSS_RSP_PREASSOC_STATE;
 
@@ -4342,7 +4334,6 @@ void lim_fill_rx_highest_supported_rate(struct mac_context *mac,
 	return;
 }
 
-#ifdef WLAN_FEATURE_11W
 /** -------------------------------------------------------------
    \fn     lim_send_sme_unprotected_mgmt_frame_ind
    \brief  Forwards the unprotected management frame to SME.
@@ -4381,7 +4372,6 @@ void lim_send_sme_unprotected_mgmt_frame_ind(struct mac_context *mac, uint8_t fr
 	lim_sys_process_mmh_msg_api(mac, &mmhMsg);
 	return;
 }
-#endif
 
 #ifdef FEATURE_WLAN_ESE
 void lim_send_sme_tsm_ie_ind(struct mac_context *mac,

core/mac/src/pe/lim/lim_assoc_utils.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -318,13 +318,10 @@ QDF_STATUS lim_is_dot11h_power_capabilities_in_range(struct mac_context *mac,
 void lim_fill_rx_highest_supported_rate(struct mac_context *mac,
 					uint16_t *rxHighestRate,
 					uint8_t *pSupportedMCSSet);
-#ifdef WLAN_FEATURE_11W
 void lim_send_sme_unprotected_mgmt_frame_ind(struct mac_context *mac, uint8_t frameType,
 					     uint8_t *frame, uint32_t frameLen,
 					     uint16_t sessionId,
 					     struct pe_session *pe_session);
-#endif
-
 /**
  * lim_send_sme_tsm_ie_ind() - Send TSM IE information to SME
  * @mac: Global MAC context

core/mac/src/pe/lim/lim_ft.c

@@ -161,9 +161,8 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		(uint8_t) pBeaconStruct->capabilityInfo.shortSlotTime;
 	pAddBssParams->llbCoexist =
 		(uint8_t) ft_session->beaconParams.llbCoexist;
-#ifdef WLAN_FEATURE_11W
 	pAddBssParams->rmfEnabled = ft_session->limRmfEnabled;
-#endif
+
 	/* Use the advertised capabilities from the received beacon/PR */
 	if (IS_DOT11_MODE_HT(ft_session->dot11mode) &&
 	    (pBeaconStruct->HTCaps.present)) {
@@ -239,10 +238,8 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 		pAddBssParams->staContext.updateSta = false;
 		pAddBssParams->staContext.encryptType =
 			ft_session->encryptType;
-#ifdef WLAN_FEATURE_11W
 		pAddBssParams->staContext.rmfEnabled =
 			ft_session->limRmfEnabled;
-#endif
 
 		if (IS_DOT11_MODE_HT(ft_session->dot11mode) &&
 		    (pBeaconStruct->HTCaps.present)) {
@@ -330,12 +327,10 @@ void lim_ft_prepare_add_bss_req(struct mac_context *mac,
 
 	pAddBssParams->maxTxPower = ft_session->maxTxPower;
 
-#ifdef WLAN_FEATURE_11W
 	if (ft_session->limRmfEnabled) {
 		pAddBssParams->rmfEnabled = 1;
 		pAddBssParams->staContext.rmfEnabled = 1;
 	}
-#endif
 	pAddBssParams->staContext.sessionId = ft_session->peSessionId;
 	pAddBssParams->staContext.smesessionId = ft_session->smeSessionId;
 
@@ -751,9 +746,8 @@ void lim_fill_ft_session(struct mac_context *mac,
 				ft_session->limSmeState));
 	}
 	ft_session->encryptType = pe_session->encryptType;
-#ifdef WLAN_FEATURE_11W
 	ft_session->limRmfEnabled = pe_session->limRmfEnabled;
-#endif
+
 	if ((ft_session->limRFBand == REG_BAND_2G) &&
 		(ft_session->htSupportedChannelWidthSet ==
 		eHT_CHANNEL_WIDTH_40MHZ))

core/mac/src/pe/lim/lim_process_action_frame.c

@@ -1230,7 +1230,6 @@ __lim_process_neighbor_report(struct mac_context *mac, uint8_t *pRxPacketInfo,
 }
 
 
-#ifdef WLAN_FEATURE_11W
 /**
  * limProcessSAQueryRequestActionFrame
  *
@@ -1390,9 +1389,7 @@ static void __lim_process_sa_query_response_action_frame(struct mac_context *mac
 			break;
 		}
 }
-#endif
 
-#ifdef WLAN_FEATURE_11W
 /**
  * lim_drop_unprotected_action_frame
  *
@@ -1435,7 +1432,6 @@ lim_drop_unprotected_action_frame(struct mac_context *mac, struct pe_session *pe
 
 	return false;
 }
-#endif
 
 /**
  * lim_process_addba_req() - process ADDBA Request
@@ -1612,9 +1608,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 {
 	uint8_t *body_ptr = WMA_GET_RX_MPDU_DATA(rx_pkt_info);
 	tpSirMacActionFrameHdr action_hdr = (tpSirMacActionFrameHdr) body_ptr;
-#ifdef WLAN_FEATURE_11W
 	tpSirMacMgmtHdr mac_hdr_11w = WMA_GET_RX_MAC_HEADER(rx_pkt_info);
-#endif
 	tpSirMacMgmtHdr mac_hdr = NULL;
 	int8_t rssi;
 	uint32_t frame_len = WMA_GET_RX_PAYLOAD_LEN(rx_pkt_info);
@@ -1629,12 +1623,10 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		return;
 	}
 
-#ifdef WLAN_FEATURE_11W
 	if (lim_is_robust_mgmt_action_frame(action_hdr->category) &&
 	   lim_drop_unprotected_action_frame(mac_ctx, session,
 			mac_hdr_11w, action_hdr->category))
 		return;
-#endif
 
 	switch (action_hdr->category) {
 	case ACTION_CATEGORY_QOS:
@@ -1932,7 +1924,6 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 		}
 		break;
 
-#ifdef WLAN_FEATURE_11W
 	case ACTION_CATEGORY_SA_QUERY:
 		pe_debug("SA Query Action category: %d action: %d",
 			action_hdr->category, action_hdr->actionID);
@@ -1955,7 +1946,7 @@ void lim_process_action_frame(struct mac_context *mac_ctx,
 			break;
 		}
 		break;
-#endif
+
 	case ACTION_CATEGORY_VHT:
 		if (!session->vhtCapability)
 			break;

core/mac/src/pe/lim/lim_process_assoc_req_frame.c

@@ -158,10 +158,8 @@ static QDF_STATUS lim_check_sta_in_pe_entries(struct mac_context *mac_ctx,
 			sta_ds = dph_lookup_hash_entry(mac_ctx, hdr->sa,
 					&assoc_id, &session->dph.dphHashTable);
 			if (sta_ds
-#ifdef WLAN_FEATURE_11W
 				&& (!sta_ds->rmfEnabled ||
 				    (sessionid != session->peSessionId))
-#endif
 			    ) {
 				if (sta_ds->mlmStaContext.mlmState ==
 				    eLIM_MLM_WT_DEL_STA_RSP_STATE ||
@@ -928,7 +926,7 @@ static enum wlan_status_code lim_check_wpa_ie(struct pe_session *session,
   *
   * Return: wlan_status_code
   */
-#if defined(WLAN_FEATURE_SAE) && defined(WLAN_FEATURE_11W)
+#if defined(WLAN_FEATURE_SAE)
 static enum wlan_status_code lim_check_sae_pmf_cap(struct pe_session *session,
 						  tDot11fIERSN *rsn,
 						  enum ani_akm_type akm_type)
@@ -1231,7 +1229,6 @@ static inline void
 lim_update_assoc_drop_count(struct mac_context *mac_ctx, uint8_t sub_type) {}
 #endif
 
-#ifdef WLAN_FEATURE_11W
 static inline void
 lim_delete_pmf_query_timer(tpDphHashNode sta_ds)
 {
@@ -1242,10 +1239,6 @@ lim_delete_pmf_query_timer(tpDphHashNode sta_ds)
 		tx_timer_deactivate(&sta_ds->pmfSaQueryTimer);
 	tx_timer_delete(&sta_ds->pmfSaQueryTimer);
 }
-#else
-static inline void
-lim_delete_pmf_query_timer(tpDphHashNode sta_ds) {}
-#endif
 
 /**
  * lim_process_assoc_req_sta_ctx() - process assoc req for sta context present
@@ -1287,7 +1280,6 @@ static bool lim_process_assoc_req_sta_ctx(struct mac_context *mac_ctx,
 
 	/* STA sent assoc req frame while already in 'associated' state */
 
-#ifdef WLAN_FEATURE_11W
 	pe_debug("Re/Assoc request from station that is already associated");
 	pe_debug("PMF enabled: %d, SA Query state: %d",
 		sta_ds->rmfEnabled, sta_ds->pmfSaQueryState);
@@ -1341,7 +1333,6 @@ static bool lim_process_assoc_req_sta_ctx(struct mac_context *mac_ctx,
 			break;
 		}
 	}
-#endif
 
 	/* no change in the capability so drop the frame */
 	if ((sub_type == LIM_ASSOC) &&
@@ -1506,10 +1497,8 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 {
 	tHalBitVal wme_mode, wsm_mode;
 	uint8_t *ht_cap_ie = NULL;
-#ifdef WLAN_FEATURE_11W
 	tPmfSaQueryTimerId timer_id;
 	uint16_t retry_interval;
-#endif
 	tDot11fIEVHTCaps *vht_caps;
 	tpSirAssocReq tmp_assoc_req;
 
@@ -1814,7 +1803,6 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 	/* Re/Assoc Response frame to requesting STA */
 	sta_ds->mlmStaContext.subType = sub_type;
 
-#ifdef WLAN_FEATURE_11W
 	sta_ds->rmfEnabled = (pmf_connection) ? 1 : 0;
 	sta_ds->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS;
 	timer_id.fields.sessionId = session->peSessionId;
@@ -1843,7 +1831,6 @@ static bool lim_update_sta_ds(struct mac_context *mac_ctx, tpSirMacMgmtHdr hdr,
 		pe_debug("Created pmf timer assoc-id:%d sta mac" QDF_MAC_ADDR_FMT,
 			 sta_ds->assocId, QDF_MAC_ADDR_REF(sta_ds->staAddr));
 	}
-#endif
 
 	if (assoc_req->ExtCap.present) {
 		lim_set_stads_rtt_cap(sta_ds,

core/mac/src/pe/lim/lim_process_assoc_rsp_frame.c

@@ -276,10 +276,8 @@ void lim_update_assoc_sta_datas(struct mac_context *mac_ctx,
 		sta_ds->qosMode = 1;
 		sta_ds->wmeEnabled = 1;
 	}
-#ifdef WLAN_FEATURE_11W
 	if (session_entry->limRmfEnabled)
 		sta_ds->rmfEnabled = 1;
-#endif
 }
 
 /**
@@ -540,8 +538,6 @@ static inline void lim_process_he_info(tpSirProbeRespBeacon beacon,
 }
 #endif
 
-#ifdef WLAN_FEATURE_11W
-
 #define MAX_RETRY_TIMER 1500
 static QDF_STATUS
 lim_handle_pmfcomeback_timer(struct pe_session *session_entry,
@@ -594,14 +590,6 @@ lim_handle_pmfcomeback_timer(struct pe_session *session_entry,
 
 	return QDF_STATUS_SUCCESS;
 }
-#else
-static QDF_STATUS
-lim_handle_pmfcomeback_timer(struct pe_session *session_entry,
-			     tpSirAssocRsp assoc_rsp)
-{
-	return QDF_STATUS_E_FAILURE;
-}
-#endif
 
 static void clean_up_ft_sha384(tpSirAssocRsp assoc_rsp, bool sha384_akm)
 {

core/mac/src/pe/lim/lim_process_auth_frame.c

@@ -532,11 +532,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 		 * SA-Query procedure determines that the original SA is
 		 * invalid.
 		 */
-		if (is_connected
-#ifdef WLAN_FEATURE_11W
-			&& !sta_ds_ptr->rmfEnabled
-#endif
-		   ) {
+		if (is_connected && !sta_ds_ptr->rmfEnabled) {
 			pe_err("STA is already connected but received auth frame"
 			       "Send the Deauth and lim Delete Station Context"
 			       "(associd: %d) sta mac" QDF_MAC_ADDR_FMT,
@@ -597,11 +593,7 @@ static void lim_process_auth_frame_type1(struct mac_context *mac_ctx,
 			sta_ds_ptr = NULL;
 		}
 
-		if (sta_ds_ptr
-#ifdef WLAN_FEATURE_11W
-			&& !sta_ds_ptr->rmfEnabled
-#endif
-		   ) {
+		if (sta_ds_ptr && !sta_ds_ptr->rmfEnabled) {
 			pe_debug("lim Del Sta Ctx associd: %d sta mac"
 				 QDF_MAC_ADDR_FMT, associd,
 				 QDF_MAC_ADDR_REF(sta_ds_ptr->staAddr));

core/mac/src/pe/lim/lim_process_deauth_frame.c

@@ -66,22 +66,18 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 	tpSirMacMgmtHdr pHdr;
 	struct pe_session *pRoamSessionEntry = NULL;
 	uint8_t roamSessionId;
-#ifdef WLAN_FEATURE_11W
 	uint32_t frameLen;
-#endif
 	int32_t frame_rssi;
 
 	pHdr = WMA_GET_RX_MAC_HEADER(pRxPacketInfo);
 
 	pBody = WMA_GET_RX_MPDU_DATA(pRxPacketInfo);
 	frame_rssi = (int32_t)WMA_GET_RX_RSSI_NORMALIZED(pRxPacketInfo);
-#ifdef WLAN_FEATURE_11W
 	frameLen = WMA_GET_RX_PAYLOAD_LEN(pRxPacketInfo);
 	if (frameLen < sizeof(reasonCode)) {
 		pe_err("Deauth Frame length invalid %d", frameLen);
 		return ;
 	}
-#endif
 
 	if (LIM_IS_STA_ROLE(pe_session) &&
 	    ((eLIM_SME_WT_DISASSOC_STATE == pe_session->limSmeState) ||
@@ -117,7 +113,6 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 		pe_err("rx frame doesn't have valid a1 address, drop it");
 		return;
 	}
-#ifdef WLAN_FEATURE_11W
 	/* PMF: If this session is a PMF session, then ensure that this frame was protected */
 	if (pe_session->limRmfEnabled &&
 	    pe_session->is_key_installed &&
@@ -145,7 +140,6 @@ lim_process_deauth_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 							pe_session);
 		return;
 	}
-#endif
 
 	/* Get reasonCode from Deauthentication frame body */
 	reasonCode = sir_read_u16(pBody);

core/mac/src/pe/lim/lim_process_disassoc_frame.c

@@ -111,7 +111,6 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 		}
 		return;
 	}
-#ifdef WLAN_FEATURE_11W
 	/* PMF: If this session is a PMF session, then ensure that this frame was protected */
 	if (pe_session->limRmfEnabled
 	    && (WMA_GET_RX_DPU_FEEDBACK(pRxPacketInfo) &
@@ -137,7 +136,6 @@ lim_process_disassoc_frame(struct mac_context *mac, uint8_t *pRxPacketInfo,
 							pe_session);
 		return;
 	}
-#endif
 
 	if (frame_len < 2) {
 		pe_err("frame len less than 2");

core/mac/src/pe/lim/lim_process_mlm_req_messages.c

@@ -202,18 +202,11 @@ void lim_process_mlm_req_messages(struct mac_context *mac_ctx,
 	} /* switch (msg->type) */
 }
 
-#ifdef WLAN_FEATURE_11W
 static void update_rmfEnabled(struct bss_params *addbss_param,
 			      struct pe_session *session)
 {
 	addbss_param->rmfEnabled = session->limRmfEnabled;
 }
-#else
-static void update_rmfEnabled(struct bss_params *addbss_param,
-			      struct pe_session *session)
-{
-}
-#endif
 
 /**
  * lim_mlm_add_bss() - HAL interface for WMA_ADD_BSS_REQ
@@ -850,7 +843,6 @@ end:
 			     (uint32_t *) &mlm_auth_cnf);
 }
 
-#ifdef WLAN_FEATURE_11W
 static void lim_store_pmfcomeback_timerinfo(struct pe_session *session_entry)
 {
 	if (session_entry->opmode != QDF_STA_MODE ||
@@ -865,11 +857,6 @@ static void lim_store_pmfcomeback_timerinfo(struct pe_session *session_entry)
 	session_entry->pmf_retry_timer_info.lim_mlm_state =
 		session_entry->limMlmState;
 }
-#else
-static void lim_store_pmfcomeback_timerinfo(struct pe_session *session_entry)
-{
-}
-#endif /* WLAN_FEATURE_11W */
 
 /**
  * lim_process_mlm_assoc_req() - This function is called to process

core/mac/src/pe/lim/lim_process_mlm_rsp_messages.c

@@ -421,7 +421,6 @@ static void lim_send_mlm_assoc_req(struct mac_context *mac_ctx,
 		(uint32_t *) assoc_req);
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * lim_pmf_comeback_timer_callback() -PMF callback handler
  * @context: Timer context
@@ -451,7 +450,6 @@ void lim_pmf_comeback_timer_callback(void *context)
 	session->limMlmState = info->lim_mlm_state;
 	lim_send_mlm_assoc_req(mac_ctx, session);
 }
-#endif /* WLAN_FEATURE_11W */
 
 /**
  * lim_process_mlm_auth_cnf()-Process Auth confirmation
@@ -1564,14 +1562,12 @@ void lim_process_mlm_del_bss_rsp(struct mac_context *mac,
 	}
 	lim_process_sta_mlm_del_bss_rsp(mac, vdev_stop_rsp, pe_session);
 
-#ifdef WLAN_FEATURE_11W
 	if (pe_session->limRmfEnabled) {
 		if (QDF_STATUS_SUCCESS !=
 		    lim_send_exclude_unencrypt_ind(mac, true, pe_session)) {
 			pe_err("Could not send down Exclude Unencrypted Indication!");
 		}
 	}
-#endif
 }
 
 void lim_process_sta_mlm_del_bss_rsp(struct mac_context *mac,
@@ -2343,7 +2339,6 @@ void lim_handle_add_bss_rsp(struct mac_context *mac_ctx,
 		}
 	}
 
-#ifdef WLAN_FEATURE_11W
 	if (session_entry->limRmfEnabled) {
 		if (QDF_STATUS_SUCCESS !=
 			lim_send_exclude_unencrypt_ind(mac_ctx, false,
@@ -2351,7 +2346,6 @@ void lim_handle_add_bss_rsp(struct mac_context *mac_ctx,
 			pe_err("Failed to send Exclude Unencrypted Ind");
 		}
 	}
-#endif
 err:
 	qdf_mem_free(add_bss_rsp);
 }

core/mac/src/pe/lim/lim_process_sme_req_messages.c

@@ -812,10 +812,8 @@ __lim_handle_sme_start_bss_request(struct mac_context *mac_ctx, uint32_t *msg_bu
 
 		session->txLdpcIniFeatureEnabled =
 			sme_start_bss_req->txLdpcIniFeatureEnabled;
-#ifdef WLAN_FEATURE_11W
 		session->limRmfEnabled = sme_start_bss_req->pmfCapable ? 1 : 0;
 		pe_debug("RMF enabled: %d", session->limRmfEnabled);
-#endif
 
 		qdf_mem_copy((void *)&session->rateSet,
 			     (void *)&sme_start_bss_req->operationalRateSet,
@@ -1280,7 +1278,6 @@ static QDF_STATUS lim_send_ft_reassoc_req(struct pe_session *session,
 					     reassoc_req);
 }
 
-#ifdef WLAN_FEATURE_11W
 bool
 lim_get_vdev_rmf_capable(struct mac_context *mac, struct pe_session *session)
 {
@@ -1317,7 +1314,6 @@ lim_get_vdev_rmf_capable(struct mac_context *mac, struct pe_session *session)
 
 	return peer_rmf_capable;
 }
-#endif
 
 static bool lim_is_fast_roam_enabled(struct mac_context *mac_ctx,
 				     struct wlan_objmgr_vdev *vdev)

core/mac/src/pe/lim/lim_send_frames_host_roam.c

@@ -34,9 +34,7 @@
 #include "lim_send_messages.h"
 #include "lim_assoc_utils.h"
 #include "lim_ft.h"
-#ifdef WLAN_FEATURE_11W
 #include "wni_cfg.h"
-#endif
 
 #include "lim_ft_defs.h"
 #include "lim_session.h"

core/mac/src/pe/lim/lim_send_management_frames.c

@@ -37,9 +37,7 @@
 #include "lim_send_messages.h"
 #include "lim_assoc_utils.h"
 #include "lim_ft.h"
-#ifdef WLAN_FEATURE_11W
 #include "wni_cfg.h"
-#endif
 
 #include "lim_ft_defs.h"
 #include "lim_session.h"
@@ -1399,10 +1397,8 @@ lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx,
 	uint16_t stripoff_len = 0;
 	tDot11fIEExtCap extracted_ext_cap;
 	bool extracted_flag = false;
-#ifdef WLAN_FEATURE_11W
 	uint8_t retry_int;
 	uint16_t max_retries;
-#endif
 
 	if (!pe_session) {
 		pe_err("pe_session is NULL");
@@ -1556,7 +1552,6 @@ lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx,
 			populate_dot11f_he_6ghz_cap(mac_ctx, pe_session,
 						    &frm.he_6ghz_band_cap);
 		}
-#ifdef WLAN_FEATURE_11W
 		if (status_code == STATUS_ASSOC_REJECTED_TEMPORARILY) {
 			max_retries =
 			mac_ctx->mlme_cfg->gen.pmf_sa_query_max_retries;
@@ -1569,7 +1564,6 @@ lim_send_assoc_rsp_mgmt_frame(struct mac_context *mac_ctx,
 						sta->pmfSaQueryRetryCount)
 						* retry_int);
 		}
-#endif
 
 		if (LIM_IS_AP_ROLE(pe_session)  && sta->non_ecsa_capable)
 			pe_session->lim_non_ecsa_cap_num++;
@@ -4996,7 +4990,6 @@ returnAfterError:
 	return status_code;
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * \brief Send SA query request action frame to peer
  *
@@ -5309,7 +5302,6 @@ returnAfterError:
 	cds_packet_free((void *)pPacket);
 	return nSirStatus;
 } /* End lim_send_sa_query_response_frame */
-#endif
 
 #if defined(QCA_WIFI_QCA6290) || defined(QCA_WIFI_QCA6390) || \
     defined(QCA_WIFI_QCA6490) || defined(QCA_WIFI_QCA6750)

core/mac/src/pe/lim/lim_send_messages.c

@@ -413,7 +413,6 @@ QDF_STATUS lim_set_user_pos(struct mac_context *mac,
 	return retCode;
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * lim_send_exclude_unencrypt_ind() - sends WMA_EXCLUDE_UNENCRYPTED_IND to HAL
  * @mac:          mac global context
@@ -457,7 +456,6 @@ QDF_STATUS lim_send_exclude_unencrypt_ind(struct mac_context *mac,
 
 	return retCode;
 }
-#endif
 
 /**
  * lim_send_ht40_obss_scanind() - send ht40 obss start scan request

core/mac/src/pe/lim/lim_send_messages.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2019, 2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -105,11 +105,9 @@ void lim_set_active_edca_params(struct mac_context *mac_ctx,
 #define DS_PARAM_CHANNEL_MASK   0x0
 #define VHTOP_CHWIDTH_MASK      0xFC
 
-#ifdef WLAN_FEATURE_11W
 QDF_STATUS lim_send_exclude_unencrypt_ind(struct mac_context *mac,
 					     bool excludeUnenc,
 					     struct pe_session *pe_session);
-#endif
 QDF_STATUS lim_send_ht40_obss_scanind(struct mac_context *mac_ctx,
 						struct pe_session *session);
 void lim_handle_sme_join_result(struct mac_context *,

core/mac/src/pe/lim/lim_session.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -269,7 +269,6 @@ restart_timer:
 	}
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * pe_init_pmf_comeback_timer: init PMF comeback timer
  * @mac_ctx: pointer to global adapter context
@@ -296,13 +295,6 @@ pe_init_pmf_comeback_timer(tpAniSirGlobal mac_ctx, struct pe_session *session)
 	if (!QDF_IS_STATUS_SUCCESS(status))
 		pe_err("cannot init pmf comeback timer");
 }
-#else
-static inline void
-pe_init_pmf_comeback_timer(tpAniSirGlobal mac_ctx, struct pe_session *session,
-			   uint8_t vdev_id)
-{
-}
-#endif
 
 #ifdef WLAN_FEATURE_FILS_SK
 /**
@@ -811,7 +803,6 @@ struct pe_session *pe_find_session_by_session_id(struct mac_context *mac,
 	return NULL;
 }
 
-#ifdef WLAN_FEATURE_11W
 static void lim_clear_pmfcomeback_timer(struct pe_session *session)
 {
 	if (session->opmode != QDF_STA_MODE)
@@ -824,11 +815,6 @@ static void lim_clear_pmfcomeback_timer(struct pe_session *session)
 	qdf_mc_timer_destroy(&session->pmf_retry_timer);
 	session->pmf_retry_timer_info.retried = false;
 }
-#else
-static void lim_clear_pmfcomeback_timer(struct pe_session *session)
-{
-}
-#endif
 
 /**
  * pe_delete_session() - deletes the PE session given the session ID.

core/mac/src/pe/lim/lim_types.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2021 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -967,7 +967,6 @@ QDF_STATUS lim_sta_reassoc_error_handler(struct reassoc_params *param)
 }
 #endif
 
-#ifdef WLAN_FEATURE_11W
 /* 11w send SA query request action frame */
 QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *transId,
 					      tSirMacAddr peer,
@@ -976,8 +975,6 @@ QDF_STATUS lim_send_sa_query_request_frame(struct mac_context *mac, uint8_t *tra
 QDF_STATUS lim_send_sa_query_response_frame(struct mac_context *mac,
 					       uint8_t *transId, tSirMacAddr peer,
 					       struct pe_session *pe_session);
-#endif
-
 /* Inline functions */
 
 /**

core/mac/src/pe/lim/lim_utils.c

@@ -57,9 +57,7 @@
 #endif
 #include "wlan_utility.h"
 
-#ifdef WLAN_FEATURE_11W
 #include "wni_cfg.h"
-#endif
 #include "cfg_mlme_obss_ht40.h"
 #include "cfg_ucfg_api.h"
 #include "lim_ft.h"
@@ -4835,7 +4833,6 @@ bool lim_isconnected_on_dfs_freq(struct mac_context *mac_ctx,
 	}
 }
 
-#ifdef WLAN_FEATURE_11W
 void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param)
 {
 	struct mac_context *mac = (struct mac_context *) pMacGlobal;
@@ -4890,7 +4887,6 @@ void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param)
 		pSta->pmfSaQueryState = DPH_SA_QUERY_NOT_IN_PROGRESS;
 	}
 }
-#endif
 
 bool lim_check_vht_op_mode_change(struct mac_context *mac,
 				  struct pe_session *pe_session,
@@ -5004,7 +5000,6 @@ void lim_get_short_slot_from_phy_mode(struct mac_context *mac, struct pe_session
 	*pShortSlotEnabled = val;
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  *
  * \brief This function is called by various LIM modules to correctly set
@@ -5048,7 +5043,6 @@ lim_set_protected_bit(struct mac_context *mac,
 			 sta->rmfEnabled, sta->is_key_installed);
 	}
 } /*** end lim_set_protected_bit() ***/
-#endif
 
 void lim_set_ht_caps(struct mac_context *p_mac, struct pe_session *p_session_entry,
 		uint8_t *p_ie_start, uint32_t num_bytes)
@@ -5780,7 +5774,6 @@ QDF_STATUS lim_strip_ie(struct mac_context *mac_ctx,
 			     oui, oui_length, extracted_ie, eid_max_len);
 }
 
-#ifdef WLAN_FEATURE_11W
 void lim_del_pmf_sa_query_timer(struct mac_context *mac_ctx, struct pe_session *pe_session)
 {
 	uint32_t associated_sta;
@@ -5808,7 +5801,6 @@ void lim_del_pmf_sa_query_timer(struct mac_context *mac_ctx, struct pe_session *
 		tx_timer_delete(&sta_ds->pmfSaQueryTimer);
 	}
 }
-#endif
 
 QDF_STATUS lim_strip_supp_op_class_update_struct(struct mac_context *mac_ctx,
 		uint8_t *addn_ie, uint16_t *addn_ielen,

core/mac/src/pe/lim/lim_utils.h

@@ -99,7 +99,6 @@
 #define MAX_WAIT_FOR_BCN_TX_COMPLETE 4000
 #define MAX_WAKELOCK_FOR_CSA         5000
 
-#ifdef WLAN_FEATURE_11W
 typedef union uPmfSaQueryTimerId {
 	struct {
 		uint8_t sessionId;
@@ -107,7 +106,6 @@ typedef union uPmfSaQueryTimerId {
 	} fields;
 	uint32_t value;
 } tPmfSaQueryTimerId, *tpPmfSaQueryTimerId;
-#endif
 
 typedef struct last_processed_frame {
 	tSirMacAddr sa;
@@ -853,17 +851,11 @@ void lim_clean_up_disassoc_deauth_req(struct mac_context *mac, uint8_t *staMac,
 bool lim_check_disassoc_deauth_ack_pending(struct mac_context *mac,
 		uint8_t *staMac);
 
-#ifdef WLAN_FEATURE_11W
 void lim_pmf_sa_query_timer_handler(void *pMacGlobal, uint32_t param);
 void lim_pmf_comeback_timer_callback(void *context);
 void lim_set_protected_bit(struct mac_context *mac,
 	struct pe_session *pe_session,
 	tSirMacAddr peer, tpSirMacMgmtHdr pMacHdr);
-#else
-static inline void lim_set_protected_bit(struct mac_context *mac,
-	struct pe_session *pe_session,
-	tSirMacAddr peer, tpSirMacMgmtHdr pMacHdr) {}
-#endif /* WLAN_FEATURE_11W */
 
 void lim_set_ht_caps(struct mac_context *p_mac,
 		struct pe_session *p_session_ntry,
@@ -936,7 +928,6 @@ void lim_merge_extcap_struct(tDot11fIEExtCap *dst, tDot11fIEExtCap *src,
 void lim_strip_he_ies_from_add_ies(struct mac_context *mac_ctx,
 				   struct pe_session *session);
 
-#ifdef WLAN_FEATURE_11W
 /**
  * lim_del_pmf_sa_query_timer() - This function deletes SA query timer
  * @mac_ctx: pointer to mac context
@@ -960,28 +951,6 @@ void lim_del_pmf_sa_query_timer(struct mac_context *mac_ctx, struct pe_session *
  */
 bool lim_get_vdev_rmf_capable(struct mac_context *mac,
 			      struct pe_session *session);
-#else
-/**
- * lim_del_pmf_sa_query_timer() - This function deletes SA query timer
- * @mac_ctx: pointer to mac context
- * @pe_session: pointer to PE session
- *
- * This API is to delete the PMF SA query timer created for each associated STA
- *
- * Return: none
- */
-static inline void
-lim_del_pmf_sa_query_timer(struct mac_context *mac_ctx, struct pe_session *pe_session)
-{
-}
-
-static inline
-bool lim_get_vdev_rmf_capable(struct mac_context *mac,
-			      struct pe_session *session)
-{
-	return false;
-}
-#endif
 
 /**
  * lim_add_bssid_to_reject_list:- Add rssi reject Ap info to blacklist mgr.

core/mac/src/sys/legacy/src/utils/src/mac_trace.c

@@ -302,9 +302,7 @@ uint8_t *mac_trace_get_sme_msg_string(uint16_t sme_msg)
 		CASE_RETURN_STRING(eWNI_SME_TDLS_SHOULD_TEARDOWN);
 		CASE_RETURN_STRING(eWNI_SME_TDLS_PEER_DISCONNECTED);
 #endif
-#ifdef WLAN_FEATURE_11W
 		CASE_RETURN_STRING(eWNI_SME_UNPROT_MGMT_FRM_IND);
-#endif
 #ifndef FEATURE_CM_ENABLE
 		CASE_RETURN_STRING(eWNI_SME_CANDIDATE_FOUND_IND);
 		CASE_RETURN_STRING(eWNI_SME_HANDOFF_REQ);
@@ -536,9 +534,7 @@ uint8_t *mac_trace_get_wma_msg_string(uint16_t wma_msg)
 		CASE_RETURN_STRING(SIR_HAL_PDEV_DUAL_MAC_CFG_REQ);
 		CASE_RETURN_STRING(WMA_RADAR_DETECTED_IND);
 		CASE_RETURN_STRING(WMA_TIMER_TRAFFIC_STATS_IND);
-#ifdef WLAN_FEATURE_11W
 		CASE_RETURN_STRING(WMA_EXCLUDE_UNENCRYPTED_IND);
-#endif
 		CASE_RETURN_STRING(WMA_SET_MAX_TX_POWER_RSP);
 		CASE_RETURN_STRING(WMA_SET_DTIM_PERIOD);
 		CASE_RETURN_STRING(WMA_SET_MAX_TX_POWER_PER_BAND_REQ);

core/mac/src/sys/legacy/src/utils/src/parser_api.c

@@ -3438,7 +3438,7 @@ sir_convert_assoc_resp_frame2_struct(struct mac_context *mac,
 
 	pAssocRsp->status_code = ar->Status.status;
 	pAssocRsp->aid = ar->AID.associd;
-#ifdef WLAN_FEATURE_11W
+
 	if (ar->TimeoutInterval.present) {
 		pAssocRsp->TimeoutInterval.present = 1;
 		pAssocRsp->TimeoutInterval.timeoutType =
@@ -3446,7 +3446,6 @@ sir_convert_assoc_resp_frame2_struct(struct mac_context *mac,
 		pAssocRsp->TimeoutInterval.timeoutValue =
 			ar->TimeoutInterval.timeoutValue;
 	}
-#endif
 
 	if (!ar->SuppRates.present) {
 		pAssocRsp->suppRatesPresent = 0;

core/sap/inc/sap_api.h

@@ -501,10 +501,8 @@ struct sap_config {
 	uint32_t beacon_int;            /* Beacon Interval */
 	enum QDF_OPMODE persona; /* Tells us which persona, GO or AP */
 	bool enOverLapCh;
-#ifdef WLAN_FEATURE_11W
 	bool mfpRequired;
 	bool mfpCapable;
-#endif
 #ifdef FEATURE_WLAN_MCC_TO_SCC_SWITCH
 	uint8_t cc_switch_mode;
 #endif

core/sap/src/sap_fsm.c

@@ -2975,11 +2975,9 @@ sapconvert_to_csr_profile(struct sap_config *config, eCsrRoamBssType bssType,
 	/* wps config info */
 	profile->wps_state = config->wps_state;
 
-#ifdef WLAN_FEATURE_11W
 	/* MFP capable/required */
 	profile->MFPCapable = config->mfpCapable ? 1 : 0;
 	profile->MFPRequired = config->mfpRequired ? 1 : 0;
-#endif
 
 	if (config->probeRespIEsBufferLen > 0 &&
 	    config->pProbeRespIEsBuffer) {

core/sme/inc/csr_api.h

@@ -314,9 +314,7 @@ typedef enum {
 	/* Stopbss triggered from SME due to different */
 	eCSR_ROAM_SEND_P2P_STOP_BSS = 32,
 	/* beacon interval */
-#ifdef WLAN_FEATURE_11W
 	eCSR_ROAM_UNPROT_MGMT_FRAME_IND = 33,
-#endif
 
 #ifdef FEATURE_WLAN_ESE
 	eCSR_ROAM_TSM_IE_IND = 34,
@@ -602,12 +600,10 @@ struct csr_roam_profile {
 	tCsrEncryptionList mcEncryptionType;
 	/* This field is for output only, not for input */
 	eCsrEncryptionType negotiatedMCEncryptionType;
-#ifdef WLAN_FEATURE_11W
 	/* Management Frame Protection */
 	bool MFPEnabled;
 	uint8_t MFPRequired;
 	uint8_t MFPCapable;
-#endif
 	tCsrKeys Keys;
 	tCsrChannelInfo ChannelInfo;
 	uint32_t op_freq;

core/sme/inc/csr_internal.h

@@ -229,10 +229,8 @@ struct csr_roamstart_bssparams {
 	uint8_t *pRSNIE;        /* If not null, it has IE byte stream for RSN */
 	/* Flag used to indicate update beaconInterval */
 	bool updatebeaconInterval;
-#ifdef WLAN_FEATURE_11W
 	bool mfpCapable;
 	bool mfpRequired;
-#endif
 	struct add_ie_params add_ie_params;
 	uint8_t sap_dot11mc;
 	uint16_t beacon_tx_rate;

core/sme/src/common/sme_api.c

@@ -1325,8 +1325,6 @@ static QDF_STATUS dfs_msg_processor(struct mac_context *mac,
 	return status;
 }
 
-
-#ifdef WLAN_FEATURE_11W
 /*
  * Handle the unprotected management frame indication from LIM and
  * forward it to HDD.
@@ -1355,7 +1353,6 @@ sme_unprotected_mgmt_frm_ind(struct mac_context *mac,
 
 	return status;
 }
-#endif
 
 QDF_STATUS sme_update_new_channel_event(mac_handle_t mac_handle,
 					uint8_t session_id)
@@ -2276,7 +2273,6 @@ QDF_STATUS sme_process_msg(struct mac_context *mac, struct scheduler_msg *pMsg)
 			sme_err("Empty message for: %d", pMsg->type);
 		}
 		break;
-#ifdef WLAN_FEATURE_11W
 	case eWNI_SME_UNPROT_MGMT_FRM_IND:
 		if (pMsg->bodyptr) {
 			sme_unprotected_mgmt_frm_ind(mac, pMsg->bodyptr);
@@ -2285,7 +2281,6 @@ QDF_STATUS sme_process_msg(struct mac_context *mac, struct scheduler_msg *pMsg)
 			sme_err("Empty message for: %d", pMsg->type);
 		}
 		break;
-#endif
 #ifdef FEATURE_WLAN_ESE
 	case eWNI_SME_TSM_IE_IND:
 		if (pMsg->bodyptr) {

core/sme/src/csr/csr_api_roam.c

@@ -6130,11 +6130,9 @@ QDF_STATUS csr_roam_copy_profile(struct mac_context *mac,
 	pDstProfile->negotiatedMCEncryptionType =
 		pSrcProfile->negotiatedMCEncryptionType;
 	pDstProfile->negotiatedAuthType = pSrcProfile->negotiatedAuthType;
-#ifdef WLAN_FEATURE_11W
 	pDstProfile->MFPEnabled = pSrcProfile->MFPEnabled;
 	pDstProfile->MFPRequired = pSrcProfile->MFPRequired;
 	pDstProfile->MFPCapable = pSrcProfile->MFPCapable;
-#endif
 	pDstProfile->BSSType = pSrcProfile->BSSType;
 	pDstProfile->phyMode = pSrcProfile->phyMode;
 	pDstProfile->csrPersona = pSrcProfile->csrPersona;
@@ -6171,11 +6169,9 @@ QDF_STATUS csr_roam_copy_profile(struct mac_context *mac,
 	pDstProfile->ieee80211d = pSrcProfile->ieee80211d;
 	qdf_mem_copy(&pDstProfile->Keys, &pSrcProfile->Keys,
 		sizeof(pDstProfile->Keys));
-#ifdef WLAN_FEATURE_11W
 	pDstProfile->MFPEnabled = pSrcProfile->MFPEnabled;
 	pDstProfile->MFPRequired = pSrcProfile->MFPRequired;
 	pDstProfile->MFPCapable = pSrcProfile->MFPCapable;
-#endif
 	pDstProfile->mdid = pSrcProfile->mdid;
 	pDstProfile->add_ie_params = pSrcProfile->add_ie_params;
 
@@ -11833,10 +11829,8 @@ QDF_STATUS csr_roam_issue_start_bss(struct mac_context *mac, uint32_t sessionId,
 						   &band);
 	pParam->bssPersona = pProfile->csrPersona;
 
-#ifdef WLAN_FEATURE_11W
 	pParam->mfpCapable = (0 != pProfile->MFPCapable);
 	pParam->mfpRequired = (0 != pProfile->MFPRequired);
-#endif
 
 	pParam->add_ie_params.probeRespDataLen =
 		pProfile->add_ie_params.probeRespDataLen;
@@ -13627,10 +13621,8 @@ QDF_STATUS csr_send_mb_start_bss_req_msg(struct mac_context *mac, uint32_t
 	pMsg->bssPersona = pParam->bssPersona;
 	pMsg->txLdpcIniFeatureEnabled = mac->mlme_cfg->ht_caps.tx_ldpc_enable;
 
-#ifdef WLAN_FEATURE_11W
 	pMsg->pmfCapable = pParam->mfpCapable;
 	pMsg->pmfRequired = pParam->mfpRequired;
-#endif
 
 	if (pParam->nRSNIELength > sizeof(pMsg->rsnIE.rsnIEdata)) {
 		qdf_mem_free(pMsg);

core/sme/src/csr/csr_util.c

@@ -196,9 +196,7 @@ const char *get_e_roam_cmd_status_str(eRoamCmdStatus val)
 #endif
 		CASE_RETURN_STR(eCSR_ROAM_DISCONNECT_ALL_P2P_CLIENTS);
 		CASE_RETURN_STR(eCSR_ROAM_SEND_P2P_STOP_BSS);
-#ifdef WLAN_FEATURE_11W
 		CASE_RETURN_STR(eCSR_ROAM_UNPROT_MGMT_FRAME_IND);
-#endif
 #ifdef FEATURE_WLAN_ESE
 		CASE_RETURN_STR(eCSR_ROAM_TSM_IE_IND);
 #ifndef FEATURE_CM_ENABLE
@@ -1945,10 +1943,8 @@ bool csr_is_profile_rsn(struct csr_roam_profile *pProfile)
 #ifdef FEATURE_WLAN_ESE
 	case eCSR_AUTH_TYPE_CCKM_RSN:
 #endif
-#ifdef WLAN_FEATURE_11W
 	case eCSR_AUTH_TYPE_RSN_PSK_SHA256:
 	case eCSR_AUTH_TYPE_RSN_8021X_SHA256:
-#endif
 	/* fallthrough */
 	case eCSR_AUTH_TYPE_FILS_SHA256:
 	case eCSR_AUTH_TYPE_FILS_SHA384:
@@ -2486,7 +2482,6 @@ tAniEdType csr_translate_encrypt_type_to_ed_type(eCsrEncryptionType EncryptType)
 		edType = eSIR_ED_WPI;
 		break;
 #endif
-#ifdef WLAN_FEATURE_11W
 	/* 11w BIP */
 	case eCSR_ENCRYPT_TYPE_AES_CMAC:
 		edType = eSIR_ED_AES_128_CMAC;
@@ -2503,7 +2498,6 @@ tAniEdType csr_translate_encrypt_type_to_ed_type(eCsrEncryptionType EncryptType)
 	case eCSR_ENCRYPT_TYPE_AES_GMAC_256:
 		edType = eSIR_ED_AES_GMAC_256;
 		break;
-#endif
 	}
 
 	return edType;

core/wma/inc/wma_types.h

@@ -154,9 +154,7 @@ enum wmamsgtype {
 	WMA_TIMER_TRAFFIC_ACTIVITY_REQ = SIR_HAL_TIMER_TRAFFIC_ACTIVITY_REQ,
 	WMA_TIMER_ADC_RSSI_STATS = SIR_HAL_TIMER_ADC_RSSI_STATS,
 	WMA_TIMER_TRAFFIC_STATS_IND = SIR_HAL_TRAFFIC_STATS_IND,
-#ifdef WLAN_FEATURE_11W
 	WMA_EXCLUDE_UNENCRYPTED_IND = SIR_HAL_EXCLUDE_UNENCRYPTED_IND,
-#endif
 
 #ifdef FEATURE_WLAN_ESE
 	WMA_TSM_STATS_REQ = SIR_HAL_TSM_STATS_REQ,

core/wma/src/wma_data.c

@@ -2246,11 +2246,9 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 	uint8_t use_6mbps = 0;
 	uint8_t downld_comp_required = 0;
 	uint16_t chanfreq;
-#ifdef WLAN_FEATURE_11W
 	uint8_t *pFrame = NULL;
 	void *pPacket = NULL;
 	uint16_t newFrmLen = 0;
-#endif /* WLAN_FEATURE_11W */
 	struct wma_txrx_node *iface;
 	struct mac_context *mac;
 	tpSirMacMgmtHdr mHdr;
@@ -2300,7 +2298,6 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 		return QDF_STATUS_E_FAILURE;
 	}
 
-#ifdef WLAN_FEATURE_11W
 	if ((iface && (iface->rmfEnabled || tx_flag & HAL_USE_PMF)) &&
 	    (frmType == TXRX_FRM_802_11_MGMT) &&
 	    (pFc->subType == SIR_MAC_MGMT_DISASSOC ||
@@ -2433,7 +2430,6 @@ QDF_STATUS wma_tx_packet(void *wma_context, void *tx_frame, uint16_t frmLen,
 		 */
 		QDF_NBUF_CB_TX_DMA_BI_MAP((qdf_nbuf_t)tx_frame) = 1;
 	}
-#endif /* WLAN_FEATURE_11W */
 	mHdr = (tpSirMacMgmtHdr)qdf_nbuf_data(tx_frame);
 	if ((frmType == TXRX_FRM_802_11_MGMT) &&
 	    (pFc->subType == SIR_MAC_MGMT_PROBE_RSP)) {

core/wma/src/wma_dev_if.c

@@ -3510,7 +3510,6 @@ wma_vdev_set_bss_params(tp_wma_handle wma, int vdev_id,
 
 }
 
-#ifdef WLAN_FEATURE_11W
 static void wma_set_mgmt_frame_protection(tp_wma_handle wma)
 {
 	struct pdev_params param = {0};
@@ -3560,18 +3559,6 @@ wma_set_peer_pmf_status(tp_wma_handle wma, uint8_t *peer_mac,
 
 	return QDF_STATUS_SUCCESS;
 }
-#else
-static inline void wma_set_mgmt_frame_protection(tp_wma_handle wma)
-{
-}
-
-static QDF_STATUS
-wma_set_peer_pmf_status(tp_wma_handle wma, uint8_t *peer_mac,
-			bool is_pmf_enabled)
-{
-	return QDF_STATUS_SUCCESS;
-}
-#endif /* WLAN_FEATURE_11W */
 
 QDF_STATUS wma_pre_vdev_start_setup(uint8_t vdev_id,
 				    struct bss_params *add_bss)

core/wma/src/wma_mgmt.c

@@ -2908,8 +2908,6 @@ QDF_STATUS wma_set_htconfig(uint8_t vdev_id, uint16_t ht_capab, int value)
 	return ret;
 }
 
-#ifdef WLAN_FEATURE_11W
-
 /**
  * wma_extract_ccmp_pn() - extract 6 byte PN from the CCMP header
  * @ccmp_ptr: CCMP header
@@ -2998,7 +2996,6 @@ wma_is_ccmp_pn_replay_attack(tp_wma_handle wma, struct ieee80211_frame *wh,
 	return ret;
 }
 
-#ifdef WLAN_FEATURE_11W
 /**
  * wma_process_bip() - process mmie in rmf frame
  * @wma_handle: wma handle
@@ -3077,7 +3074,6 @@ int wma_process_bip(tp_wma_handle wma_handle, struct wma_txrx_node *iface,
 
 	return 0;
 }
-#endif
 
 /**
  * wma_process_rmf_frame() - process rmf frame
@@ -3281,17 +3277,6 @@ wma_check_and_process_rmf_frame(tp_wma_handle wma_handle,
 
 	return 0;
 }
-#else
-static inline int
-wma_check_and_process_rmf_frame(tp_wma_handle wma_handle,
-				uint8_t vdev_id,
-				struct ieee80211_frame **wh,
-				cds_pkt_t *rx_pkt,
-				qdf_nbuf_t buf)
-{
-	return 0;
-}
-#endif
 
 /**
  * wma_is_pkt_drop_candidate() - check if the mgmt frame should be droppped