qcacld-3.0: Add NAN datapath enabled flag to HDD context

qcacld-2.0 to qcacld-3.0 propagation

Add nan_datapath_enabled flag in HDD context to represent current
disable/enable state of NAN datapath feature.
Do not modify the .ini configured value because getConfig command
will show incorrect results.

Change-Id: Ib0b44168aca24802d8bd86b0665a1060ba3a1bf5
CRs-Fixed: 962367

core/hdd/inc/wlan_hdd_main.h

@@ -1082,9 +1082,11 @@ struct hdd_adapter_s {
 #define WLAN_HDD_GET_NDP_CTX_PTR(adapter) (&(adapter)->sessionCtx.ndp_ctx)
 #define WLAN_HDD_GET_NDP_WEXT_STATE_PTR(adapter) \
 		(&(adapter)->sessionCtx.ndp_ctx.wext_state)
+#define WLAN_HDD_IS_NDP_ENABLED(hdd_ctx) ((hdd_ctx)->nan_datapath_enabled)
 #else
 #define WLAN_HDD_GET_NDP_CTX_PTR(adapter) (NULL)
 #define WLAN_HDD_GET_NDP_WEXT_STATE_PTR(adapter) (NULL)
+#define WLAN_HDD_IS_NDP_ENABLED(hdd_ctx) (false)
 #endif
 
 /* Set mac address locally administered bit */
@@ -1431,6 +1433,9 @@ struct hdd_context_s {
 	/* the radio index assigned by cnss_logger */
 	int radio_index;
 	bool hbw_requested;
+#ifdef WLAN_FEATURE_NAN_DATAPATH
+	bool nan_datapath_enabled;
+#endif
 };
 
 /*---------------------------------------------------------------------------

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -86,9 +86,10 @@ void hdd_ndp_print_ini_config(hdd_context_t *hdd_ctx)
 void hdd_nan_datapath_target_config(hdd_context_t *hdd_ctx,
 					struct wma_tgt_cfg *cfg)
 {
-	hdd_ctx->config->enable_nan_datapath &= cfg->nan_datapath_enabled;
-	hddLog(LOG1, FL("enable_nan_datapath: %d"),
-		hdd_ctx->config->enable_nan_datapath);
+	hdd_ctx->nan_datapath_enabled =
+		hdd_ctx->config->enable_nan_datapath &&
+			cfg->nan_datapath_enabled;
+	hdd_info(FL("enable_nan_datapath: %d"), hdd_ctx->nan_datapath_enabled);
 }
 
 /**
@@ -849,8 +850,8 @@ static int __wlan_hdd_cfg80211_process_ndp_cmd(struct wiphy *wiphy,
 		hdd_err(FL("Command not allowed in FTM mode"));
 		return -EPERM;
 	}
-	if (!hdd_ctx->config->enable_nan_datapath) {
-		hdd_err(FL("NAN datapath is not suported"));
+	if (!WLAN_HDD_IS_NDP_ENABLED(hdd_ctx)) {
+		hdd_err(FL("NAN datapath is not enabled"));
 		return -EPERM;
 	}
 	if (nla_parse(tb, QCA_WLAN_VENDOR_ATTR_NDP_PARAMS_MAX,