qcacld-3.0: Move connect/disconnect code to new files

Currently connect and disconnect apis for connection manager
are present on the cfg80211 file, move connect and disconnect
related code to new files.

Change-Id: I514bbfdd66ab8ae5410fdbf9796e298c04130873
CRs-Fixed: 2812112

Kbuild

@@ -423,6 +423,11 @@ ifeq ($(CONFIG_WLAN_ENABLE_GPIO_WAKEUP),y)
 HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_gpio_wakeup.o
 endif
 
+ifeq ($(CONFIG_CM_ENABLE), y)
+HDD_OBJS += $(HDD_SRC_DIR)/wlan_hdd_cm_connect.o \
+	    $(HDD_SRC_DIR)/wlan_hdd_cm_disconnect.o
+endif
+
 ###### OSIF_SYNC ########
 SYNC_DIR := os_if/sync
 SYNC_INC_DIR := $(SYNC_DIR)/inc

core/hdd/inc/wlan_hdd_main.h

@@ -156,6 +156,12 @@ struct hdd_apf_context {
 #define NUM_TX_QUEUES 4
 #endif
 
+/*
+ * Number of DPTRACE records to dump when a cfg80211 disconnect with reason
+ * WLAN_REASON_DEAUTH_LEAVING DEAUTH is received from user-space.
+ */
+#define WLAN_DEAUTH_DPTRACE_DUMP_COUNT 100
+
 /* HDD_IS_RATE_LIMIT_REQ: Macro helper to implement rate limiting
  * @flag: The flag to determine if limiting is required or not
  * @rate: The number of seconds within which if multiple commands come, the

core/hdd/src/wlan_hdd_cfg80211.c

@@ -215,11 +215,7 @@
 
 #define IS_DFS_MODE_VALID(mode) ((mode >= DFS_MODE_NONE && \
 			mode <= DFS_MODE_DEPRIORITIZE))
-/*
- * Number of DPTRACE records to dump when a cfg80211 disconnect with reason
- * WLAN_REASON_DEAUTH_LEAVING DEAUTH is received from user-space.
- */
-#define WLAN_DEAUTH_DPTRACE_DUMP_COUNT 100
+
 #ifndef WLAN_CIPHER_SUITE_GCMP
 #define WLAN_CIPHER_SUITE_GCMP 0x000FAC08
 #endif
@@ -20794,112 +20790,6 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
 	return status;
 }
 
-#ifdef FEATURE_CM_ENABLE
-static void hdd_update_scan_ie_for_connect(struct hdd_adapter *adapter,
-					   struct osif_connect_params *params)
-{
-	if (adapter->device_mode == QDF_P2P_CLIENT_MODE) {
-		params->scan_ie.ptr =
-			&adapter->scan_info.scan_add_ie.addIEdata[0];
-		params->scan_ie.len = adapter->scan_info.scan_add_ie.length;
-	} else if (adapter->scan_info.default_scan_ies) {
-		params->scan_ie.ptr = adapter->scan_info.default_scan_ies;
-		params->scan_ie.len = adapter->scan_info.default_scan_ies_len;
-	} else if (adapter->scan_info.scan_add_ie.length) {
-		params->scan_ie.ptr = adapter->scan_info.scan_add_ie.addIEdata;
-		params->scan_ie.len = adapter->scan_info.scan_add_ie.length;
-	}
-}
-
-/**
- * hdd_get_dot11mode_filter() - Get dot11 mode filter
- * @hdd_ctx: HDD context
- *
- * This function is used to get the dot11 mode filter
- *
- * Context: Any Context.
- * Return: dot11_mode_filter
- */
-static enum dot11_mode_filter
-hdd_get_dot11mode_filter(struct hdd_context *hdd_ctx)
-{
-	struct hdd_config *config = hdd_ctx->config;
-
-	if (config->dot11Mode == eHDD_DOT11_MODE_11n_ONLY)
-		return ALLOW_11N_ONLY;
-	else if (config->dot11Mode == eHDD_DOT11_MODE_11ac_ONLY)
-		return ALLOW_11AC_ONLY;
-	else if (config->dot11Mode == eHDD_DOT11_MODE_11ax_ONLY)
-		return ALLOW_11AX_ONLY;
-	else
-		return ALLOW_ALL;
-}
-
-int wlan_hdd_cm_connect(struct wiphy *wiphy,
-			struct net_device *ndev,
-			struct cfg80211_connect_params *req)
-{
-	int status;
-	struct wlan_objmgr_vdev *vdev;
-	struct osif_connect_params params;
-	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
-	struct hdd_context *hdd_ctx;
-
-	hdd_enter();
-
-	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
-		hdd_err("Command not allowed in FTM mode");
-		return -EINVAL;
-	}
-
-	if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
-		return -EINVAL;
-
-	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
-		   TRACE_CODE_HDD_CFG80211_CONNECT,
-		   adapter->vdev_id, adapter->device_mode);
-
-	if (adapter->device_mode != QDF_STA_MODE &&
-	    adapter->device_mode != QDF_P2P_CLIENT_MODE) {
-		hdd_err("Device_mode %s(%d) is not supported",
-			qdf_opmode_str(adapter->device_mode),
-			adapter->device_mode);
-		return -EINVAL;
-	}
-
-	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-
-	status = wlan_hdd_validate_context(hdd_ctx);
-	if (status)
-		return status;
-
-	vdev = hdd_objmgr_get_vdev(adapter);
-
-	ucfg_pmo_flush_gtk_offload_req(vdev);
-
-	qdf_runtime_pm_prevent_suspend(&hdd_ctx->runtime_context.connect);
-	hdd_prevent_suspend_timeout(HDD_WAKELOCK_CONNECT_COMPLETE,
-				    WIFI_POWER_EVENT_WAKELOCK_CONNECT);
-
-	params.force_rsne_override = hdd_ctx->force_rsne_override;
-	params.dot11mode_filter = hdd_get_dot11mode_filter(hdd_ctx);
-
-	hdd_update_scan_ie_for_connect(adapter, &params);
-
-	status = osif_cm_connect(ndev, vdev, req, &params);
-
-	if (status) {
-		hdd_err("Vdev %d connect failed status %d",
-			adapter->vdev_id, status);
-		qdf_runtime_pm_allow_suspend(&hdd_ctx->runtime_context.connect);
-		hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_CONNECT);
-	}
-
-	hdd_objmgr_put_vdev(vdev);
-	return status;
-}
-#endif
-
 /**
  * wlan_hdd_cfg80211_connect() - cfg80211 connect api
  * @wiphy: Pointer to wiphy
@@ -21252,48 +21142,6 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
 	return status;
 }
 
-#ifdef FEATURE_CM_ENABLE
-int wlan_hdd_cm_disconnect(struct wiphy *wiphy,
-			   struct net_device *dev, u16 reason)
-{
-	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
-	int status;
-	struct wlan_objmgr_vdev *vdev;
-
-	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
-		hdd_err("Command not allowed in FTM mode");
-		return -EINVAL;
-	}
-
-	if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
-		return -EINVAL;
-
-	vdev = hdd_objmgr_get_vdev(adapter);
-	if (!vdev)
-		return -EINVAL;
-
-	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
-		   TRACE_CODE_HDD_CFG80211_DISCONNECT,
-		   adapter->vdev_id, reason);
-
-	hdd_print_netdev_txq_status(dev);
-
-	if (reason == WLAN_REASON_DEAUTH_LEAVING)
-		qdf_dp_trace_dump_all(
-				WLAN_DEAUTH_DPTRACE_DUMP_COUNT,
-				QDF_TRACE_DEFAULT_PDEV_ID);
-
-	reset_mscs_params(adapter);
-	wlan_hdd_netif_queue_control(adapter,
-				     WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER,
-				     WLAN_CONTROL_PATH);
-	status = osif_cm_disconnect(dev, vdev, reason);
-	hdd_objmgr_put_vdev(vdev);
-
-	return status;
-}
-#endif
-
 /**
  * wlan_hdd_cfg80211_disconnect() - cfg80211 disconnect api
  * @wiphy: Pointer to wiphy

core/hdd/src/wlan_hdd_cfg80211.h

@@ -869,34 +869,4 @@ static inline void hdd_send_update_owe_info_event(struct hdd_adapter *adapter,
  */
 bool hdd_is_legacy_connection(struct hdd_adapter *adapter);
 
-#ifdef FEATURE_CM_ENABLE
-/**
- * wlan_hdd_cm_connect() - cfg80211 connect api
- * @wiphy: Pointer to wiphy
- * @dev: Pointer to network device
- * @req: Pointer to cfg80211 connect request
- *
- * This function is used to issue connect request to connection manager
- *
- * Context: Any context.
- * Return: 0 for success, non-zero for failure
- */
-int wlan_hdd_cm_connect(struct wiphy *wiphy,
-			struct net_device *ndev,
-			struct cfg80211_connect_params *req);
-
-/**
- * wlan_hdd_cm_disconnect() - cfg80211 disconnect api
- * @wiphy: Pointer to wiphy
- * @dev: Pointer to network device
- * @reason: Disconnect reason code
- *
- * This function is used to issue disconnect request to conection manager
- *
- * Return: 0 for success, non-zero for failure
- */
-int wlan_hdd_cm_disconnect(struct wiphy *wiphy,
-			   struct net_device *dev, u16 reason);
-#endif
-
 #endif

core/hdd/src/wlan_hdd_cm_api.h

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: wlan_hdd_cm_api.h
+ *
+ * WLAN host device driver connect/disconnect functions declaration
+ */
+
+#ifndef __WLAN_HDD_CM_API_H
+#define __WLAN_HDD_CM_API_H
+
+#include <net/cfg80211.h>
+
+#ifdef FEATURE_CM_ENABLE
+/**
+ * wlan_hdd_cm_connect() - cfg80211 connect api
+ * @wiphy: Pointer to wiphy
+ * @dev: Pointer to network device
+ * @req: Pointer to cfg80211 connect request
+ *
+ * This function is used to issue connect request to connection manager
+ *
+ * Context: Any context.
+ * Return: 0 for success, non-zero for failure
+ */
+int wlan_hdd_cm_connect(struct wiphy *wiphy,
+			struct net_device *ndev,
+			struct cfg80211_connect_params *req);
+
+/**
+ * wlan_hdd_cm_disconnect() - cfg80211 disconnect api
+ * @wiphy: Pointer to wiphy
+ * @dev: Pointer to network device
+ * @reason: Disconnect reason code
+ *
+ * This function is used to issue disconnect request to conection manager
+ *
+ * Return: 0 for success, non-zero for failure
+ */
+int wlan_hdd_cm_disconnect(struct wiphy *wiphy,
+			   struct net_device *dev, u16 reason);
+
+#else
+static inline int
+wlan_hdd_cm_connect(struct wiphy *wiphy, struct net_device *ndev,
+		    struct cfg80211_connect_params *req)
+{
+	return 0;
+}
+
+static inline int
+wlan_hdd_cm_disconnect(struct wiphy *wiphy, struct net_device *dev, u16 reason)
+{
+	return 0;
+}
+#endif
+#endif

core/hdd/src/wlan_hdd_cm_connect.c

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: hdd_cm_connect.c
+ *
+ * WLAN Host Device Driver connect APIs implementation
+ *
+ */
+
+#include "wlan_hdd_main.h"
+#include "wlan_hdd_cm_api.h"
+#include "wlan_hdd_trace.h"
+#include "wlan_hdd_object_manager.h"
+#include "wlan_hdd_power.h"
+#include <osif_cm_req.h>
+
+static void hdd_update_scan_ie_for_connect(struct hdd_adapter *adapter,
+					   struct osif_connect_params *params)
+{
+	if (adapter->device_mode == QDF_P2P_CLIENT_MODE) {
+		params->scan_ie.ptr =
+			&adapter->scan_info.scan_add_ie.addIEdata[0];
+		params->scan_ie.len = adapter->scan_info.scan_add_ie.length;
+	} else if (adapter->scan_info.default_scan_ies) {
+		params->scan_ie.ptr = adapter->scan_info.default_scan_ies;
+		params->scan_ie.len = adapter->scan_info.default_scan_ies_len;
+	} else if (adapter->scan_info.scan_add_ie.length) {
+		params->scan_ie.ptr = adapter->scan_info.scan_add_ie.addIEdata;
+		params->scan_ie.len = adapter->scan_info.scan_add_ie.length;
+	}
+}
+
+/**
+ * hdd_get_dot11mode_filter() - Get dot11 mode filter
+ * @hdd_ctx: HDD context
+ *
+ * This function is used to get the dot11 mode filter
+ *
+ * Context: Any Context.
+ * Return: dot11_mode_filter
+ */
+static enum dot11_mode_filter
+hdd_get_dot11mode_filter(struct hdd_context *hdd_ctx)
+{
+	struct hdd_config *config = hdd_ctx->config;
+
+	if (config->dot11Mode == eHDD_DOT11_MODE_11n_ONLY)
+		return ALLOW_11N_ONLY;
+	else if (config->dot11Mode == eHDD_DOT11_MODE_11ac_ONLY)
+		return ALLOW_11AC_ONLY;
+	else if (config->dot11Mode == eHDD_DOT11_MODE_11ax_ONLY)
+		return ALLOW_11AX_ONLY;
+	else
+		return ALLOW_ALL;
+}
+
+int wlan_hdd_cm_connect(struct wiphy *wiphy,
+			struct net_device *ndev,
+			struct cfg80211_connect_params *req)
+{
+	int status;
+	struct wlan_objmgr_vdev *vdev;
+	struct osif_connect_params params;
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(ndev);
+	struct hdd_context *hdd_ctx;
+
+	hdd_enter();
+
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+		hdd_err("Command not allowed in FTM mode");
+		return -EINVAL;
+	}
+
+	if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
+		return -EINVAL;
+
+	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
+		   TRACE_CODE_HDD_CFG80211_CONNECT,
+		   adapter->vdev_id, adapter->device_mode);
+
+	if (adapter->device_mode != QDF_STA_MODE &&
+	    adapter->device_mode != QDF_P2P_CLIENT_MODE) {
+		hdd_err("Device_mode %s(%d) is not supported",
+			qdf_opmode_str(adapter->device_mode),
+			adapter->device_mode);
+		return -EINVAL;
+	}
+
+	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
+
+	status = wlan_hdd_validate_context(hdd_ctx);
+	if (status)
+		return status;
+
+	vdev = hdd_objmgr_get_vdev(adapter);
+
+	ucfg_pmo_flush_gtk_offload_req(vdev);
+
+	qdf_runtime_pm_prevent_suspend(&hdd_ctx->runtime_context.connect);
+	hdd_prevent_suspend_timeout(HDD_WAKELOCK_CONNECT_COMPLETE,
+				    WIFI_POWER_EVENT_WAKELOCK_CONNECT);
+
+	params.force_rsne_override = hdd_ctx->force_rsne_override;
+	params.dot11mode_filter = hdd_get_dot11mode_filter(hdd_ctx);
+
+	hdd_update_scan_ie_for_connect(adapter, &params);
+
+	status = osif_cm_connect(ndev, vdev, req, &params);
+
+	if (status) {
+		hdd_err("Vdev %d connect failed status %d",
+			adapter->vdev_id, status);
+		qdf_runtime_pm_allow_suspend(&hdd_ctx->runtime_context.connect);
+		hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_CONNECT);
+	}
+
+	hdd_objmgr_put_vdev(vdev);
+	return status;
+}

core/hdd/src/wlan_hdd_cm_disconnect.c

@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+/**
+ * DOC: hdd_cm_disconnect.c
+ *
+ * WLAN Host Device Driver disconnect APIs implementation
+ *
+ */
+
+#include "wlan_hdd_main.h"
+#include "wlan_hdd_object_manager.h"
+#include "wlan_hdd_trace.h"
+#include <osif_cm_req.h>
+#include "wlan_hdd_cm_api.h"
+
+int wlan_hdd_cm_disconnect(struct wiphy *wiphy,
+			   struct net_device *dev, u16 reason)
+{
+	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
+	int status;
+	struct wlan_objmgr_vdev *vdev;
+
+	if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
+		hdd_err("Command not allowed in FTM mode");
+		return -EINVAL;
+	}
+
+	if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
+		return -EINVAL;
+
+	vdev = hdd_objmgr_get_vdev(adapter);
+	if (!vdev)
+		return -EINVAL;
+
+	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
+		   TRACE_CODE_HDD_CFG80211_DISCONNECT,
+		   adapter->vdev_id, reason);
+
+	hdd_print_netdev_txq_status(dev);
+
+	if (reason == WLAN_REASON_DEAUTH_LEAVING)
+		qdf_dp_trace_dump_all(
+				WLAN_DEAUTH_DPTRACE_DUMP_COUNT,
+				QDF_TRACE_DEFAULT_PDEV_ID);
+
+	/* To-Do: This is static api move this api to this file
+	 * once this is removed from wlan_hdd_cfg80211.c file
+	 * reset_mscs_params(adapter);
+	 */
+	wlan_hdd_netif_queue_control(adapter,
+				     WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER,
+				     WLAN_CONTROL_PATH);
+	status = osif_cm_disconnect(dev, vdev, reason);
+	hdd_objmgr_put_vdev(vdev);
+
+	return status;
+}