qcacld-3.0: Add conditional QCA6390_HEADERS_DEF flag

Add a conditional compilation QCA6390_HEADERS_DEF flag to compile
htt_rx_restitch_mpdu_from_msdus.

Change-Id: I6b526f2dd5d56338e520ec138512b7cf2d849d0c
CRs-Fixed: 2275699

core/cds/src/cds_api.c

@@ -614,10 +614,14 @@ QDF_STATUS cds_open(struct wlan_objmgr_psoc *psoc)
 		goto err_wma_close;
 	}
 
-	cds_debug("target_type %d 8074:%d 6290:%d", hdd_ctx->target_type,
-		  TARGET_TYPE_QCA8074, TARGET_TYPE_QCA6290);
-
-	if (TARGET_TYPE_QCA6290 == hdd_ctx->target_type)
+	cds_debug("target_type %d 8074:%d 6290:%d 6390: %d",
+		  hdd_ctx->target_type,
+		  TARGET_TYPE_QCA8074,
+		  TARGET_TYPE_QCA6290,
+		  TARGET_TYPE_QCA6390);
+
+	if (TARGET_TYPE_QCA6290 == hdd_ctx->target_type ||
+	    TARGET_TYPE_QCA6390 == hdd_ctx->target_type)
 		gp_cds_context->dp_soc = cdp_soc_attach(LITHIUM_DP,
 			gp_cds_context->hif_context, psoc,
 			gp_cds_context->htc_ctx, gp_cds_context->qdf_ctx,

core/dp/htt/htt_monitor_rx.c

@@ -731,7 +731,8 @@ next_pop:
 }
 #endif /* CONFIG_HL_SUPPORT */
 
-#if !defined(QCA6290_HEADERS_DEF)
+#if defined(FEATURE_MONITOR_MODE_SUPPORT)
+#if !defined(QCA6290_HEADERS_DEF) && !defined(QCA6390_HEADERS_DEF)
 static void
 htt_rx_parse_ppdu_start_status(struct htt_host_rx_desc_base *rx_desc,
 			       struct ieee80211_rx_status *rs)
@@ -1083,3 +1084,4 @@ mpdu_stitch_fail:
 	return NULL;
 }
 #endif
+#endif

core/dp/ol/inc/ol_htt_rx_api.h

@@ -832,7 +832,8 @@ int htt_rx_msdu_buff_in_order_replenish(htt_pdev_handle pdev, uint32_t num)
  *      list, else operates on a cloned nbuf
  * @return network buffer handle to the MPDU
  */
-#if !defined(QCA6290_HEADERS_DEF) && defined(FEATURE_MONITOR_MODE_SUPPORT)
+#if defined(FEATURE_MONITOR_MODE_SUPPORT)
+#if !defined(QCA6290_HEADERS_DEF) && !defined(QCA6390_HEADERS_DEF)
 qdf_nbuf_t
 htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev,
 				qdf_nbuf_t head_msdu,
@@ -848,7 +849,7 @@ htt_rx_restitch_mpdu_from_msdus(htt_pdev_handle pdev,
 	return NULL;
 }
 #endif
-
+#endif
 /**
  * @brief Return the sequence number of MPDUs to flush.
  * @param pdev - the HTT instance the rx data was received on