qcacld-3.0: North bound I/F for phase3 convergence

The init version code change per north bound I/F
framewrok. Each individual component is supposed
to define its cfg80211 callback function and it
will do the code change accordingly.

Change-Id: Ib66085b7de91fb478d74cfa716ac50f6fead34a6
CRs-Fixed: 1098688

core/hdd/src/wlan_hdd_cfg80211.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -78,6 +78,9 @@
 #include "csr_api.h"
 #include "pld_common.h"
 
+#ifdef WLAN_UMAC_CONVERGENCE
+#include "wlan_cfg80211.h"
+#endif
 
 #ifdef FEATURE_WLAN_EXTSCAN
 #include "wlan_hdd_ext_scan.h"
@@ -1100,6 +1103,9 @@ static const struct nl80211_vendor_cmd_info wlan_hdd_cfg80211_vendor_events[] =
 		.vendor_id = QCA_NL80211_VENDOR_ID,
 		.subcmd = QCA_NL80211_VENDOR_SUBCMD_SAP_CONDITIONAL_CHAN_SWITCH
 	},
+#ifdef WLAN_UMAC_CONVERGENCE
+	COMMON_VENDOR_EVENTS
+#endif
 };
 
 /**
@@ -8279,6 +8285,7 @@ const struct wiphy_vendor_command hdd_wiphy_vendor_commands[] = {
 			 WIPHY_VENDOR_CMD_NEED_NETDEV,
 		.doit = wlan_hdd_cfg80211_get_wifi_info
 	},
+#ifndef WLAN_UMAC_CONVERGENCE
 	{
 		.info.vendor_id = QCA_NL80211_VENDOR_ID,
 		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_SET_WIFI_CONFIGURATION,
@@ -8287,6 +8294,7 @@ const struct wiphy_vendor_command hdd_wiphy_vendor_commands[] = {
 			WIPHY_VENDOR_CMD_NEED_RUNNING,
 		.doit = wlan_hdd_cfg80211_wifi_configuration_set
 	},
+#endif
 	{
 		.info.vendor_id = QCA_NL80211_VENDOR_ID,
 		.info.subcmd = QCA_NL80211_VENDOR_SUBCMD_ROAM,
@@ -8640,6 +8648,9 @@ const struct wiphy_vendor_command hdd_wiphy_vendor_commands[] = {
 		.doit = wlan_hdd_cfg80211_configure_tdls_mode
 	}
 #endif
+#ifdef WLAN_UMAC_CONVERGENCE
+	COMMON_VENDOR_COMMANDS
+#endif
 };
 
 /**

core/hdd/src/wlan_hdd_scan.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2017 The Linux Foundation. All rights reserved.
  *
  * Previously licensed under the ISC license by Qualcomm Atheros, Inc.
  *
@@ -50,6 +50,10 @@
 #include "wma_api.h"
 #include "cds_utils.h"
 
+#ifdef WLAN_UMAC_CONVERGENCE
+#include "wlan_cfg80211.h"
+#endif
+
 #define MAX_RATES                       12
 #define HDD_WAKE_LOCK_SCAN_DURATION (5 * 1000) /* in msec */
 
@@ -1470,6 +1474,14 @@ static int wlan_hdd_update_scan_ies(hdd_adapter_t *adapter,
  *
  * Return: 0 for success, non zero for failure
  */
+#ifdef WLAN_UMAC_CONVERGENCE
+static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
+				    struct cfg80211_scan_request *request,
+				    uint8_t source)
+{
+	return wlan_cfg80211_scan(wiphy, request);
+}
+#else
 static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 				    struct cfg80211_scan_request *request,
 				    uint8_t source)
@@ -1863,6 +1875,7 @@ free_mem:
 	EXIT();
 	return status;
 }
+#endif
 
 /**
  * wlan_hdd_cfg80211_scan() - API to process cfg80211 scan request