qcacld-3.0: Set 5GHz channel for NDI start and remove the INI

NDI Create from upper layers also does a start bss with the
channel specified with INI "gnan_datapath_ndi_channel". It
defaults to channel 6 if no value is specified. For targets
with 2x2 DBS MAC Configuration this cannot happen without
a DBS mode change. Since this channel is not indicative of
the actual NDI channel, send a 5GHz NAN Social channel for
the BSS start to avoid the DBS mode change.

Send 5GHz NAN Social channel for NDI bss start and remove
the corresponding INI.

Change-Id: I40428f5eb4071f7c1d3934c6279316aad8082c03
CRs-Fixed: 2364619

nan/dispatcher/inc/cfg_nan.h

@@ -72,31 +72,6 @@
 					     0, \
 					     "Enable NAN Datapath support")
 
-/*
- * <ini>
- * gnan_datapath_ndi_channel - Default channel for NAN Datapath
- * @Min: 6
- * @Max: 149
- * @Default: 6
- *
- * Host suggests this channel for NAN datapath. But FW is free to
- * choose other channels based on system constraints.
- *
- * Related: genable_nan_datapath
- *
- * Supported Feature: NAN
- *
- * Usage: External
- *
- * </ini>
- */
-/*
- * NAN channel on which NAN data interface to start
- */
-#define CFG_NAN_NDI_CHANNEL CFG_INI_UINT("gnan_datapath_ndi_channel", \
-					 6, 149, 6, \
-					 CFG_VALUE_OR_DEFAULT, \
-					 "NAN Datapath Channel")
 /*
  * <ini>
  * gEnableNDIMacRandomization - When enabled this will randomize NDI Mac
@@ -126,7 +101,6 @@
 
 #ifdef WLAN_FEATURE_NAN_DATAPATH
 #define CFG_NAN_DP      CFG(CFG_NAN_DATAPATH_ENABLE) \
-			CFG(CFG_NAN_NDI_CHANNEL) \
 			CFG(CFG_NAN_RANDOMIZE_NDI_MAC)
 #else
 #define CFG_NAN_DP