qcacld-3.0: Compile out legacy NDP code

Compile out legacy code when NAN_CONVERGENCE is enabled.

Change-Id: I47ac6842ad6b195e623d9de95702e6089031335d
CRs-Fixed: 2014795

core/hdd/inc/wlan_hdd_main.h

@@ -672,7 +672,7 @@ struct hdd_station_ctx {
 	uint8_t broadcast_staid;
 
 	struct hdd_mon_set_ch_info ch_info;
-#ifdef WLAN_FEATURE_NAN_DATAPATH
+#if defined(WLAN_FEATURE_NAN_DATAPATH) && !defined(WLAN_FEATURE_NAN_CONVERGENCE)
 	struct nan_datapath_ctx ndp_ctx;
 #endif
 };
@@ -1173,8 +1173,10 @@ struct hdd_adapter_s {
 #endif
 
 #ifdef WLAN_FEATURE_NAN_DATAPATH
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 #define WLAN_HDD_GET_NDP_CTX_PTR(adapter) \
 		(&(adapter)->sessionCtx.station.ndp_ctx)
+#endif /* WLAN_FEATURE_NAN_CONVERGENCE */
 #define WLAN_HDD_IS_NDP_ENABLED(hdd_ctx) ((hdd_ctx)->nan_datapath_enabled)
 #else
 /* WLAN_HDD_GET_NDP_CTX_PTR and WLAN_HDD_GET_NDP_WEXT_STATE_PTR are not defined

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -36,6 +36,7 @@
 #include "wlan_hdd_object_manager.h"
 #include <qca_vendor.h>
 
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 /* NLA policy */
 static const struct nla_policy
 qca_wlan_vendor_ndp_policy[QCA_WLAN_VENDOR_ATTR_NDP_PARAMS_MAX + 1] = {
@@ -69,6 +70,7 @@ qca_wlan_vendor_ndp_policy[QCA_WLAN_VENDOR_ATTR_NDP_PARAMS_MAX + 1] = {
 					NLA_U32 },
 	[QCA_WLAN_VENDOR_ATTR_NDP_DRV_RETURN_VALUE] = { .type = NLA_U32 },
 };
+#endif
 
 /**
  * hdd_ndp_print_ini_config()- Print nan datapath specific INI configuration
@@ -272,7 +274,7 @@ static int hdd_ndi_start_bss(hdd_adapter_t *adapter,
 	return ret;
 }
 
-
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 /**
  * hdd_ndi_create_req_handler() - NDI create request handler
  * @hdd_ctx: hdd context
@@ -1812,6 +1814,13 @@ void hdd_ndp_event_handler(hdd_adapter_t *adapter,
 		}
 	}
 }
+#else
+void hdd_ndp_event_handler(hdd_adapter_t *adapter,
+	tCsrRoamInfo *roam_info, uint32_t roam_id, eRoamCmdStatus roam_status,
+	eCsrRoamResult roam_result)
+{
+}
+#endif
 
 /**
  * __wlan_hdd_cfg80211_process_ndp_cmds() - handle NDP request

core/hdd/src/wlan_hdd_nan_datapath.h

@@ -37,12 +37,6 @@ struct wireless_dev;
 #define NAN_SOCIAL_CHANNEL_5GHZ_LOWER_BAND 44
 #define NAN_SOCIAL_CHANNEL_5GHZ_UPPER_BAND 149
 
-#define NDP_APP_INFO_LEN 255
-#define NDP_QOS_INFO_LEN 255
-#define NDP_PMK_LEN 32
-#define NDP_SCID_BUF_LEN 256
-#define NDP_NUM_INSTANCE_ID 255
-
 #define NDP_BROADCAST_STAID           (0)
 
 #ifdef WLAN_FEATURE_NAN_DATAPATH
@@ -56,6 +50,14 @@ struct wireless_dev;
 #define WLAN_HDD_IS_NDI_CONNECTED(adapter) (false)
 #endif /* WLAN_FEATURE_NAN_DATAPATH */
 
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
+
+#define NDP_QOS_INFO_LEN 255
+#define NDP_APP_INFO_LEN 255
+#define NDP_PMK_LEN 32
+#define NDP_SCID_BUF_LEN 256
+#define NDP_NUM_INSTANCE_ID 255
+
 /**
  * enum qca_wlan_vendor_attr_ndp_params - vendor attribute parameters
  * @QCA_WLAN_VENDOR_ATTR_NDP_SUBCMD: NDP Sub command
@@ -204,6 +206,7 @@ struct nan_datapath_ctx {
 	uint32_t ndi_delete_rsp_reason;
 	uint32_t ndi_delete_rsp_status;
 };
+#endif
 
 #ifdef WLAN_FEATURE_NAN_DATAPATH
 void hdd_ndp_print_ini_config(struct hdd_context_s *hdd_ctx);

core/mac/src/pe/nan/nan_datapath.c

@@ -32,6 +32,7 @@
 #include "lim_send_messages.h"
 #include "wma_nan_datapath.h"
 
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 /**
  * lim_send_ndp_event_to_sme() - generic function to prepare and send NDP
  * message to SME.
@@ -61,6 +62,7 @@ static void lim_send_ndp_event_to_sme(tpAniSirGlobal mac_ctx, uint32_t msg_type,
 	}
 	lim_sys_process_mmh_msg_api(mac_ctx, &mmh_msg, ePROT);
 }
+#endif
 
 /**
  * lim_add_ndi_peer() - Function to add ndi peer
@@ -117,6 +119,7 @@ static QDF_STATUS lim_add_ndi_peer(tpAniSirGlobal mac_ctx,
 	return QDF_STATUS_SUCCESS;
 }
 
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 /**
  * lim_handle_ndp_indication_event() - Function to handle SIR_HAL_NDP_INDICATION
  * event from WMA
@@ -215,6 +218,7 @@ responder_rsp:
 				bodyval ? 0 : sizeof(*rsp_ind), bodyval);
 	return ret_val;
 }
+#endif
 
 /**
  * lim_ndp_delete_peer_by_addr() - Delete NAN data peer, given addr and vdev_id
@@ -346,6 +350,7 @@ static void lim_ndp_delete_peers(tpAniSirGlobal mac_ctx,
 	qdf_mem_free(deleted_peers);
 }
 
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 /**
  * lim_ndp_end_indication_handler() - Handler for NDP end indication
  * @mac_ctx: handle to mac context
@@ -380,6 +385,7 @@ static QDF_STATUS lim_ndp_end_indication_handler(tpAniSirGlobal mac_ctx,
 
 	return QDF_STATUS_SUCCESS;
 }
+#endif
 
 /**
  * lim_process_ndi_del_sta_rsp() - Handle WDA_DELETE_STA_RSP in eLIM_NDI_ROLE
@@ -454,6 +460,7 @@ skip_event:
 	lim_msg->bodyptr = NULL;
 }
 
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 /**
  * lim_handle_ndp_event_message() - Handler for NDP events/RSP from WMA
  * @mac_ctx: handle to mac structure
@@ -706,6 +713,7 @@ QDF_STATUS lim_handle_ndp_request_message(tpAniSirGlobal mac_ctx,
 	}
 	return status;
 }
+#endif
 
 /**
  * lim_process_ndi_mlm_add_bss_rsp() - Process ADD_BSS response for NDI

core/sme/inc/csr_api.h

@@ -1425,7 +1425,7 @@ typedef struct tagCsrRoamInfo {
 	tSirSmeChanInfo chan_info;
 	uint8_t target_channel;
 
-#ifdef WLAN_FEATURE_NAN_DATAPATH
+#if defined(WLAN_FEATURE_NAN_DATAPATH) && !defined(WLAN_FEATURE_NAN_CONVERGENCE)
 	union {
 		struct sme_ndp_peer_ind ndp_peer_ind_params;
 		struct ndp_schedule_update_rsp ndp_sched_upd_rsp_params;

core/sme/inc/sme_inside.h

@@ -188,7 +188,7 @@ typedef struct tagSmeCmd {
 		struct s_nss_update_cmd nss_update_cmd;
 		struct sir_dual_mac_config set_dual_mac_cmd;
 		struct sir_antenna_mode_param set_antenna_mode_cmd;
-#ifdef WLAN_FEATURE_NAN_DATAPATH
+#if defined(WLAN_FEATURE_NAN_DATAPATH) && !defined(WLAN_FEATURE_NAN_CONVERGENCE)
 		struct ndp_initiator_req initiator_req;
 		struct ndp_responder_req responder_req;
 		struct ndp_end_req *data_end_req;

core/sme/src/nan/nan_datapath_api.c

@@ -29,6 +29,7 @@
 #include "csr_internal.h"
 #include "sme_nan_datapath.h"
 
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 /**
  * csr_free_ndp_initiator_req() - free resouces from sme command for ndp
  * initiator request
@@ -821,3 +822,4 @@ void csr_release_ndp_data_end_req(tpAniSirGlobal mac_ctx, tSmeCmd *cmd)
 	qdf_mem_free(cmd->u.data_end_req);
 	cmd->u.data_end_req = NULL;
 }
+#endif /* WLAN_FEATURE_NAN_CONVERGENCE */

core/wma/src/wma_nan_datapath.c

@@ -35,6 +35,8 @@
 #include "cdp_txrx_tx_delay.h"
 #include "cdp_txrx_misc.h"
 #include <cdp_txrx_handle.h>
+
+#ifndef WLAN_FEATURE_NAN_CONVERGENCE
 /**
  * wma_handle_ndp_initiator_req() - NDP initiator request handler
  * @wma_handle: wma handle
@@ -1200,4 +1202,4 @@ send_del_rsp:
 		wma_send_msg(wma, WMA_DELETE_STA_RSP, del_sta, 0);
 	}
 }
-
+#endif /* WLAN_FEATURE_NAN_CONVERGENCE */

core/wma/src/wma_nan_datapath.h

@@ -31,7 +31,7 @@
 #include "sir_api.h"
 #include "sme_nan_datapath.h"
 
-#ifdef WLAN_FEATURE_NAN_DATAPATH
+#if defined(WLAN_FEATURE_NAN_DATAPATH) && !defined(WLAN_FEATURE_NAN_CONVERGENCE)
 #define WMA_IS_VDEV_IN_NDI_MODE(intf, vdev_id) \
 				(WMI_VDEV_TYPE_NDI == intf[vdev_id].type)
 /**