qcacld-3.0: Finish removing WLAN_FEATURE_NAN_CONVERGENCE

Changes I0045dcccd36524cbcd4253347c9e0a5704193c2b ("qcacmn: Combine
all NAN related flags with WLAN_FEATURE_NAN") and
If98ecaace17f8724e9c28325ef61e721f42e1d8f ("qcacld-3.0: Combine all
NAN related flags with WLAN_FEATURE_NAN") removed all usage of
WLAN_FEATURE_NAN_CONVERGENCE, but did not remove it from Kconfig or
from all defconfigs, so do that now.

Change-Id: Ib19f30d2be5c2ddaad13a2526442d3d7266e4754
CRs-Fixed: 3487376

Kconfig

@@ -123,10 +123,6 @@ config WLAN_FEATURE_FILS
 	bool "Enable FILS feature"
 	default n
 
-config NAN_CONVERGENCE
-	bool "Enable NAN_CONVERGENCE feature"
-	default n
-
 config WLAN_OBJMGR_DEBUG
 	bool "Enable WLAN Obj Mgr Debug services"
 	default n

configs/qca6174_defconfig

@@ -170,7 +170,6 @@ CONFIG_QCACLD_FEATURE_NAN := n
 ifneq ($(CONFIG_MOBILE_ROUTER), y)
 	#Flag to enable NAN Data path
 	CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-	CONFIG_NAN_CONVERGENCE := y
 endif
 
 #Flag to enable Linux QCMBR feature as default feature

configs/qca6390_defconfig

@@ -203,7 +203,6 @@ endif
 ifneq ($(CONFIG_MOBILE_ROUTER), y)
 	#Flag to enable NAN Data path
 	CONFIG_WLAN_FEATURE_NAN_DATAPATH := y
-	CONFIG_NAN_CONVERGENCE := y
 endif
 
 #Flag to enable Linux QCMBR feature as default feature

configs/qcs40x.snoc.perf_defconfig

@@ -9,7 +9,6 @@ CONFIG_QCOM_LTE_COEX := n
 CONFIG_WLAN_FEATURE_LPSS := n
 CONFIG_QCACLD_FEATURE_NAN := n
 CONFIG_WLAN_FEATURE_NAN_DATAPATH := n
-CONFIG_NAN_CONVERGENCE := n
 CONFIG_POWER_MANAGEMENT_OFFLOAD := y
 CONFIG_LFR_SUBNET_DETECTION := y
 CONFIG_MCC_TO_SCC_SWITCH := y