qcacld-3.0: Rename staId in struct hdd_connection_info

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

Change-Id: Ied5e7a5e669c54d521d1bb7070f4a0fbd77efda4
CRs-Fixed: 2409879

core/hdd/inc/wlan_hdd_assoc.h

@@ -141,7 +141,7 @@ struct hdd_conn_flag {
  * @conn_state: connection state of the NIC
  * @bssid: BSSID
  * @SSID: SSID Info
- * @staId: Station ID
+ * @staid: Station ID
  * @peerMacAddress:Peer Mac Address of the IBSS Stations
  * @authType: Auth Type
  * @uc_encrypt_type: Unicast Encryption Type
@@ -176,7 +176,7 @@ struct hdd_connection_info {
 	eConnectionState conn_state;
 	struct qdf_mac_addr bssid;
 	tCsrSSIDInfo ssid;
-	uint8_t staId[MAX_PEERS];
+	uint8_t staid[MAX_PEERS];
 	struct qdf_mac_addr peerMacAddress[MAX_PEERS];
 	eCsrAuthType authType;
 	eCsrEncryptionType uc_encrypt_type;

core/hdd/src/wlan_hdd_assoc.c

@@ -976,13 +976,13 @@ hdd_conn_save_connect_info(struct hdd_adapter *adapter,
 
 			/*
 			 * Save the Station ID for this station from
-			 * the 'Roam Info'. For IBSS mode, staId is
+			 * the 'Roam Info'. For IBSS mode, staid is
 			 * assigned in NEW_PEER_IND. For reassoc,
 			 * the staID doesn't change and it may be invalid
 			 * in this structure so no change here.
 			 */
 			if (!roam_info->fReassocReq) {
-				sta_ctx->conn_info.staId[0] =
+				sta_ctx->conn_info.staid[0] =
 					roam_info->staId;
 			}
 		} else if (eCSR_BSS_TYPE_IBSS == bss_type) {
@@ -1533,8 +1533,8 @@ static void hdd_send_association_event(struct net_device *dev,
  */
 static void hdd_conn_remove_connect_info(struct hdd_station_ctx *sta_ctx)
 {
-	/* Remove staId, bssid and peerMacAddress */
-	sta_ctx->conn_info.staId[0] = HDD_WLAN_INVALID_STA_ID;
+	/* Remove staid, bssid and peerMacAddress */
+	sta_ctx->conn_info.staid[0] = HDD_WLAN_INVALID_STA_ID;
 	qdf_mem_zero(&sta_ctx->conn_info.bssid, QDF_MAC_ADDR_SIZE);
 	qdf_mem_zero(&sta_ctx->conn_info.peerMacAddress[0],
 		     QDF_MAC_ADDR_SIZE);
@@ -1727,10 +1727,10 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 				     WLAN_CONTROL_PATH);
 
 	if (ucfg_ipa_is_enabled() &&
-	    (sta_ctx->conn_info.staId[0] != HDD_WLAN_INVALID_STA_ID))
+	    (sta_ctx->conn_info.staid[0] != HDD_WLAN_INVALID_STA_ID))
 		ucfg_ipa_wlan_evt(hdd_ctx->pdev, adapter->dev,
 				  adapter->device_mode,
-				  sta_ctx->conn_info.staId[0],
+				  sta_ctx->conn_info.staid[0],
 				  adapter->vdev_id,
 				  WLAN_IPA_STA_DISCONNECT,
 				  sta_ctx->conn_info.bssid.bytes);
@@ -1829,9 +1829,9 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 		/* Clear all the peer sta register with TL. */
 		for (i = 0; i < MAX_PEERS; i++) {
 			if (HDD_WLAN_INVALID_STA_ID ==
-				sta_ctx->conn_info.staId[i])
+				sta_ctx->conn_info.staid[i])
 				continue;
-			sta_id = sta_ctx->conn_info.staId[i];
+			sta_id = sta_ctx->conn_info.staid[i];
 			hdd_debug("Deregister StaID %d", sta_id);
 			vstatus = hdd_roam_deregister_sta(adapter, sta_id);
 			if (!QDF_IS_STATUS_SUCCESS(vstatus)) {
@@ -1842,7 +1842,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 			/* set the staid and peer mac as 0, all other
 			 * reset are done in hdd_connRemoveConnectInfo.
 			 */
-			sta_ctx->conn_info.staId[i] =
+			sta_ctx->conn_info.staid[i] =
 						HDD_WLAN_INVALID_STA_ID;
 			qdf_mem_zero(&sta_ctx->conn_info.peerMacAddress[i],
 				sizeof(struct qdf_mac_addr));
@@ -1852,7 +1852,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 				hdd_debug("invalid sta_id %d", sta_id);
 		}
 	} else {
-		sta_id = sta_ctx->conn_info.staId[0];
+		sta_id = sta_ctx->conn_info.staid[0];
 		hdd_debug("roam_result: %d", roam_result);
 
 		/* clear scan cache for Link Lost */
@@ -2166,7 +2166,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 		hdd_objmgr_set_peer_mlme_auth_state(adapter->vdev, true);
 	} else {
 		hdd_debug("ULA auth StaId= %d. Changing TL state to CONNECTED at Join time",
-			 sta_ctx->conn_info.staId[0]);
+			 sta_ctx->conn_info.staid[0]);
 		qdf_status =
 			hdd_change_peer_state(adapter, staDesc.sta_id,
 						OL_TXRX_PEER_STATE_CONN,
@@ -2504,7 +2504,7 @@ static int hdd_change_sta_state_authenticated(struct hdd_adapter *adapter,
 	if (QDF_IBSS_MODE == adapter->device_mode)
 		staid = hdd_get_ibss_peer_staid(hddstactx, roaminfo);
 	else
-		staid = hddstactx->conn_info.staId[0];
+		staid = hddstactx->conn_info.staid[0];
 
 	hdd_debug("Changing Peer state to AUTHENTICATED for StaId = %d", staid);
 
@@ -3238,7 +3238,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 				 */
 				qdf_status = hdd_roam_register_sta(adapter,
 						roam_info,
-						sta_ctx->conn_info.staId[0],
+						sta_ctx->conn_info.staid[0],
 						roam_info->pBssDesc);
 				hdd_debug("Enabling queues");
 				wlan_hdd_netif_queue_control(adapter,
@@ -3266,7 +3266,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 			if (roam_info->fAuthRequired) {
 				qdf_status =
 					hdd_change_peer_state(adapter,
-						sta_ctx->conn_info.staId[0],
+						sta_ctx->conn_info.staid[0],
 						OL_TXRX_PEER_STATE_CONN,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 						roam_info->roamSynchInProgress
@@ -3280,10 +3280,10 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 							false);
 			} else {
 				hdd_debug("staid: %d Changing TL state to AUTHENTICATED",
-					 sta_ctx->conn_info.staId[0]);
+					 sta_ctx->conn_info.staid[0]);
 				qdf_status =
 					hdd_change_peer_state(adapter,
-						sta_ctx->conn_info.staId[0],
+						sta_ctx->conn_info.staid[0],
 						OL_TXRX_PEER_STATE_AUTH,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 						roam_info->roamSynchInProgress
@@ -3637,10 +3637,10 @@ bool hdd_save_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id,
 	int idx;
 
 	for (idx = 0; idx < SIR_MAX_NUM_STA_IN_IBSS; idx++) {
-		if (HDD_WLAN_INVALID_STA_ID == sta_ctx->conn_info.staId[idx]) {
+		if (HDD_WLAN_INVALID_STA_ID == sta_ctx->conn_info.staid[idx]) {
 			hdd_debug("adding peer: %pM, sta_id: %d, at idx: %d",
 				 peer_mac_addr, sta_id, idx);
-			sta_ctx->conn_info.staId[idx] = sta_id;
+			sta_ctx->conn_info.staid[idx] = sta_id;
 			qdf_copy_macaddr(
 				&sta_ctx->conn_info.peerMacAddress[idx],
 				peer_mac_addr);
@@ -3662,8 +3662,8 @@ void hdd_delete_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id)
 	int i;
 
 	for (i = 0; i < SIR_MAX_NUM_STA_IN_IBSS; i++) {
-		if (sta_id == sta_ctx->conn_info.staId[i]) {
-			sta_ctx->conn_info.staId[i] = HDD_WLAN_INVALID_STA_ID;
+		if (sta_id == sta_ctx->conn_info.staid[i]) {
+			sta_ctx->conn_info.staid[i] = HDD_WLAN_INVALID_STA_ID;
 			return;
 		}
 	}
@@ -3688,8 +3688,8 @@ static bool roam_remove_ibss_station(struct hdd_adapter *adapter, uint8_t staid)
 	struct hdd_station_ctx *sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 
 	for (idx = 0; idx < MAX_PEERS; idx++) {
-		if (staid == sta_ctx->conn_info.staId[idx]) {
-			sta_ctx->conn_info.staId[idx] =
+		if (staid == sta_ctx->conn_info.staid[idx]) {
+			sta_ctx->conn_info.staid[idx] =
 						HDD_WLAN_INVALID_STA_ID;
 
 			qdf_zero_macaddr(&sta_ctx->conn_info.
@@ -3705,7 +3705,7 @@ static bool roam_remove_ibss_station(struct hdd_adapter *adapter, uint8_t staid)
 
 			empty_slots++;
 		} else {
-			if (sta_ctx->conn_info.staId[idx] !=
+			if (sta_ctx->conn_info.staid[idx] !=
 					HDD_WLAN_INVALID_STA_ID) {
 				valid_idx = idx;
 			} else {
@@ -3724,16 +3724,16 @@ static bool roam_remove_ibss_station(struct hdd_adapter *adapter, uint8_t staid)
 	/* Find next active staid, to have a valid sta trigger for TL. */
 	if (fSuccess == true) {
 		if (del_idx == 0) {
-			if (sta_ctx->conn_info.staId[valid_idx] !=
+			if (sta_ctx->conn_info.staid[valid_idx] !=
 					HDD_WLAN_INVALID_STA_ID) {
-				sta_ctx->conn_info.staId[0] =
-					sta_ctx->conn_info.staId[valid_idx];
+				sta_ctx->conn_info.staid[0] =
+					sta_ctx->conn_info.staid[valid_idx];
 				qdf_copy_macaddr(&sta_ctx->conn_info.
 						 peerMacAddress[0],
 						 &sta_ctx->conn_info.
 						 peerMacAddress[valid_idx]);
 
-				sta_ctx->conn_info.staId[valid_idx] =
+				sta_ctx->conn_info.staid[valid_idx] =
 							HDD_WLAN_INVALID_STA_ID;
 				qdf_zero_macaddr(&sta_ctx->conn_info.
 						 peerMacAddress[valid_idx]);
@@ -4698,7 +4698,7 @@ hdd_sme_roam_callback(void *pContext, struct csr_roam_info *roam_info,
 				WLAN_STOP_ALL_NETIF_QUEUE,
 				WLAN_CONTROL_PATH);
 		status = hdd_roam_deregister_sta(adapter,
-					sta_ctx->conn_info.staId[0]);
+					sta_ctx->conn_info.staid[0]);
 		if (!QDF_IS_STATUS_SUCCESS(status))
 			qdf_ret_status = QDF_STATUS_E_FAILURE;
 		sta_ctx->ft_carrier_on = true;

core/hdd/src/wlan_hdd_ioctl.c

@@ -215,7 +215,7 @@ static int hdd_get_tsm_stats(struct hdd_adapter *adapter,
 	cookie = osif_request_cookie(request);
 
 	status = sme_get_tsm_stats(hdd_ctx->mac_handle, hdd_get_tsm_stats_cb,
-				   hdd_sta_ctx->conn_info.staId[0],
+				   hdd_sta_ctx->conn_info.staid[0],
 				   hdd_sta_ctx->conn_info.bssid,
 				   cookie, tid);
 	if (QDF_STATUS_SUCCESS != status) {

core/hdd/src/wlan_hdd_main.c

@@ -3834,7 +3834,7 @@ hdd_alloc_station_adapter(struct hdd_context *hdd_ctx, tSirMacAddr mac_addr,
 
 	qdf_mem_zero(adapter, sizeof(*adapter));
 	sta_ctx = &adapter->session.station;
-	qdf_mem_set(sta_ctx->conn_info.staId, sizeof(sta_ctx->conn_info.staId),
+	qdf_mem_set(sta_ctx->conn_info.staid, sizeof(sta_ctx->conn_info.staid),
 		    HDD_WLAN_INVALID_STA_ID);
 	adapter->dev = dev;
 	adapter->hdd_ctx = hdd_ctx;
@@ -4305,8 +4305,8 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
 
 	hdd_conn_set_connection_state(adapter, eConnectionState_NotConnected);
 
-	qdf_mem_set(sta_ctx->conn_info.staId,
-		sizeof(sta_ctx->conn_info.staId), HDD_WLAN_INVALID_STA_ID);
+	qdf_mem_set(sta_ctx->conn_info.staid,
+		sizeof(sta_ctx->conn_info.staid), HDD_WLAN_INVALID_STA_ID);
 
 	/* set fast roaming capability in sme session */
 	status = sme_config_fast_roaming(mac_handle, adapter->vdev_id,
@@ -5634,7 +5634,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx,
 		sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 		cdp_clear_peer(cds_get_context(QDF_MODULE_ID_SOC),
 			       cds_get_context(QDF_MODULE_ID_TXRX),
-			       sta_ctx->conn_info.staId[0]);
+			       sta_ctx->conn_info.staid[0]);
 		hdd_deregister_tx_flow_control(adapter);
 		hdd_vdev_destroy(adapter);
 		break;

core/hdd/src/wlan_hdd_ocb.c

@@ -255,12 +255,12 @@ static int hdd_ocb_register_sta(struct hdd_adapter *adapter)
 		return -EINVAL;
 	}
 
-	if (sta_ctx->conn_info.staId[0] != HDD_WLAN_INVALID_STA_ID &&
-	     sta_ctx->conn_info.staId[0] != peer_id) {
+	if (sta_ctx->conn_info.staid[0] != HDD_WLAN_INVALID_STA_ID &&
+	     sta_ctx->conn_info.staid[0] != peer_id) {
 		hdd_err("The ID for the OCB station has changed.");
 	}
 
-	sta_ctx->conn_info.staId[0] = peer_id;
+	sta_ctx->conn_info.staid[0] = peer_id;
 	qdf_copy_macaddr(&sta_ctx->conn_info.peerMacAddress[0],
 			 &adapter->mac_addr);
 

core/hdd/src/wlan_hdd_stats.c

@@ -5327,7 +5327,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
 	cookie = osif_request_cookie(request);
 
 	status = sme_get_rssi(hdd_ctx->mac_handle, hdd_get_rssi_cb,
-			      sta_ctx->conn_info.staId[0],
+			      sta_ctx->conn_info.staid[0],
 			      sta_ctx->conn_info.bssid, adapter->rssi,
 			      cookie);
 	if (QDF_STATUS_SUCCESS != status) {
@@ -5439,7 +5439,7 @@ QDF_STATUS wlan_hdd_get_snr(struct hdd_adapter *adapter, int8_t *snr)
 	cookie = osif_request_cookie(request);
 
 	status = sme_get_snr(hdd_ctx->mac_handle, hdd_get_snr_cb,
-			     sta_ctx->conn_info.staId[0],
+			     sta_ctx->conn_info.staid[0],
 			     sta_ctx->conn_info.bssid, cookie);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Unable to retrieve RSSI");
@@ -5889,7 +5889,7 @@ QDF_STATUS wlan_hdd_get_class_astats(struct hdd_adapter *adapter)
 	status = sme_get_statistics(adapter->hdd_ctx->mac_handle,
 				    eCSR_HDD, SME_GLOBAL_CLASSA_STATS,
 				    hdd_get_class_a_statistics_cb,
-				    sta_ctx->conn_info.staId[0],
+				    sta_ctx->conn_info.staid[0],
 				    cookie, adapter->vdev_id);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_warn("Unable to retrieve Class A statistics");
@@ -6074,7 +6074,7 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter)
 					    SME_GLOBAL_CLASSA_STATS |
 					    SME_PER_CHAIN_RSSI_STATS,
 				    hdd_get_station_statistics_cb,
-				    sta_ctx->conn_info.staId[0],
+				    sta_ctx->conn_info.staid[0],
 				    cookie,
 				    adapter->vdev_id);
 	if (QDF_IS_STATUS_ERROR(status)) {

core/hdd/src/wlan_hdd_tx_rx.c

@@ -545,7 +545,7 @@ static void hdd_get_transmit_sta_id(struct hdd_adapter *adapter,
 	} else {
 		/* For the rest, traffic is directed to AP/P2P GO */
 		if (eConnectionState_Associated == sta_ctx->conn_info.conn_state)
-			*station_id = sta_ctx->conn_info.staId[0];
+			*station_id = sta_ctx->conn_info.staid[0];
 	}
 }
 
@@ -1187,7 +1187,7 @@ QDF_STATUS hdd_get_peer_sta_id(struct hdd_station_ctx *sta_ctx,
 	for (idx = 0; idx < MAX_PEERS; idx++) {
 		if (!qdf_mem_cmp(&sta_ctx->conn_info.peerMacAddress[idx],
 				 mac_address, QDF_MAC_ADDR_SIZE)) {
-			*sta_id = sta_ctx->conn_info.staId[idx];
+			*sta_id = sta_ctx->conn_info.staid[idx];
 			return QDF_STATUS_SUCCESS;
 		}
 	}
@@ -1427,7 +1427,7 @@ int hdd_get_peer_idx(struct hdd_station_ctx *sta_ctx,
 	uint8_t idx;
 
 	for (idx = 0; idx < MAX_PEERS; idx++) {
-		if (sta_ctx->conn_info.staId[idx] == HDD_WLAN_INVALID_STA_ID)
+		if (sta_ctx->conn_info.staid[idx] == HDD_WLAN_INVALID_STA_ID)
 			continue;
 		if (qdf_mem_cmp(&sta_ctx->conn_info.peerMacAddress[idx],
 				addr, sizeof(struct qdf_mac_addr)))

core/hdd/src/wlan_hdd_wext.c

@@ -7214,12 +7214,12 @@ static int __iw_get_char_setnone(struct net_device *dev,
 
 		for (idx = 0; idx < MAX_PEERS; idx++) {
 			if (HDD_WLAN_INVALID_STA_ID !=
-					sta_ctx->conn_info.staId[idx]) {
+					sta_ctx->conn_info.staid[idx]) {
 				buf = snprintf
 					      ((extra + length),
 					      WE_MAX_STR_LEN - length,
 					      "\n%d .%02x:%02x:%02x:%02x:%02x:%02x\n",
-					      sta_ctx->conn_info.staId[idx],
+					      sta_ctx->conn_info.staid[idx],
 					      sta_ctx->conn_info.
 					      peerMacAddress[idx].bytes[0],
 					      sta_ctx->conn_info.
@@ -9140,7 +9140,7 @@ static int hdd_get_wlan_stats(struct hdd_adapter *adapter)
 				    SME_GLOBAL_CLASSA_STATS |
 				    SME_GLOBAL_CLASSD_STATS,
 				    hdd_statistics_cb,
-				    sta_ctx->conn_info.staId[0],
+				    sta_ctx->conn_info.staid[0],
 				    cookie, adapter->vdev_id);
 
 	if (QDF_STATUS_SUCCESS != status) {

core/hdd/src/wlan_hdd_wmm.c

@@ -162,7 +162,7 @@ static void hdd_wmm_enable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 	/* everything is in place to notify TL */
 	status =
 		sme_enable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR(adapter))->
-					   conn_info.staId[0], acType,
+					   conn_info.staid[0], acType,
 					   pAc->wmmAcTspecInfo.ts_info.tid,
 					   pAc->wmmAcTspecInfo.ts_info.up,
 					   service_interval, suspension_interval,
@@ -204,7 +204,7 @@ static void hdd_wmm_disable_tl_uapsd(struct hdd_wmm_qos_context *pQosContext)
 	if (pAc->wmmAcUapsdInfoValid == true) {
 		status =
 			sme_disable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
-							     (adapter))->conn_info.staId[0],
+							     (adapter))->conn_info.staid[0],
 						    acType, adapter->vdev_id);
 
 		if (!QDF_IS_STATUS_SUCCESS(status)) {
@@ -2056,7 +2056,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 
 		status = sme_enable_uapsd_for_ac(
 				(WLAN_HDD_GET_STATION_CTX_PTR(
-				adapter))->conn_info.staId[0],
+				adapter))->conn_info.staid[0],
 				SME_AC_VO, 7, 7, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
 				adapter->vdev_id,
@@ -2081,7 +2081,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 
 		status = sme_enable_uapsd_for_ac(
 				(WLAN_HDD_GET_STATION_CTX_PTR(
-				adapter))->conn_info.staId[0],
+				adapter))->conn_info.staid[0],
 				SME_AC_VI, 5, 5, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
 				adapter->vdev_id,
@@ -2106,7 +2106,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 
 		status = sme_enable_uapsd_for_ac(
 				(WLAN_HDD_GET_STATION_CTX_PTR(
-				adapter))->conn_info.staId[0],
+				adapter))->conn_info.staid[0],
 				SME_AC_BK, 2, 2, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
 				adapter->vdev_id,
@@ -2131,7 +2131,7 @@ QDF_STATUS hdd_wmm_assoc(struct hdd_adapter *adapter,
 
 		status = sme_enable_uapsd_for_ac(
 				(WLAN_HDD_GET_STATION_CTX_PTR(
-				adapter))->conn_info.staId[0],
+				adapter))->conn_info.staid[0],
 				SME_AC_BE, 3, 3, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
 				adapter->vdev_id,