qcacld-3.0: Rename connState in struct hdd_connection_info

The Linux Coding Style frowns upon mixed-case names so rename field
connState in struct hdd_connection_info to be compliant.

Change-Id: Ib5e1fa2cc4c6ea4e15a6dba2c0ec3ac424b9e09e
CRs-Fixed: 2409873

core/hdd/inc/wlan_hdd_assoc.h

@@ -138,7 +138,7 @@ struct hdd_conn_flag {
 
 /**
  * struct hdd_connection_info - structure to store connection information
- * @connState: connection state of the NIC
+ * @conn_state: connection state of the NIC
  * @bssId: BSSID
  * @SSID: SSID Info
  * @staId: Station ID
@@ -173,7 +173,7 @@ struct hdd_conn_flag {
  * @ch_width: channel width of operating channel
  */
 struct hdd_connection_info {
-	eConnectionState connState;
+	eConnectionState conn_state;
 	struct qdf_mac_addr bssId;
 	tCsrSSIDInfo SSID;
 	uint8_t staId[MAX_PEERS];

core/hdd/src/wlan_hdd_assoc.c

@@ -260,13 +260,13 @@ void hdd_conn_set_connection_state(struct hdd_adapter *adapter,
 
 	/* save the new connection state */
 	hdd_debug("Changed conn state from old:%d to new:%d for dev %s",
-		  hdd_sta_ctx->conn_info.connState, conn_state,
+		  hdd_sta_ctx->conn_info.conn_state, conn_state,
 		  adapter->dev->name);
 
 	hdd_tsf_notify_wlan_state_change(adapter,
-					 hdd_sta_ctx->conn_info.connState,
+					 hdd_sta_ctx->conn_info.conn_state,
 					 conn_state);
-	hdd_sta_ctx->conn_info.connState = 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);
@@ -293,7 +293,7 @@ static inline bool
 hdd_conn_get_connection_state(struct hdd_station_ctx *sta_ctx,
 			      eConnectionState *out_state)
 {
-	eConnectionState state = sta_ctx->conn_info.connState;
+	eConnectionState state = sta_ctx->conn_info.conn_state;
 
 	if (out_state)
 		*out_state = state;
@@ -311,7 +311,7 @@ hdd_conn_get_connection_state(struct hdd_station_ctx *sta_ctx,
 
 bool hdd_is_connecting(struct hdd_station_ctx *hdd_sta_ctx)
 {
-	return hdd_sta_ctx->conn_info.connState ==
+	return hdd_sta_ctx->conn_info.conn_state ==
 		eConnectionState_Connecting;
 }
 
@@ -336,7 +336,7 @@ enum band_info hdd_conn_get_connected_band(struct hdd_station_ctx *sta_ctx)
 {
 	uint8_t staChannel = 0;
 
-	if (eConnectionState_Associated == sta_ctx->conn_info.connState)
+	if (eConnectionState_Associated == sta_ctx->conn_info.conn_state)
 		staChannel = sta_ctx->conn_info.operationChannel;
 
 	if (staChannel > 0 && staChannel < 14)
@@ -385,12 +385,12 @@ struct hdd_adapter *hdd_get_sta_connection_in_progress(
 		    (QDF_P2P_CLIENT_MODE == adapter->device_mode) ||
 		    (QDF_P2P_DEVICE_MODE == adapter->device_mode)) {
 			if (eConnectionState_Connecting ==
-			    hdd_sta_ctx->conn_info.connState) {
+			    hdd_sta_ctx->conn_info.conn_state) {
 				hdd_debug("vdev_id %d: Connection is in progress",
 					  adapter->vdev_id);
 				return adapter;
 			} else if ((eConnectionState_Associated ==
-				   hdd_sta_ctx->conn_info.connState) &&
+				   hdd_sta_ctx->conn_info.conn_state) &&
 				   sme_is_sta_key_exchange_in_progress(
 							hdd_ctx->mac_handle,
 							adapter->vdev_id)) {
@@ -1356,7 +1356,7 @@ static void hdd_send_association_event(struct net_device *dev,
 						 adapter->vdev);
 		}
 #endif
-	if (eConnectionState_Associated == sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated == sta_ctx->conn_info.conn_state) {
 		struct oem_channel_info chan_info = {0};
 
 		if (!pCsrRoamInfo || !pCsrRoamInfo->pBssDesc) {
@@ -1452,7 +1452,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		hdd_bus_bw_compute_timer_start(hdd_ctx);
 #endif
 	} else if (eConnectionState_IbssConnected ==    /* IBss Associated */
-			sta_ctx->conn_info.connState) {
+			sta_ctx->conn_info.conn_state) {
 		policy_mgr_update_connection_info(hdd_ctx->psoc,
 				adapter->vdev_id);
 		memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssId.bytes,
@@ -1512,7 +1512,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		wireless_send_event(dev, we_event, &wrqu, msg);
 #ifdef FEATURE_WLAN_ESE
 		if (eConnectionState_Associated ==
-			 sta_ctx->conn_info.connState) {
+			 sta_ctx->conn_info.conn_state) {
 			if ((roam_profile->AuthType.authType[0] ==
 			     eCSR_AUTH_TYPE_CCKM_RSN) ||
 			    (roam_profile->AuthType.authType[0] ==
@@ -1750,11 +1750,11 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 	 * to cfg80211_disconnected.
 	 */
 	if ((eConnectionState_Disconnecting ==
-	    sta_ctx->conn_info.connState) ||
+	    sta_ctx->conn_info.conn_state) ||
 	    (eConnectionState_NotConnected ==
-	    sta_ctx->conn_info.connState) ||
+	    sta_ctx->conn_info.conn_state) ||
 	    (eConnectionState_Connecting ==
-	    sta_ctx->conn_info.connState)) {
+	    sta_ctx->conn_info.conn_state)) {
 		hdd_debug("HDD has initiated a disconnect, no need to send disconnect indication to kernel");
 		sendDisconInd = false;
 	} else {
@@ -1875,7 +1875,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 	* eConnectionState_Connecting state mean that connection is in
 	* progress so no need to set state to eConnectionState_NotConnected
 	*/
-	if ((eConnectionState_Connecting != sta_ctx->conn_info.connState)) {
+	if ((eConnectionState_Connecting != sta_ctx->conn_info.conn_state)) {
 		hdd_conn_set_connection_state(adapter,
 					       eConnectionState_NotConnected);
 		 hdd_set_roaming_in_progress(false);
@@ -2793,13 +2793,13 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 	 * to kernel as it will be handled by __cfg80211_disconnect.
 	 */
 	if (((eConnectionState_Disconnecting ==
-	    sta_ctx->conn_info.connState) ||
+	    sta_ctx->conn_info.conn_state) ||
 	    (eConnectionState_NotConnected ==
-	    sta_ctx->conn_info.connState)) &&
+	    sta_ctx->conn_info.conn_state)) &&
 	    ((eCSR_ROAM_RESULT_ASSOCIATED == roam_result) ||
 	    (eCSR_ROAM_ASSOCIATION_FAILURE == roam_status))) {
 		hdd_info("hddDisconInProgress state=%d, result=%d, status=%d",
-				sta_ctx->conn_info.connState,
+				sta_ctx->conn_info.conn_state,
 				roam_result, roam_status);
 		hddDisconInProgress = true;
 	}
@@ -3800,7 +3800,7 @@ hdd_roam_mic_error_indication_handler(struct hdd_adapter *adapter,
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	tSirMicFailureInfo *mic_failure_info;
 
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState)
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state)
 		return;
 
 	mic_failure_info = roam_info->u.pMICFailureInfo;

core/hdd/src/wlan_hdd_bss_transition.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2019 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
@@ -144,9 +144,9 @@ __wlan_hdd_cfg80211_fetch_bss_transition_status(struct wiphy *wiphy,
 		return ret;
 
 	if (adapter->device_mode != QDF_STA_MODE ||
-	    hdd_sta_ctx->conn_info.connState != eConnectionState_Associated) {
+	    hdd_sta_ctx->conn_info.conn_state != eConnectionState_Associated) {
 		hdd_err("Command is either not invoked for STA mode (device mode: %d) or STA is not associated (Connection state: %d)",
-			adapter->device_mode, hdd_sta_ctx->conn_info.connState);
+			adapter->device_mode, hdd_sta_ctx->conn_info.conn_state);
 		return -EINVAL;
 	}
 

core/hdd/src/wlan_hdd_cfg80211.c

@@ -8193,7 +8193,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 	if (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
 		hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-		if ((hdd_sta_ctx->conn_info.connState !=
+		if ((hdd_sta_ctx->conn_info.conn_state !=
 			eConnectionState_Associated) ||
 		    qdf_mem_cmp(hdd_sta_ctx->conn_info.bssId.bytes,
 			peer_mac, QDF_MAC_ADDR_SIZE)) {
@@ -10249,7 +10249,7 @@ static int __wlan_hdd_cfg80211_set_fast_roaming(struct wiphy *wiphy,
 				qdf_status);
 	ret = qdf_status_to_os_return(qdf_status);
 
-	if (eConnectionState_Associated == hdd_sta_ctx->conn_info.connState &&
+	if (eConnectionState_Associated == hdd_sta_ctx->conn_info.conn_state &&
 		QDF_IS_STATUS_SUCCESS(qdf_status) && !is_fast_roam_enabled) {
 
 		INIT_COMPLETION(adapter->lfr_fw_status.disable_lfr_event);
@@ -15563,7 +15563,7 @@ void hdd_select_cbmode(struct hdd_adapter *adapter, uint8_t operationChannel,
 
 	if (adapter->device_mode == QDF_STA_MODE &&
 	    ucfg_mlme_is_change_channel_bandwidth_enabled(hdd_ctx->psoc)) {
-		connstate = station_ctx->conn_info.connState;
+		connstate = station_ctx->conn_info.conn_state;
 		if (!(eConnectionState_Associated == connstate ||
 		      eConnectionState_Connecting == connstate)) {
 			cbmode_select = true;
@@ -17523,12 +17523,12 @@ int wlan_hdd_try_disconnect(struct hdd_adapter *adapter)
 	}
 
 	if ((QDF_IBSS_MODE == adapter->device_mode) ||
-	  (eConnectionState_Associated == sta_ctx->conn_info.connState) ||
-	  (eConnectionState_Connecting == sta_ctx->conn_info.connState) ||
-	  (eConnectionState_IbssConnected == sta_ctx->conn_info.connState)) {
+	  (eConnectionState_Associated == sta_ctx->conn_info.conn_state) ||
+	  (eConnectionState_Connecting == sta_ctx->conn_info.conn_state) ||
+	  (eConnectionState_IbssConnected == sta_ctx->conn_info.conn_state)) {
 		eConnectionState prev_conn_state;
 
-		prev_conn_state = sta_ctx->conn_info.connState;
+		prev_conn_state = sta_ctx->conn_info.conn_state;
 		hdd_conn_set_connection_state(adapter,
 					      eConnectionState_Disconnecting);
 		/* Issue disconnect to CSR */
@@ -17573,7 +17573,7 @@ int wlan_hdd_try_disconnect(struct hdd_adapter *adapter)
 			result = -ETIMEDOUT;
 		}
 	} else if (eConnectionState_Disconnecting ==
-				sta_ctx->conn_info.connState) {
+				sta_ctx->conn_info.conn_state) {
 		rc = wait_for_completion_timeout(&adapter->disconnect_comp_var,
 						 msecs_to_jiffies(wait_time));
 		if (!rc) {
@@ -17947,12 +17947,12 @@ int wlan_hdd_disconnect(struct hdd_adapter *adapter, u16 reason)
 		}
 	}
 
-	prev_conn_state = sta_ctx->conn_info.connState;
+	prev_conn_state = sta_ctx->conn_info.conn_state;
 	/*stop tx queues */
 	hdd_info("Disabling queues");
 	wlan_hdd_netif_queue_control(adapter,
 		WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER, WLAN_CONTROL_PATH);
-	hdd_debug("Set HDD connState to eConnectionState_Disconnecting");
+	hdd_debug("Set HDD conn_state to eConnectionState_Disconnecting");
 	hdd_conn_set_connection_state(adapter, eConnectionState_Disconnecting);
 
 	INIT_COMPLETION(adapter->disconnect_comp_var);
@@ -18150,8 +18150,8 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
 	qdf_mutex_release(&adapter->disconnection_status_lock);
 
 	/* Issue disconnect request to SME, if station is in connected state */
-	if ((sta_ctx->conn_info.connState == eConnectionState_Associated) ||
-	    (sta_ctx->conn_info.connState == eConnectionState_Connecting)) {
+	if ((sta_ctx->conn_info.conn_state == eConnectionState_Associated) ||
+	    (sta_ctx->conn_info.conn_state == eConnectionState_Connecting)) {
 		eCsrRoamDisconnectReason reasonCode =
 			eCSR_DISCONNECT_REASON_UNSPECIFIED;
 
@@ -18220,7 +18220,7 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
 		}
 	} else {
 		hdd_err("Unexpected cfg disconnect called while in state: %d",
-		       sta_ctx->conn_info.connState);
+		       sta_ctx->conn_info.conn_state);
 		hdd_set_disconnect_status(adapter, false);
 	}
 
@@ -19620,10 +19620,10 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
 
 	qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
 		   TRACE_CODE_HDD_CFG80211_UPDATE_FT_IES,
-		   adapter->vdev_id, sta_ctx->conn_info.connState);
+		   adapter->vdev_id, sta_ctx->conn_info.conn_state);
 
 	/* Added for debug on reception of Re-assoc Req. */
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		hdd_err("Called with Ie of length = %zu when not associated",
 		       ftie->ie_len);
 		hdd_err("Should be Re-assoc Req IEs");

core/hdd/src/wlan_hdd_debugfs_connect.c

@@ -322,7 +322,7 @@ wlan_hdd_connect_info_debugfs(struct hdd_adapter *adapter, uint8_t *buf,
 	int ret_val;
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	if (hdd_sta_ctx->conn_info.connState != eConnectionState_Associated) {
+	if (hdd_sta_ctx->conn_info.conn_state != eConnectionState_Associated) {
 		ret_val = scnprintf(buf, buf_avail_len,
 				    "\nSTA is not connected\n");
 		if (ret_val >= 0)

core/hdd/src/wlan_hdd_debugfs_offload.c

@@ -379,7 +379,7 @@ wlan_hdd_debugfs_update_filters_info(struct hdd_context *hdd_ctx,
 	}
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	if (hdd_sta_ctx->conn_info.connState != eConnectionState_Associated) {
+	if (hdd_sta_ctx->conn_info.conn_state != eConnectionState_Associated) {
 		ret_val = scnprintf(buf + len, buf_avail_len - len,
 				    "\nSTA is not connected\n");
 		if (ret_val <= 0)

core/hdd/src/wlan_hdd_hostapd.c

@@ -2803,7 +2803,7 @@ static bool hdd_is_any_sta_connecting(struct hdd_context *hdd_ctx)
 		if ((adapter->device_mode == QDF_STA_MODE) ||
 		    (adapter->device_mode == QDF_P2P_CLIENT_MODE) ||
 		    (adapter->device_mode == QDF_P2P_DEVICE_MODE)) {
-			if (sta_ctx->conn_info.connState ==
+			if (sta_ctx->conn_info.conn_state ==
 			    eConnectionState_Connecting) {
 				hdd_debug("vdev_id %d: connecting",
 					  adapter->vdev_id);
@@ -3602,7 +3602,7 @@ int wlan_hdd_set_channel(struct wiphy *wiphy,
 			WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
 		if (eConnectionState_IbssConnected ==
-		    sta_ctx->conn_info.connState) {
+		    sta_ctx->conn_info.conn_state) {
 			/* Link is up then return cant set channel */
 			hdd_err("IBSS Associated, can't set the channel");
 			return -EINVAL;

core/hdd/src/wlan_hdd_ioctl.c

@@ -714,15 +714,15 @@ int hdd_reassoc(struct hdd_adapter *adapter, const uint8_t *bssid,
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
 	/*
-	 * pHddStaCtx->conn_info.connState is set to disconnected only
+	 * pHddStaCtx->conn_info.conn_state is set to disconnected only
 	 * after the disconnect done indication from SME. If the SME is
 	 * in the process of disconnecting, the SME Connection state is
-	 * set to disconnected and the pHddStaCtx->conn_info.connState
+	 * set to disconnected and the pHddStaCtx->conn_info.conn_state
 	 * will still be associated till the disconnect is done.
 	 * So check both the HDD state and SME state here.
 	 * If not associated, no need to proceed with reassoc
 	 */
-	if ((eConnectionState_Associated != sta_ctx->conn_info.connState) ||
+	if ((eConnectionState_Associated != sta_ctx->conn_info.conn_state) ||
 	    (!sme_is_conn_state_connected(hdd_ctx->mac_handle,
 	    adapter->vdev_id))) {
 		hdd_warn("Not associated");
@@ -928,7 +928,7 @@ hdd_sendactionframe(struct hdd_adapter *adapter, const uint8_t *bssid,
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 
 	/* if not associated, no need to send action frame */
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		hdd_warn("Not associated");
 		ret = -EINVAL;
 		goto exit;
@@ -2328,7 +2328,7 @@ static int wlan_hdd_get_link_status(struct hdd_adapter *adapter)
 	}
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		/* If not associated, then expected link status return
 		 * value is 0
 		 */
@@ -4296,7 +4296,7 @@ static int drv_cmd_fast_reassoc(struct hdd_adapter *adapter,
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
 	/* if not associated, no need to proceed with reassoc */
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		hdd_warn("Not associated!");
 		ret = -EINVAL;
 		goto exit;
@@ -5255,7 +5255,7 @@ static int drv_cmd_get_ibss_peer_info(struct hdd_adapter *adapter,
 
 	/* if there are no peers, no need to continue with the command */
 	if (eConnectionState_IbssConnected !=
-	    sta_ctx->conn_info.connState) {
+	    sta_ctx->conn_info.conn_state) {
 		hdd_err("No IBSS Peers coalesced");
 		ret = -EINVAL;
 		goto exit;
@@ -5441,7 +5441,7 @@ static int drv_cmd_get_tsm_stats(struct hdd_adapter *adapter,
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
 	/* if not associated, return error */
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		hdd_err("Not associated!");
 		ret = -EINVAL;
 		goto exit;

core/hdd/src/wlan_hdd_ipa.c

@@ -74,7 +74,7 @@ void hdd_ipa_set_tx_flow_info(void)
 		case QDF_STA_MODE:
 			sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 			if (eConnectionState_Associated ==
-			    sta_ctx->conn_info.connState) {
+			    sta_ctx->conn_info.conn_state) {
 				staChannel =
 					sta_ctx->conn_info.operationChannel;
 				qdf_copy_macaddr(&staBssid,
@@ -87,7 +87,7 @@ void hdd_ipa_set_tx_flow_info(void)
 		case QDF_P2P_CLIENT_MODE:
 			sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 			if (eConnectionState_Associated ==
-			    sta_ctx->conn_info.connState) {
+			    sta_ctx->conn_info.conn_state) {
 				p2pChannel =
 					sta_ctx->conn_info.operationChannel;
 				qdf_copy_macaddr(&p2pBssid,

core/hdd/src/wlan_hdd_main.c

@@ -6456,7 +6456,7 @@ int wlan_hdd_set_mon_chan(struct hdd_adapter *adapter, uint32_t chan,
 	}
 	if (adapter->device_mode == QDF_STA_MODE &&
 	    ucfg_mlme_is_change_channel_bandwidth_enabled(hdd_ctx->psoc)) {
-		connstate = sta_ctx->conn_info.connState;
+		connstate = sta_ctx->conn_info.conn_state;
 		if (eConnectionState_Associated == connstate ||
 		    eConnectionState_Connecting == connstate) {
 			return -EINVAL;
@@ -6582,7 +6582,7 @@ static void hdd_delete_sta(struct hdd_adapter *adapter)
 QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 {
 	struct hdd_adapter *adapter;
-	eConnectionState connState;
+	eConnectionState conn_state;
 	bool value;
 
 	hdd_enter();
@@ -6602,8 +6602,8 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 		case QDF_P2P_CLIENT_MODE:
 		case QDF_P2P_DEVICE_MODE:
 
-			connState = (WLAN_HDD_GET_STATION_CTX_PTR(adapter))
-					->conn_info.connState;
+			conn_state = (WLAN_HDD_GET_STATION_CTX_PTR(adapter))
+					->conn_info.conn_state;
 
 			hdd_start_station_adapter(adapter);
 			/* Open the gates for HDD to receive Wext commands */
@@ -6612,11 +6612,11 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 			/* Indicate disconnect event to supplicant
 			 * if associated previously
 			 */
-			if (eConnectionState_Associated == connState ||
-			    eConnectionState_IbssConnected == connState ||
-			    eConnectionState_NotConnected == connState ||
-			    eConnectionState_IbssDisconnected == connState ||
-			    eConnectionState_Disconnecting == connState) {
+			if (eConnectionState_Associated == conn_state ||
+			    eConnectionState_IbssConnected == conn_state ||
+			    eConnectionState_NotConnected == conn_state ||
+			    eConnectionState_IbssDisconnected == conn_state ||
+			    eConnectionState_Disconnecting == conn_state) {
 				union iwreq_data wrqu;
 
 				memset(&wrqu, '\0', sizeof(wrqu));
@@ -6631,7 +6631,7 @@ QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx)
 				wlan_hdd_cfg80211_indicate_disconnect(
 						adapter->dev, false,
 						WLAN_REASON_UNSPECIFIED);
-			} else if (eConnectionState_Connecting == connState) {
+			} else if (eConnectionState_Connecting == conn_state) {
 				/*
 				 * Indicate connect failure to supplicant if we
 				 * were in the process of connecting
@@ -7959,7 +7959,7 @@ static void __hdd_bus_bw_work_handler(struct work_struct *work)
 
 		if ((adapter->device_mode == QDF_STA_MODE ||
 		     adapter->device_mode == QDF_P2P_CLIENT_MODE) &&
-		    WLAN_HDD_GET_STATION_CTX_PTR(adapter)->conn_info.connState
+		    WLAN_HDD_GET_STATION_CTX_PTR(adapter)->conn_info.conn_state
 		    != eConnectionState_Associated) {
 
 			continue;
@@ -11553,8 +11553,8 @@ static void hdd_state_info_dump(char **buf_ptr, uint16_t *size)
 		case QDF_P2P_CLIENT_MODE:
 			hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 			len += scnprintf(buf + len, *size - len,
-				"\n connState: %d",
-				hdd_sta_ctx->conn_info.connState);
+				"\n conn_state: %d",
+				hdd_sta_ctx->conn_info.conn_state);
 			break;
 
 		default:
@@ -12560,7 +12560,7 @@ void wlan_hdd_auto_shutdown_enable(struct hdd_context *hdd_ctx, bool enable)
 		hdd_for_each_adapter(hdd_ctx, adapter) {
 			if (adapter->device_mode == QDF_STA_MODE) {
 				if (WLAN_HDD_GET_STATION_CTX_PTR(adapter)->
-				    conn_info.connState ==
+				    conn_info.conn_state ==
 				    eConnectionState_Associated) {
 					sta_connected = true;
 					break;
@@ -12641,7 +12641,7 @@ static bool hdd_any_adapter_is_assoc(struct hdd_context *hdd_ctx)
 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		if (hdd_adapter_is_sta(adapter) &&
 		    WLAN_HDD_GET_STATION_CTX_PTR(adapter)->
-			conn_info.connState == eConnectionState_Associated) {
+			conn_info.conn_state == eConnectionState_Associated) {
 			return true;
 		}
 
@@ -14707,7 +14707,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 			|| (QDF_P2P_DEVICE_MODE == adapter->device_mode))
 			&& (eConnectionState_Connecting ==
 				(WLAN_HDD_GET_STATION_CTX_PTR(adapter))->
-					conn_info.connState)) {
+					conn_info.conn_state)) {
 			hdd_debug("%pK(%d) Connection is in progress",
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter),
 				adapter->vdev_id);
@@ -14741,7 +14741,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 			hdd_sta_ctx =
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 			if ((eConnectionState_Associated ==
-			    hdd_sta_ctx->conn_info.connState)
+			    hdd_sta_ctx->conn_info.conn_state)
 			    && sme_is_sta_key_exchange_in_progress(
 			    mac_handle, adapter->vdev_id)) {
 				sta_mac = (uint8_t *)

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -816,7 +816,7 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id,
 	/* perform following steps for first new peer ind */
 	if (fist_peer) {
 		hdd_info("Set ctx connection state to connected");
-		sta_ctx->conn_info.connState = eConnectionState_NdiConnected;
+		sta_ctx->conn_info.conn_state = eConnectionState_NdiConnected;
 		hdd_wmm_connect(adapter, roam_info, eCSR_BSS_TYPE_NDI);
 		wlan_hdd_netif_queue_control(adapter,
 				WLAN_WAKE_ALL_NETIF_QUEUE, WLAN_CONTROL_PATH);
@@ -867,7 +867,7 @@ void hdd_ndp_peer_departed_handler(uint8_t vdev_id, uint16_t sta_id,
 
 	if (last_peer) {
 		hdd_info("No more ndp peers.");
-		sta_ctx->conn_info.connState = eConnectionState_NdiDisconnected;
+		sta_ctx->conn_info.conn_state = eConnectionState_NdiDisconnected;
 		hdd_conn_set_connection_state(adapter,
 			eConnectionState_NdiDisconnected);
 		hdd_info("Stop netif tx queues.");

core/hdd/src/wlan_hdd_nan_datapath.h

@@ -41,7 +41,7 @@ struct wireless_dev;
 
 #define WLAN_HDD_IS_NDI_CONNECTED(adapter) ( \
 	eConnectionState_NdiConnected ==\
-		(adapter)->session.station.conn_info.connState)
+		(adapter)->session.station.conn_info.conn_state)
 
 void hdd_nan_datapath_target_config(struct hdd_context *hdd_ctx,
 						struct wma_tgt_cfg *cfg);

core/hdd/src/wlan_hdd_nud_tracking.c

@@ -234,7 +234,7 @@ static void __hdd_nud_failure_work(void *data)
 		return;
 
 	conn_state = (WLAN_HDD_GET_STATION_CTX_PTR(adapter))
-		      ->conn_info.connState;
+		      ->conn_info.conn_state;
 
 	if (eConnectionState_Associated != conn_state) {
 		hdd_debug("Not in Connected State");
@@ -372,7 +372,7 @@ static void hdd_nud_filter_netevent(struct neighbour *neigh)
 		return;
 
 	conn_state = (WLAN_HDD_GET_STATION_CTX_PTR(adapter))
-		->conn_info.connState;
+		->conn_info.conn_state;
 
 	if (eConnectionState_Associated != conn_state) {
 		hdd_debug("Not in Connected State");

core/hdd/src/wlan_hdd_power.c

@@ -1058,15 +1058,15 @@ static void hdd_update_conn_state_mask(struct hdd_adapter *adapter,
 				       uint32_t *conn_state_mask)
 {
 
-	eConnectionState connState;
+	eConnectionState conn_state;
 	struct hdd_station_ctx *sta_ctx;
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
-	connState = sta_ctx->conn_info.connState;
+	conn_state = sta_ctx->conn_info.conn_state;
 
-	if (connState == eConnectionState_Associated ||
-			connState == eConnectionState_IbssConnected)
+	if (conn_state == eConnectionState_Associated ||
+			conn_state == eConnectionState_IbssConnected)
 		*conn_state_mask |= (1 << adapter->vdev_id);
 }
 
@@ -2151,7 +2151,7 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
 	}
 	mutex_unlock(&hdd_ctx->iface_change_lock);
 
-	if (sta_ctx->conn_info.connState != eConnectionState_Associated) {
+	if (sta_ctx->conn_info.conn_state != eConnectionState_Associated) {
 		hdd_debug("Not associated");
 		return 0;
 	}

core/hdd/src/wlan_hdd_scan.c

@@ -503,7 +503,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
 
 	if ((eConnectionState_Associated ==
 			WLAN_HDD_GET_STATION_CTX_PTR(adapter)->
-						conn_info.connState) &&
+						conn_info.conn_state) &&
 	    (!hdd_ctx->config->enable_connected_scan)) {
 		hdd_info("enable_connected_scan is false, Aborting scan");
 		if (wlan_hdd_enqueue_blocked_scan_request(dev, request, source))
@@ -1304,7 +1304,7 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
 
 	if ((eConnectionState_Associated ==
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter)->
-							conn_info.connState) &&
+							conn_info.conn_state) &&
 	    (!hdd_ctx->config->enable_connected_scan)) {
 		hdd_info("enable_connected_scan is false, Aborting scan");
 		return -EBUSY;

core/hdd/src/wlan_hdd_stats.c

@@ -553,17 +553,17 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 	     (QDF_P2P_DEVICE_MODE == adapter->device_mode))) {
 		sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 		if (eConnectionState_NotConnected ==
-		    sta_ctx->conn_info.connState) {
+		    sta_ctx->conn_info.conn_state) {
 			pInfo->state = WIFI_DISCONNECTED;
 		}
 		if (eConnectionState_Connecting ==
-		    sta_ctx->conn_info.connState) {
+		    sta_ctx->conn_info.conn_state) {
 			hdd_err("Session ID %d, Connection is in progress",
 				adapter->vdev_id);
 			pInfo->state = WIFI_ASSOCIATING;
 		}
 		if ((eConnectionState_Associated ==
-		     sta_ctx->conn_info.connState)
+		     sta_ctx->conn_info.conn_state)
 		    && (false == sta_ctx->conn_info.uIsAuthenticated)) {
 			staMac =
 				(uint8_t *) &(adapter->mac_addr.
@@ -574,7 +574,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 			pInfo->state = WIFI_AUTHENTICATING;
 		}
 		if (eConnectionState_Associated ==
-		    sta_ctx->conn_info.connState) {
+		    sta_ctx->conn_info.conn_state) {
 			pInfo->state = WIFI_ASSOCIATED;
 			qdf_copy_macaddr(&pInfo->bssid,
 					 &sta_ctx->conn_info.bssId);
@@ -4416,7 +4416,7 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy,
 		   TRACE_CODE_HDD_CFG80211_GET_STA,
 		   adapter->vdev_id, 0);
 
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		hdd_debug("Not associated");
 		/*To keep GUI happy */
 		return 0;
@@ -4976,7 +4976,7 @@ static bool hdd_is_rcpi_applicable(struct hdd_adapter *adapter,
 	if (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
 		hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-		if (hdd_sta_ctx->conn_info.connState !=
+		if (hdd_sta_ctx->conn_info.conn_state !=
 		    eConnectionState_Associated)
 			return false;
 
@@ -5208,7 +5208,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		hdd_debug("Not associated!, rssi on disconnect %d",
 			  adapter->rssi_on_disconnect);
 		*rssi_value = adapter->rssi_on_disconnect;
@@ -5305,7 +5305,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
 	hdd_ctx = WLAN_HDD_GET_CTX(adapter);
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		hdd_debug("Not associated!, rssi on disconnect %d",
 			adapter->rssi_on_disconnect);
 		*rssi_value = adapter->rssi_on_disconnect;
@@ -5576,7 +5576,7 @@ int wlan_hdd_get_link_speed(struct hdd_adapter *adapter, uint32_t *link_speed)
 		return -ENOTSUPP;
 	}
 
-	if (eConnectionState_Associated != hdd_stactx->conn_info.connState) {
+	if (eConnectionState_Associated != hdd_stactx->conn_info.conn_state) {
 		/* we are not connected so we don't have a classAstats */
 		*link_speed = 0;
 	} else {

core/hdd/src/wlan_hdd_tsf.c

@@ -77,7 +77,7 @@ enum hdd_tsf_get_state hdd_tsf_check_conn_state(struct hdd_adapter *adapter)
 	if (adapter->device_mode == QDF_STA_MODE ||
 			adapter->device_mode == QDF_P2P_CLIENT_MODE) {
 		hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-		if (hdd_sta_ctx->conn_info.connState !=
+		if (hdd_sta_ctx->conn_info.conn_state !=
 				eConnectionState_Associated) {
 			hdd_err("failed to cap tsf, not connect with ap");
 			ret = TSF_STA_NOT_CONNECTED_NO_TSF;
@@ -850,7 +850,7 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 				 "TSF sync is not initialized\n");
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	if (eConnectionState_Associated != hdd_sta_ctx->conn_info.connState &&
+	if (eConnectionState_Associated != hdd_sta_ctx->conn_info.conn_state &&
 	    (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE))
 		return scnprintf(buf, PAGE_SIZE, "NOT connected\n");
@@ -996,7 +996,7 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 				 "TSF sync is not initialized\n");
 
 	hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	if (eConnectionState_Associated != hdd_sta_ctx->conn_info.connState &&
+	if (eConnectionState_Associated != hdd_sta_ctx->conn_info.conn_state &&
 	    (adapter->device_mode == QDF_STA_MODE ||
 	    adapter->device_mode == QDF_P2P_CLIENT_MODE))
 		return scnprintf(buf, PAGE_SIZE, "NOT connected\n");

core/hdd/src/wlan_hdd_tx_rx.c

@@ -544,7 +544,7 @@ static void hdd_get_transmit_sta_id(struct hdd_adapter *adapter,
 			*station_id = sta_ctx->broadcast_staid;
 	} else {
 		/* For the rest, traffic is directed to AP/P2P GO */
-		if (eConnectionState_Associated == sta_ctx->conn_info.connState)
+		if (eConnectionState_Associated == sta_ctx->conn_info.conn_state)
 			*station_id = sta_ctx->conn_info.staId[0];
 	}
 }

core/hdd/src/wlan_hdd_wext.c

@@ -6964,7 +6964,7 @@ static int __iw_get_char_setnone(struct net_device *dev,
 					  "\n CSR State - %s"
 					  "\n CSR Substate - %s",
 					  hdd_connection_state_string
-						  (sta_ctx->conn_info.connState),
+						  (sta_ctx->conn_info.conn_state),
 					  mac_trace_get_neighbour_roam_state
 						  (sme_get_neighbor_roam_state
 							  (mac_handle, useAdapter->vdev_id)),
@@ -7375,10 +7375,10 @@ static int __iw_get_char_setnone(struct net_device *dev,
 		sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 		if (0 == hdd_ctx->config->fEnableSNRMonitoring ||
 		    eConnectionState_Associated !=
-		    sta_ctx->conn_info.connState) {
+		    sta_ctx->conn_info.conn_state) {
 			hdd_err("getSNR failed: Enable SNR Monitoring-%d, ConnectionState-%d",
 			       hdd_ctx->config->fEnableSNRMonitoring,
-			       sta_ctx->conn_info.connState);
+			       sta_ctx->conn_info.conn_state);
 			return -ENONET;
 		}
 		wlan_hdd_get_snr(adapter, &s7snr);
@@ -8322,7 +8322,7 @@ static int __iw_add_tspec(struct net_device *dev, struct iw_request_info *info,
 		return -EPERM;
 
 	/* we must be associated in order to add a tspec */
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		*pStatus = HDD_WLAN_WMM_STATUS_SETUP_FAILED_BAD_PARAM;
 		return 0;
 	}
@@ -8641,7 +8641,7 @@ static int __iw_set_fties(struct net_device *dev, struct iw_request_info *info,
 		return -EINVAL;
 	}
 	/* Added for debug on reception of Re-assoc Req. */
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		hdd_debug("Called with Ie of length = %d when not associated",
 		       wrqu->data.length);
 		hdd_debug("Should be Re-assoc Req IEs");
@@ -9197,7 +9197,7 @@ static int __iw_get_statistics(struct net_device *dev,
 		return ret;
 
 	sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-	if (eConnectionState_Associated != sta_ctx->conn_info.connState) {
+	if (eConnectionState_Associated != sta_ctx->conn_info.conn_state) {
 		wrqu->data.length = 0;
 		return 0;
 	}