qcacld-3.0: Remove STA specific enums from eConnectionState

Remove STA specific enums from eConnectionState. Also remove
its prints from STA dependent code.

Change-Id: I1a06d16a060bec90147dcf94925582877352d1a8
CRs-Fixed: 3028099

core/hdd/inc/wlan_hdd_assoc.h

@@ -41,17 +41,11 @@
 /**
  * enum eConnectionState - connection state values at HDD
  * @eConnectionState_NotConnected: Not associated in Infra
- * @eConnectionState_Connecting: While connection in progress
- * @eConnectionState_Associated: Associated in an Infrastructure network
- * @eConnectionState_Disconnecting: Disconnecting in an Infrastructure network.
  * @eConnectionState_NdiDisconnected: NDI in disconnected state - no peers
  * @eConnectionState_NdiConnected: NDI in connected state - at least one peer
  */
 typedef enum {
 	eConnectionState_NotConnected,
-	eConnectionState_Connecting,
-	eConnectionState_Associated,
-	eConnectionState_Disconnecting,
 	eConnectionState_NdiDisconnected,
 	eConnectionState_NdiConnected,
 } eConnectionState;

core/hdd/inc/wlan_hdd_tsf.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2020 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2021 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
@@ -232,21 +232,6 @@ int hdd_start_tsf_sync(struct hdd_adapter *adapter);
  */
 int hdd_stop_tsf_sync(struct hdd_adapter *adapter);
 
-/**
- * hdd_tsf_notify_wlan_state_change() -
- *     notify tsf module of wlan connection state
- * @old_state: old wlan state
- * @new_state: new wlan state
- *
- * This function check the old and new connection state, determine whether
- * to start or stop tsf sync
- *
- * Return: nothing
- */
-void hdd_tsf_notify_wlan_state_change(struct hdd_adapter *adapter,
-				      eConnectionState old_state,
-				      eConnectionState new_state);
-
 /**
  * hdd_tx_timestamp() - time stamp TX netbuf
  *
@@ -303,14 +288,6 @@ static inline int hdd_stop_tsf_sync(struct hdd_adapter *adapter)
 	return -ENOTSUPP;
 }
 
-static inline
-void hdd_tsf_notify_wlan_state_change(struct hdd_adapter *adapter,
-				      eConnectionState old_state,
-				      eConnectionState new_state)
-
-{
-}
-
 static inline
 int hdd_tx_timestamp(qdf_nbuf_t netbuf, uint64_t target_time)
 {

core/hdd/src/wlan_hdd_assoc.c

@@ -313,8 +313,6 @@ void hdd_conn_set_connection_state(struct hdd_adapter *adapter,
 {
 	struct hdd_station_ctx *hdd_sta_ctx =
 		WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	char *connect_time;
-	uint32_t time_buffer_size;
 
 	/* save the new connection state */
 	if (conn_state == hdd_sta_ctx->conn_info.conn_state)
@@ -324,19 +322,7 @@ void hdd_conn_set_connection_state(struct hdd_adapter *adapter,
 		       hdd_sta_ctx->conn_info.conn_state, conn_state,
 		       adapter->dev->name, adapter->vdev_id);
 
-	hdd_tsf_notify_wlan_state_change(adapter,
-					 hdd_sta_ctx->conn_info.conn_state,
-					 conn_state);
 	hdd_sta_ctx->conn_info.conn_state = conn_state;
-
-	connect_time = hdd_sta_ctx->conn_info.connect_time;
-	time_buffer_size = sizeof(hdd_sta_ctx->conn_info.connect_time);
-	if (conn_state == eConnectionState_Associated)
-		qdf_get_time_of_the_day_in_hr_min_sec_usec(connect_time,
-							   time_buffer_size);
-	else
-		qdf_mem_zero(connect_time, time_buffer_size);
-
 }
 
 enum band_info hdd_conn_get_connected_band(struct hdd_adapter *adapter)

core/hdd/src/wlan_hdd_cfg80211.c

@@ -20573,7 +20573,6 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
 {
 	struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
 	struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
-	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	int status;
 
 	hdd_enter();
@@ -20591,8 +20590,7 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
 		return -EINVAL;
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
-		   TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES,
-		   adapter->vdev_id, sta_ctx->conn_info.conn_state);
+		   TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES, adapter->vdev_id, 0);
 
 	/* Added for debug on reception of Re-assoc Req. */
 	if (!hdd_cm_is_vdev_associated(adapter)) {

core/hdd/src/wlan_hdd_cm_connect.c

@@ -460,6 +460,7 @@ hdd_cm_connect_failure_pre_user_update(struct wlan_objmgr_vdev *vdev,
 	struct hdd_context *hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	struct hdd_adapter *adapter;
 	struct hdd_station_ctx *hdd_sta_ctx;
+	uint32_t time_buffer_size;
 
 	if (!hdd_ctx) {
 		hdd_err("hdd_ctx is NULL");
@@ -473,6 +474,8 @@ hdd_cm_connect_failure_pre_user_update(struct wlan_objmgr_vdev *vdev,
 	}
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
+	time_buffer_size = sizeof(hdd_sta_ctx->conn_info.connect_time);
+	qdf_mem_zero(hdd_sta_ctx->conn_info.connect_time, time_buffer_size);
 	hdd_init_scan_reject_params(hdd_ctx);
 	hdd_cm_save_connect_status(adapter, rsp->status_code);
 	hdd_conn_remove_connect_info(hdd_sta_ctx);
@@ -861,6 +864,7 @@ hdd_cm_connect_success_pre_user_update(struct wlan_objmgr_vdev *vdev,
 	bool is_roam = rsp->is_reassoc;
 	ol_txrx_soc_handle soc = cds_get_context(QDF_MODULE_ID_SOC);
 	uint32_t phymode;
+	uint32_t time_buffer_size;
 
 	hdd_ctx = cds_get_context(QDF_MODULE_ID_HDD);
 	if (!hdd_ctx) {
@@ -882,6 +886,10 @@ hdd_cm_connect_success_pre_user_update(struct wlan_objmgr_vdev *vdev,
 	hdd_cm_save_connect_status(adapter, rsp->status_code);
 
 	hdd_init_scan_reject_params(hdd_ctx);
+	time_buffer_size = sizeof(sta_ctx->conn_info.connect_time);
+	qdf_mem_zero(sta_ctx->conn_info.connect_time, time_buffer_size);
+	qdf_get_time_of_the_day_in_hr_min_sec_usec(sta_ctx->conn_info.connect_time,
+						   time_buffer_size);
 	hdd_start_tsf_sync(adapter);
 	hdd_cm_rec_connect_info(adapter, rsp);
 

core/hdd/src/wlan_hdd_cm_disconnect.c

@@ -115,8 +115,11 @@ void __hdd_cm_disconnect_handler_pre_user_update(struct hdd_adapter *adapter)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
+	uint32_t time_buffer_size;
 
 	hdd_stop_tsf_sync(adapter);
+	time_buffer_size = sizeof(sta_ctx->conn_info.connect_time);
+	qdf_mem_zero(sta_ctx->conn_info.connect_time, time_buffer_size);
 	if (ucfg_ipa_is_enabled() &&
 	    QDF_IS_STATUS_SUCCESS(wlan_hdd_validate_mac_address(
 				  &sta_ctx->conn_info.bssid)))

core/hdd/src/wlan_hdd_power.c

@@ -1439,14 +1439,6 @@ flush_mc_list:
 static void hdd_update_conn_state_mask(struct hdd_adapter *adapter,
 				       uint32_t *conn_state_mask)
 {
-
-	eConnectionState conn_state;
-	struct hdd_station_ctx *sta_ctx;
-
-	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-
-	conn_state = sta_ctx->conn_info.conn_state;
-
 	if (hdd_cm_is_vdev_associated(adapter))
 		*conn_state_mask |= (1 << adapter->vdev_id);
 }

core/hdd/src/wlan_hdd_tsf.c

@@ -1971,21 +1971,6 @@ enum hdd_tsf_op_result wlan_hdd_tsf_plus_deinit(struct hdd_context *hdd_ctx)
 	return HDD_TSF_OP_SUCC;
 }
 #endif
-
-void hdd_tsf_notify_wlan_state_change(struct hdd_adapter *adapter,
-				      eConnectionState old_state,
-				      eConnectionState new_state)
-{
-	if (!adapter)
-		return;
-
-	if (old_state != eConnectionState_Associated &&
-	    new_state == eConnectionState_Associated)
-		hdd_start_tsf_sync(adapter);
-	else if (old_state == eConnectionState_Associated &&
-		 new_state != eConnectionState_Associated)
-		hdd_stop_tsf_sync(adapter);
-}
 #else
 static inline void hdd_update_tsf(struct hdd_adapter *adapter, uint64_t tsf)
 {

core/hdd/src/wlan_hdd_twt.c

@@ -352,9 +352,8 @@ int hdd_test_config_twt_setup_session(struct hdd_adapter *adapter,
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	if (!hdd_cm_is_vdev_associated(adapter)) {
-		hdd_err_rl("Invalid state, vdev %d mode %d state %d",
-			   adapter->vdev_id, adapter->device_mode,
-			   hdd_sta_ctx->conn_info.conn_state);
+		hdd_err_rl("Invalid state, vdev %d mode %d",
+			   adapter->vdev_id, adapter->device_mode);
 		return -EINVAL;
 	}
 
@@ -419,9 +418,8 @@ int hdd_test_config_twt_terminate_session(struct hdd_adapter *adapter,
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	if (!hdd_cm_is_vdev_associated(adapter)) {
-		hdd_err_rl("Invalid state, vdev %d mode %d state %d",
-			   adapter->vdev_id, adapter->device_mode,
-			   hdd_sta_ctx->conn_info.conn_state);
+		hdd_err_rl("Invalid state, vdev %d mode %d",
+			   adapter->vdev_id, adapter->device_mode);
 		return -EINVAL;
 	}
 
@@ -748,17 +746,14 @@ fail:
 static int hdd_is_twt_command_allowed(struct hdd_adapter *adapter)
 {
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
-	struct hdd_station_ctx *hdd_sta_ctx;
 
 	if (adapter->device_mode != QDF_STA_MODE &&
 	    adapter->device_mode != QDF_P2P_CLIENT_MODE)
 		return -EOPNOTSUPP;
 
-	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	if (!hdd_cm_is_vdev_associated(adapter)) {
-		hdd_err_rl("Invalid state, vdev %d mode %d state %d",
-			   adapter->vdev_id, adapter->device_mode,
-			   hdd_sta_ctx->conn_info.conn_state);
+		hdd_err_rl("Invalid state, vdev %d mode %d",
+			   adapter->vdev_id, adapter->device_mode);
 		return -EAGAIN;
 	}
 
@@ -2031,9 +2026,8 @@ hdd_send_twt_del_all_sessions_to_userspace(struct hdd_adapter *adapter)
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	if (!hdd_cm_is_vdev_associated(adapter)) {
-		hdd_debug("Not associated, vdev %d mode %d state %d",
-			   adapter->vdev_id, adapter->device_mode,
-			   hdd_sta_ctx->conn_info.conn_state);
+		hdd_debug("Not associated, vdev %d mode %d",
+			   adapter->vdev_id, adapter->device_mode);
 		return;
 	}
 
@@ -2264,9 +2258,8 @@ static int hdd_sta_twt_terminate_session(struct hdd_adapter *adapter,
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	if (!hdd_cm_is_vdev_associated(adapter)) {
-		hdd_err_rl("Invalid state, vdev %d mode %d state %d",
-			   adapter->vdev_id, adapter->device_mode,
-			   hdd_sta_ctx->conn_info.conn_state);
+		hdd_err_rl("Invalid state, vdev %d mode %d",
+			   adapter->vdev_id, adapter->device_mode);
 
 		/*
 		 * Return success, since STA is not associated and there is

core/hdd/src/wlan_hdd_wext.c

@@ -5939,9 +5939,8 @@ hdd_connection_state_string(eConnectionState connection_state)
 {
 	switch (connection_state) {
 		CASE_RETURN_STRING(eConnectionState_NotConnected);
-		CASE_RETURN_STRING(eConnectionState_Connecting);
-		CASE_RETURN_STRING(eConnectionState_Associated);
-		CASE_RETURN_STRING(eConnectionState_Disconnecting);
+		CASE_RETURN_STRING(eConnectionState_NdiDisconnected);
+		CASE_RETURN_STRING(eConnectionState_NdiConnected);
 	default:
 		return "UNKNOWN";
 	}
@@ -6475,21 +6474,18 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		int status = 0;
 		bool enable_snr_monitoring;
 		struct hdd_context *hdd_ctx;
-		struct hdd_station_ctx *sta_ctx;
 
 		hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 		status = wlan_hdd_validate_context(hdd_ctx);
 		if (status)
 			return status;
 
-		sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 		enable_snr_monitoring =
 				ucfg_scan_is_snr_monitor_enabled(hdd_ctx->psoc);
 		if (!enable_snr_monitoring ||
 		    !hdd_cm_is_vdev_associated(adapter)) {
-			hdd_err("getSNR failed: Enable SNR Monitoring-%d, ConnectionState-%d",
-				enable_snr_monitoring,
-				sta_ctx->conn_info.conn_state);
+			hdd_err("getSNR failed: Enable SNR Monitoring-%d",
+				enable_snr_monitoring);
 			return -ENONET;
 		}
 		wlan_hdd_get_snr(adapter, &s7snr);