qcacld-3.0: Rename HDD identifier staid

To improve code comprehension renamed HDD identifier staid to sta_id.

Change-Id: Iecde8b3f3410cac5d01f8fe2f9f2438a398e8e81
CRs-Fixed: 2409889

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
+ * @sta_id: Station ID
  * @peer_macaddr:Peer Mac Address of the IBSS Stations
  * @auth_type: Auth Type
  * @uc_encrypt_type: Unicast Encryption Type
@@ -175,7 +175,7 @@ struct hdd_connection_info {
 	eConnectionState conn_state;
 	struct qdf_mac_addr bssid;
 	tCsrSSIDInfo ssid;
-	uint8_t staid[MAX_PEERS];
+	uint8_t sta_id[MAX_PEERS];
 	struct qdf_mac_addr peer_macaddr[MAX_PEERS];
 	eCsrAuthType auth_type;
 	eCsrEncryptionType uc_encrypt_type;

core/hdd/inc/wlan_hdd_main.h

@@ -689,7 +689,7 @@ struct hdd_mon_set_ch_info {
  * @ibss_peer_info: information about the ibss peer
  * @hdd_reassoc_scenario: is station in the middle of reassociation?
  * @sta_debug_state: STA context debug variable
- * @broadcast_staid: STA ID assigned for broadcast frames
+ * @broadcast_sta_id: STA ID assigned for broadcast frames
  * @ch_info: monitor mode channel information
  * @ap_supports_immediate_power_save: Does the current AP allow our STA
  *    to immediately go into power save?
@@ -711,7 +711,7 @@ struct hdd_station_ctx {
 	tSirPeerInfoRspParams ibss_peer_info;
 	bool hdd_reassoc_scenario;
 	int sta_debug_state;
-	uint8_t broadcast_staid;
+	uint8_t broadcast_sta_id;
 	struct hdd_mon_set_ch_info ch_info;
 	bool ap_supports_immediate_power_save;
 };

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
-			 * assigned in NEW_PEER_IND. For reassoc,
-			 * the staID doesn't change and it may be invalid
+			 * the 'Roam Info'. For IBSS mode, sta_id is
+			 * assigned in NEW_PEER_IND. For reassoc, the
+			 * sta_id 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.sta_id[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 peer_macaddr */
-	sta_ctx->conn_info.staid[0] = HDD_WLAN_INVALID_STA_ID;
+	/* Remove sta_id, bssid and peer_macaddr */
+	sta_ctx->conn_info.sta_id[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.peer_macaddr[0],
 		     QDF_MAC_ADDR_SIZE);
@@ -1621,20 +1621,20 @@ static void hdd_clear_roam_profile_ie(struct hdd_adapter *adapter)
 /**
  * hdd_roam_deregister_sta() - deregister station
  * @adapter: pointer to adapter
- * @staid: station identifier
+ * @sta_id: station identifier
  *
  * Return: QDF_STATUS enumeration
  */
-QDF_STATUS hdd_roam_deregister_sta(struct hdd_adapter *adapter, uint8_t staid)
+QDF_STATUS hdd_roam_deregister_sta(struct hdd_adapter *adapter, uint8_t sta_id)
 {
 	QDF_STATUS qdf_status;
 
 	qdf_status = cdp_clear_peer(cds_get_context(QDF_MODULE_ID_SOC),
 			(struct cdp_pdev *)cds_get_context(QDF_MODULE_ID_TXRX),
-			staid);
+			sta_id);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-		hdd_err("cdp_clear_peer() failed for staid %d. Status(%d) [0x%08X]",
-			staid, qdf_status, qdf_status);
+		hdd_err("cdp_clear_peer() failed for sta_id %d. Status(%d) [0x%08X]",
+			sta_id, qdf_status, qdf_status);
 	}
 
 	return qdf_status;
@@ -1726,10 +1726,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.sta_id[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.sta_id[0],
 				  adapter->vdev_id,
 				  WLAN_IPA_STA_DISCONNECT,
 				  sta_ctx->conn_info.bssid.bytes);
@@ -1814,7 +1814,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 	if (eCSR_ROAM_IBSS_LEAVE == roam_status) {
 		uint8_t i;
 
-		sta_id = sta_ctx->broadcast_staid;
+		sta_id = sta_ctx->broadcast_sta_id;
 		vstatus = hdd_roam_deregister_sta(adapter, sta_id);
 		if (!QDF_IS_STATUS_SUCCESS(vstatus)) {
 			hdd_err("hdd_roam_deregister_sta() failed for staID %d Status: %d [0x%x]",
@@ -1828,9 +1828,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.sta_id[i])
 				continue;
-			sta_id = sta_ctx->conn_info.staid[i];
+			sta_id = sta_ctx->conn_info.sta_id[i];
 			hdd_debug("Deregister StaID %d", sta_id);
 			vstatus = hdd_roam_deregister_sta(adapter, sta_id);
 			if (!QDF_IS_STATUS_SUCCESS(vstatus)) {
@@ -1838,10 +1838,10 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 					sta_id, status, status);
 				status = QDF_STATUS_E_FAILURE;
 			}
-			/* set the staid and peer mac as 0, all other
+			/* set the sta_id and peer mac as 0, all other
 			 * reset are done in hdd_connRemoveConnectInfo.
 			 */
-			sta_ctx->conn_info.staid[i] =
+			sta_ctx->conn_info.sta_id[i] =
 						HDD_WLAN_INVALID_STA_ID;
 			qdf_mem_zero(&sta_ctx->conn_info.peer_macaddr[i],
 				sizeof(struct qdf_mac_addr));
@@ -1851,7 +1851,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.sta_id[0];
 		hdd_debug("roam_result: %d", roam_result);
 
 		/* clear scan cache for Link Lost */
@@ -2069,14 +2069,14 @@ QDF_STATUS hdd_update_dp_vdev_flags(void *cbk_data,
  * hdd_roam_register_sta() - register station
  * @adapter: pointer to adapter
  * @roam_info: pointer to roam info
- * @staid: station identifier
+ * @sta_id: station identifier
  * @pBssDesc: pointer to BSS description
  *
  * Return: QDF_STATUS enumeration
  */
 QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 					struct csr_roam_info *roam_info,
-					uint8_t staid,
+					uint8_t sta_id,
 					struct bss_description *pBssDesc)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
@@ -2090,7 +2090,7 @@ QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 		return QDF_STATUS_E_FAILURE;
 
 	/* Get the Station ID from the one saved during the association */
-	staDesc.sta_id = staid;
+	staDesc.sta_id = sta_id;
 
 	/* set the QoS field appropriately */
 	if (hdd_wmm_is_active(adapter))
@@ -2165,7 +2165,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.sta_id[0]);
 		qdf_status =
 			hdd_change_peer_state(adapter, staDesc.sta_id,
 						OL_TXRX_PEER_STATE_CONN,
@@ -2443,34 +2443,35 @@ bool hdd_is_roam_sync_in_progress(struct csr_roam_info *roaminfo)
 #endif
 
 /**
- * hdd_get_ibss_peer_staid() - get sta id for IBSS peer
+ * hdd_get_ibss_peer_sta_id() - get sta id for IBSS peer
  * @hddstactx: pointer to HDD sta context
  * @roaminfo: pointer to roaminfo structure
  *
- * This function returns staid for IBSS peer. If peer is broadcast
- * MAC address return self staid(0) else find the peer sta id of
+ * This function returns sta_id for IBSS peer. If peer is broadcast
+ * MAC address return self sta_id(0) else find the peer sta id of
  * the peer.
  *
  * Return: sta_id (HDD_WLAN_INVALID_STA_ID if peer not found).
  */
-static uint8_t hdd_get_ibss_peer_staid(struct hdd_station_ctx *hddstactx,
-				       struct csr_roam_info *roaminfo)
+static uint8_t hdd_get_ibss_peer_sta_id(struct hdd_station_ctx *hddstactx,
+					struct csr_roam_info *roaminfo)
 {
-	uint8_t staid = HDD_WLAN_INVALID_STA_ID;
+	uint8_t sta_id = HDD_WLAN_INVALID_STA_ID;
 	QDF_STATUS status;
 
 	if (qdf_is_macaddr_broadcast(&roaminfo->peerMac)) {
-		staid = 0;
+		sta_id = 0;
 	} else {
 		status = hdd_get_peer_sta_id(hddstactx,
-				&roaminfo->peerMac, &staid);
+				&roaminfo->peerMac, &sta_id);
 		if (status != QDF_STATUS_SUCCESS) {
-			hdd_err("Unable to find staid for " MAC_ADDRESS_STR,
-			    MAC_ADDR_ARRAY(roaminfo->peerMac.bytes));
+			hdd_err("Unable to find station ID for "
+				MAC_ADDRESS_STR,
+				MAC_ADDR_ARRAY(roaminfo->peerMac.bytes));
 		}
 	}
 
-	return staid;
+	return sta_id;
 }
 
 /**
@@ -2489,7 +2490,7 @@ static int hdd_change_sta_state_authenticated(struct hdd_adapter *adapter,
 {
 	QDF_STATUS status;
 	uint32_t timeout, auto_bmps_timer_val;
-	uint8_t staid = HDD_WLAN_INVALID_STA_ID;
+	uint8_t sta_id = HDD_WLAN_INVALID_STA_ID;
 	struct hdd_station_ctx *hddstactx =
 		WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 	struct hdd_context *hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -2501,17 +2502,18 @@ static int hdd_change_sta_state_authenticated(struct hdd_adapter *adapter,
 		(auto_bmps_timer_val * 1000);
 
 	if (QDF_IBSS_MODE == adapter->device_mode)
-		staid = hdd_get_ibss_peer_staid(hddstactx, roaminfo);
+		sta_id = hdd_get_ibss_peer_sta_id(hddstactx, roaminfo);
 	else
-		staid = hddstactx->conn_info.staid[0];
+		sta_id = hddstactx->conn_info.sta_id[0];
 
-	hdd_debug("Changing Peer state to AUTHENTICATED for StaId = %d", staid);
+	hdd_debug("Changing Peer state to AUTHENTICATED for StaId = %d",
+		  sta_id);
 
 	/* Connections that do not need Upper layer authentication,
 	 * transition TL to 'Authenticated' state after the keys are set
 	 */
-	status = hdd_change_peer_state(adapter, staid, OL_TXRX_PEER_STATE_AUTH,
-			hdd_is_roam_sync_in_progress(roaminfo));
+	status = hdd_change_peer_state(adapter, sta_id, OL_TXRX_PEER_STATE_AUTH,
+				       hdd_is_roam_sync_in_progress(roaminfo));
 	hdd_conn_set_authenticated(adapter, true);
 	hdd_objmgr_set_peer_mlme_auth_state(adapter->vdev, true);
 
@@ -3237,7 +3239,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.sta_id[0],
 						roam_info->pBssDesc);
 				hdd_debug("Enabling queues");
 				wlan_hdd_netif_queue_control(adapter,
@@ -3265,7 +3267,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.sta_id[0],
 						OL_TXRX_PEER_STATE_CONN,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 						roam_info->roamSynchInProgress
@@ -3278,11 +3280,11 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 							adapter->vdev,
 							false);
 			} else {
-				hdd_debug("staid: %d Changing TL state to AUTHENTICATED",
-					 sta_ctx->conn_info.staid[0]);
+				hdd_debug("sta_id: %d Changing TL state to AUTHENTICATED",
+					  sta_ctx->conn_info.sta_id[0]);
 				qdf_status =
 					hdd_change_peer_state(adapter,
-						sta_ctx->conn_info.staid[0],
+						sta_ctx->conn_info.sta_id[0],
 						OL_TXRX_PEER_STATE_AUTH,
 #ifdef WLAN_FEATURE_ROAM_OFFLOAD
 						roam_info->roamSynchInProgress
@@ -3527,7 +3529,7 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
 		hdd_wmm_connect(adapter, roam_info,
 				eCSR_BSS_TYPE_IBSS);
 
-		hdd_sta_ctx->broadcast_staid = roam_info->staId;
+		hdd_sta_ctx->broadcast_sta_id = roam_info->staId;
 
 		if (roam_info->staId < HDD_MAX_ADAPTERS)
 			hdd_ctx->sta_to_adapter[roam_info->staId] =
@@ -3636,10 +3638,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.sta_id[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.sta_id[idx] = sta_id;
 			qdf_copy_macaddr(
 				&sta_ctx->conn_info.peer_macaddr[idx],
 				peer_mac_addr);
@@ -3661,8 +3663,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.sta_id[i]) {
+			sta_ctx->conn_info.sta_id[i] = HDD_WLAN_INVALID_STA_ID;
 			return;
 		}
 	}
@@ -3671,13 +3673,14 @@ void hdd_delete_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id)
 /**
  * roam_remove_ibss_station() - Remove the IBSS peer MAC address in the adapter
  * @adapter: pointer to adapter
- * @staid: station id
+ * @sta_id: station id
  *
  * Return:
  *	true if we remove MAX_PEERS or less STA
  *	false otherwise.
  */
-static bool roam_remove_ibss_station(struct hdd_adapter *adapter, uint8_t staid)
+static bool roam_remove_ibss_station(struct hdd_adapter *adapter,
+				     uint8_t sta_id)
 {
 	bool fSuccess = false;
 	int idx = 0;
@@ -3687,8 +3690,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 (sta_id == sta_ctx->conn_info.sta_id[idx]) {
+			sta_ctx->conn_info.sta_id[idx] =
 						HDD_WLAN_INVALID_STA_ID;
 
 			qdf_zero_macaddr(&sta_ctx->conn_info.
@@ -3704,7 +3707,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.sta_id[idx] !=
 					HDD_WLAN_INVALID_STA_ID) {
 				valid_idx = idx;
 			} else {
@@ -3720,19 +3723,19 @@ static bool roam_remove_ibss_station(struct hdd_adapter *adapter, uint8_t staid)
 				eConnectionState_IbssDisconnected);
 		hdd_debug("Last IBSS Peer Departed!!!");
 	}
-	/* Find next active staid, to have a valid sta trigger for TL. */
+	/* Find next active sta_id, 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.sta_id[valid_idx] !=
 					HDD_WLAN_INVALID_STA_ID) {
-				sta_ctx->conn_info.staid[0] =
-					sta_ctx->conn_info.staid[valid_idx];
+				sta_ctx->conn_info.sta_id[0] =
+					sta_ctx->conn_info.sta_id[valid_idx];
 				qdf_copy_macaddr(&sta_ctx->conn_info.
 						 peer_macaddr[0],
 						 &sta_ctx->conn_info.
 						 peer_macaddr[valid_idx]);
 
-				sta_ctx->conn_info.staid[valid_idx] =
+				sta_ctx->conn_info.sta_id[valid_idx] =
 							HDD_WLAN_INVALID_STA_ID;
 				qdf_zero_macaddr(&sta_ctx->conn_info.
 						 peer_macaddr[valid_idx]);
@@ -4013,7 +4016,7 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
 
 #ifdef FEATURE_WLAN_TDLS
 QDF_STATUS hdd_roam_register_tdlssta(struct hdd_adapter *adapter,
-				     const uint8_t *peerMac, uint16_t staid,
+				     const uint8_t *peerMac, uint16_t sta_id,
 				     uint8_t qos)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
@@ -4026,7 +4029,7 @@ QDF_STATUS hdd_roam_register_tdlssta(struct hdd_adapter *adapter,
 	 * TDLS sta in BSS should be set as STA type TDLS and STA MAC should
 	 * be peer MAC, here we are working on direct Link
 	 */
-	staDesc.sta_id = staid;
+	staDesc.sta_id = sta_id;
 
 	/* set the QoS field appropriately .. */
 	staDesc.is_qos_enabled = qos;
@@ -4057,18 +4060,18 @@ QDF_STATUS hdd_roam_register_tdlssta(struct hdd_adapter *adapter,
 /**
  * hdd_roam_deregister_tdlssta() - deregister new TDLS station
  * @adapter: pointer to adapter
- * @staid: station identifier
+ * @sta_id: station identifier
  *
  * Return: QDF_STATUS enumeration
  */
 QDF_STATUS hdd_roam_deregister_tdlssta(struct hdd_adapter *adapter,
-				       uint8_t staid)
+				       uint8_t sta_id)
 {
 	QDF_STATUS qdf_status;
 
 	qdf_status = cdp_clear_peer(cds_get_context(QDF_MODULE_ID_SOC),
 			(struct cdp_pdev *)cds_get_context(QDF_MODULE_ID_TXRX),
-			staid);
+			sta_id);
 
 	return qdf_status;
 }
@@ -4076,7 +4079,7 @@ QDF_STATUS hdd_roam_deregister_tdlssta(struct hdd_adapter *adapter,
 #else
 
 inline QDF_STATUS hdd_roam_deregister_tdlssta(struct hdd_adapter *adapter,
-					      uint8_t staid)
+					      uint8_t sta_id)
 {
 	return QDF_STATUS_SUCCESS;
 }
@@ -4697,7 +4700,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.sta_id[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_cfg80211.c

@@ -18884,7 +18884,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
 	struct hdd_hostapd_state *hapd_state;
 	int status;
-	uint8_t staid;
+	uint8_t sta_id;
 	uint8_t *mac;
 	mac_handle_t mac_handle;
 
@@ -18963,7 +18963,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 			qdf_status =
 				hdd_softap_get_sta_id(adapter,
 					      (struct qdf_mac_addr *) mac,
-					      &staid);
+					      &sta_id);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 				hdd_debug("Skip DEL STA as this is not used::"
 					  MAC_ADDRESS_STR,
@@ -18971,7 +18971,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 				return -ENOENT;
 			}
 
-			if (adapter->sta_info[staid].is_deauth_in_progress ==
+			if (adapter->sta_info[sta_id].is_deauth_in_progress ==
 			    true) {
 				hdd_debug("Skip DEL STA as deauth is in progress::"
 					  MAC_ADDRESS_STR,
@@ -18979,7 +18979,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 				return -ENOENT;
 			}
 
-			adapter->sta_info[staid].is_deauth_in_progress = true;
+			adapter->sta_info[sta_id].is_deauth_in_progress = true;
 
 			hdd_debug("Delete STA with MAC::" MAC_ADDRESS_STR,
 			       MAC_ADDR_ARRAY(mac));
@@ -19002,7 +19002,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 			qdf_status = hdd_softap_sta_deauth(adapter,
 							   pDelStaParams);
 			if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-				adapter->sta_info[staid].is_deauth_in_progress =
+				adapter->sta_info[sta_id].is_deauth_in_progress =
 					false;
 				hdd_debug("STA removal failed for ::"
 					  MAC_ADDRESS_STR,

core/hdd/src/wlan_hdd_hostapd.c

@@ -1529,7 +1529,7 @@ static void hdd_fill_station_info(struct hdd_adapter *adapter,
 	}
 
 	if ((i == WLAN_MAX_STA_COUNT) && oldest_disassoc_sta_ts) {
-		hdd_debug("reached max cached staid, removing oldest stainfo");
+		hdd_debug("reached max cached sta_id, removing oldest stainfo");
 		i = oldest_disassoc_sta_idx;
 	}
 	if (i < WLAN_MAX_STA_COUNT) {
@@ -1539,7 +1539,7 @@ static void hdd_fill_station_info(struct hdd_adapter *adapter,
 				     stainfo, sizeof(struct hdd_station_info));
 
 	} else {
-		hdd_debug("reached max staid, stainfo can't be cached");
+		hdd_debug("reached max sta_id, stainfo can't be cached");
 	}
 
 	hdd_debug("cap %d %d %d %d %d %d %d %d %d %x %d",
@@ -1671,7 +1671,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 	uint8_t *we_custom_event_generic = NULL;
 	int we_event = 0;
 	int i = 0;
-	uint8_t staid;
+	uint8_t sta_id;
 	QDF_STATUS qdf_status;
 	bool bAuthRequired = true;
 	char unknownSTAEvent[IW_CUSTOM_MAX + 1];
@@ -1739,7 +1739,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 	mac_handle = hdd_ctx->mac_handle;
 	dfs_info.channel = ap_ctx->operating_channel;
 	sme_get_country_code(mac_handle, dfs_info.country_code, &cc_len);
-	staid = pSapEvent->sapevt.sapStartBssCompleteEvent.staId;
+	sta_id = pSapEvent->sapevt.sapStartBssCompleteEvent.staId;
 	sap_config = &adapter->session.ap.sap_config;
 
 	switch (sapEvent) {
@@ -2186,11 +2186,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 				       MAC_ADDR_ARRAY(wrqu.addr.sa_data));
 		}
 
-		staid = event->staId;
+		sta_id = event->staId;
 		if (QDF_IS_STATUS_SUCCESS(qdf_status))
 			hdd_fill_station_info(adapter, event);
 
-		adapter->sta_info[staid].ecsa_capable = event->ecsa_capable;
+		adapter->sta_info[sta_id].ecsa_capable = event->ecsa_capable;
 
 		if (ucfg_ipa_is_enabled()) {
 			status = ucfg_ipa_wlan_evt(hdd_ctx->pdev,
@@ -2317,7 +2317,7 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			hdd_softap_get_sta_id(adapter,
 					      &pSapEvent->sapevt.
 					      sapStationDisassocCompleteEvent.staMac,
-					      &staid);
+					      &sta_id);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 			hdd_err("Failed to find sta id status: %d", qdf_status);
 			return QDF_STATUS_E_FAILURE;
@@ -2335,11 +2335,11 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 			stainfo->dhcp_phase = DHCP_PHASE_ACK;
 			if (stainfo->dhcp_nego_status ==
 						DHCP_NEGO_IN_PROGRESS)
-				hdd_post_dhcp_ind(adapter, staid,
+				hdd_post_dhcp_ind(adapter, sta_id,
 						  WMA_DHCP_STOP_IND);
 			stainfo->dhcp_nego_status = DHCP_NEGO_STOP;
 		}
-		hdd_softap_deregister_sta(adapter, staid);
+		hdd_softap_deregister_sta(adapter, sta_id);
 
 		ap_ctx->ap_active = false;
 		spin_lock_bh(&adapter->sta_info_lock);

core/hdd/src/wlan_hdd_ioctl.c

@@ -165,7 +165,7 @@ struct tsm_priv {
 };
 
 static void hdd_get_tsm_stats_cb(tAniTrafStrmMetrics tsm_metrics,
-				 const uint32_t staid, void *context)
+				 const uint32_t sta_id, void *context)
 {
 	struct osif_request *request;
 	struct tsm_priv *priv;
@@ -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.sta_id[0],
 				   hdd_sta_ctx->conn_info.bssid,
 				   cookie, tid);
 	if (QDF_STATUS_SUCCESS != status) {
@@ -331,14 +331,14 @@ QDF_STATUS hdd_cfg80211_get_ibss_peer_info_all(struct hdd_adapter *adapter)
 /**
  * hdd_cfg80211_get_ibss_peer_info() - get ibss peer info
  * @adapter:	Adapter context
- * @staid:	Sta index for which the peer info is requested
+ * @sta_id:	Sta index for which the peer info is requested
  *
  * Request function to get IBSS peer info from lower layers
  *
  * Return: 0 for success non-zero for failure
  */
 static QDF_STATUS
-hdd_cfg80211_get_ibss_peer_info(struct hdd_adapter *adapter, uint8_t staid)
+hdd_cfg80211_get_ibss_peer_info(struct hdd_adapter *adapter, uint8_t sta_id)
 {
 	unsigned long rc;
 	QDF_STATUS status;
@@ -348,7 +348,7 @@ hdd_cfg80211_get_ibss_peer_info(struct hdd_adapter *adapter, uint8_t staid)
 	status = sme_request_ibss_peer_info(adapter->hdd_ctx->mac_handle,
 					    adapter,
 					    hdd_get_ibss_peer_info_cb,
-					    false, staid);
+					    false, sta_id);
 
 	if (QDF_STATUS_SUCCESS == status) {
 		rc = wait_for_completion_timeout(
@@ -5239,7 +5239,7 @@ static int drv_cmd_get_ibss_peer_info(struct hdd_adapter *adapter,
 	struct hdd_station_ctx *sta_ctx = NULL;
 	char extra[128] = { 0 };
 	uint32_t length = 0;
-	uint8_t staid = 0;
+	uint8_t sta_id = 0;
 	struct qdf_mac_addr peer_macaddr;
 
 	if (QDF_IBSS_MODE != adapter->device_mode) {
@@ -5270,16 +5270,16 @@ static int drv_cmd_get_ibss_peer_info(struct hdd_adapter *adapter,
 	}
 
 	/* Get station index for the peer mac address and sanitize it */
-	hdd_get_peer_sta_id(sta_ctx, &peer_macaddr, &staid);
+	hdd_get_peer_sta_id(sta_ctx, &peer_macaddr, &sta_id);
 
-	if (staid > MAX_PEERS) {
-		hdd_err("Invalid StaIdx %d returned", staid);
+	if (sta_id > MAX_PEERS) {
+		hdd_err("Invalid StaIdx %d returned", sta_id);
 		ret = -EINVAL;
 		goto exit;
 	}
 
 	/* Handle the command */
-	status = hdd_cfg80211_get_ibss_peer_info(adapter, staid);
+	status = hdd_cfg80211_get_ibss_peer_info(adapter, sta_id);
 	if (QDF_STATUS_SUCCESS == status) {
 		uint32_t tx_rate =
 			sta_ctx->ibss_peer_info.peerInfoParams[0].txRate;

core/hdd/src/wlan_hdd_ipa.c

@@ -403,7 +403,7 @@ void hdd_ipa_send_skb_to_network(qdf_nbuf_t skb, qdf_netdev_t dev)
 	struct hdd_adapter *adapter = (struct hdd_adapter *) netdev_priv(dev);
 	int result;
 	unsigned int cpu_index;
-	uint8_t staid;
+	uint8_t sta_id;
 	uint32_t enabled;
 
 	if (hdd_validate_adapter(adapter)) {
@@ -423,8 +423,8 @@ void hdd_ipa_send_skb_to_network(qdf_nbuf_t skb, qdf_netdev_t dev)
 			(struct qdf_mac_addr *)(skb->data +
 			QDF_NBUF_SRC_MAC_OFFSET);
 		if (QDF_STATUS_SUCCESS ==
-			hdd_softap_get_sta_id(adapter, src_mac, &staid))
-			hdd_inspect_dhcp_packet(adapter, staid, skb, QDF_RX);
+			hdd_softap_get_sta_id(adapter, src_mac, &sta_id))
+			hdd_inspect_dhcp_packet(adapter, sta_id, skb, QDF_RX);
 	}
 
 	/*

core/hdd/src/wlan_hdd_main.c

@@ -3834,7 +3834,8 @@ 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.sta_id,
+		    sizeof(sta_ctx->conn_info.sta_id),
 		    HDD_WLAN_INVALID_STA_ID);
 	adapter->dev = dev;
 	adapter->hdd_ctx = hdd_ctx;
@@ -4305,8 +4306,9 @@ 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.sta_id,
+		    sizeof(sta_ctx->conn_info.sta_id),
+		    HDD_WLAN_INVALID_STA_ID);
 
 	/* set fast roaming capability in sme session */
 	status = sme_config_fast_roaming(mac_handle, adapter->vdev_id,
@@ -5634,7 +5636,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.sta_id[0]);
 		hdd_deregister_tx_flow_control(adapter);
 		hdd_vdev_destroy(adapter);
 		break;

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -632,8 +632,8 @@ int hdd_ndi_delete(uint8_t vdev_id, char *iface_name, uint16_t transaction_id)
 	}
 
 	/* Since, the interface is being deleted, remove the broadcast id. */
-	hdd_ctx->sta_to_adapter[sta_ctx->broadcast_staid] = 0;
-	sta_ctx->broadcast_staid = HDD_WLAN_INVALID_STA_ID;
+	hdd_ctx->sta_to_adapter[sta_ctx->broadcast_sta_id] = 0;
+	sta_ctx->broadcast_sta_id = HDD_WLAN_INVALID_STA_ID;
 
 	os_if_nan_set_ndp_delete_transaction_id(adapter->vdev,
 						transaction_id);
@@ -694,12 +694,12 @@ void hdd_ndi_drv_ndi_create_rsp_handler(uint8_t vdev_id,
 			ndi_rsp->reason /* create_reason */);
 	}
 
-	sta_ctx->broadcast_staid = ndi_rsp->sta_id;
-	hdd_save_peer(sta_ctx, sta_ctx->broadcast_staid, &bc_mac_addr);
+	sta_ctx->broadcast_sta_id = ndi_rsp->sta_id;
+	hdd_save_peer(sta_ctx, sta_ctx->broadcast_sta_id, &bc_mac_addr);
 	hdd_roam_register_sta(adapter, roam_info,
-			      sta_ctx->broadcast_staid,
+			      sta_ctx->broadcast_sta_id,
 			      &tmp_bss_descp);
-	hdd_ctx->sta_to_adapter[sta_ctx->broadcast_staid] = adapter;
+	hdd_ctx->sta_to_adapter[sta_ctx->broadcast_sta_id] = adapter;
 	qdf_mem_free(roam_info);
 }
 
@@ -747,10 +747,10 @@ void hdd_ndi_drv_ndi_delete_rsp_handler(uint8_t vdev_id)
 		return;
 	}
 
-	hdd_ctx->sta_to_adapter[sta_ctx->broadcast_staid] = NULL;
-	hdd_roam_deregister_sta(adapter, sta_ctx->broadcast_staid);
-	hdd_delete_peer(sta_ctx, sta_ctx->broadcast_staid);
-	sta_ctx->broadcast_staid = HDD_WLAN_INVALID_STA_ID;
+	hdd_ctx->sta_to_adapter[sta_ctx->broadcast_sta_id] = NULL;
+	hdd_roam_deregister_sta(adapter, sta_ctx->broadcast_sta_id);
+	hdd_delete_peer(sta_ctx, sta_ctx->broadcast_sta_id);
+	sta_ctx->broadcast_sta_id = HDD_WLAN_INVALID_STA_ID;
 
 	wlan_hdd_netif_queue_control(adapter,
 				     WLAN_STOP_ALL_NETIF_QUEUE_N_CARRIER,

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.sta_id[0] != HDD_WLAN_INVALID_STA_ID &&
+	    sta_ctx->conn_info.sta_id[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.sta_id[0] = peer_id;
 	qdf_copy_macaddr(&sta_ctx->conn_info.peer_macaddr[0],
 			 &adapter->mac_addr);
 

core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -633,7 +633,7 @@ static netdev_tx_t __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 	if (adapter->tx_fn(adapter->txrx_vdev,
 		 (qdf_nbuf_t)skb) != NULL) {
 		QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA, QDF_TRACE_LEVEL_INFO_HIGH,
-			  "%s: Failed to send packet to txrx for staid:%d",
+			  "%s: Failed to send packet to txrx for sta_id:%d",
 			  __func__, sta_id);
 		++adapter->hdd_stats.tx_rx_stats.tx_dropped_ac[ac];
 		goto drop_pkt_and_release_skb;
@@ -841,7 +841,7 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *adapter_context, qdf_nbuf_t rx_buf)
 	struct sk_buff *next = NULL;
 	struct hdd_context *hdd_ctx = NULL;
 	struct qdf_mac_addr *src_mac;
-	uint8_t staid;
+	uint8_t sta_id;
 
 	/* Sanity check on inputs */
 	if (unlikely((!adapter_context) || (!rx_buf))) {
@@ -898,13 +898,13 @@ QDF_STATUS hdd_softap_rx_packet_cbk(void *adapter_context, qdf_nbuf_t rx_buf)
 		src_mac = (struct qdf_mac_addr *)(skb->data +
 						  QDF_NBUF_SRC_MAC_OFFSET);
 		if (QDF_STATUS_SUCCESS ==
-			hdd_softap_get_sta_id(adapter, src_mac, &staid)) {
-			if (staid < WLAN_MAX_STA_COUNT) {
-				adapter->sta_info[staid].rx_packets++;
-				adapter->sta_info[staid].rx_bytes += skb->len;
-				adapter->sta_info[staid].last_tx_rx_ts =
+			hdd_softap_get_sta_id(adapter, src_mac, &sta_id)) {
+			if (sta_id < WLAN_MAX_STA_COUNT) {
+				adapter->sta_info[sta_id].rx_packets++;
+				adapter->sta_info[sta_id].rx_bytes += skb->len;
+				adapter->sta_info[sta_id].last_tx_rx_ts =
 					qdf_system_ticks();
-				hdd_inspect_dhcp_packet(adapter, staid,
+				hdd_inspect_dhcp_packet(adapter, sta_id,
 							skb, QDF_RX);
 			}
 		}

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.sta_id[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.sta_id[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.sta_id[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.sta_id[0],
 				    cookie,
 				    adapter->vdev_id);
 	if (QDF_IS_STATUS_ERROR(status)) {

core/hdd/src/wlan_hdd_tx_rx.c

@@ -541,11 +541,11 @@ static void hdd_get_transmit_sta_id(struct hdd_adapter *adapter,
 		 * overwritten for UC traffic in IBSS or NDI mode
 		 */
 		if (mcbc_addr)
-			*station_id = sta_ctx->broadcast_staid;
+			*station_id = sta_ctx->broadcast_sta_id;
 	} 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.sta_id[0];
 	}
 }
 
@@ -618,7 +618,7 @@ static inline bool hdd_is_tx_allowed(struct sk_buff *skb, uint8_t peer_id)
 	peer = cdp_peer_find_by_local_id(soc, pdev, peer_id);
 
 	if (peer == NULL) {
-		hdd_err_rl("Unable to find peer entry for staid: %d", peer_id);
+		hdd_err_rl("Unable to find peer entry for sta_id: %d", peer_id);
 		return false;
 	}
 
@@ -1120,7 +1120,7 @@ static netdev_tx_t __hdd_hard_start_xmit(struct sk_buff *skb,
 	if (adapter->tx_fn(adapter->txrx_vdev,
 		 (qdf_nbuf_t)skb) != NULL) {
 		QDF_TRACE(QDF_MODULE_ID_HDD_DATA, QDF_TRACE_LEVEL_INFO_HIGH,
-			  "%s: Failed to send packet to txrx for staid: %d",
+			  "%s: Failed to send packet to txrx for sta_id: %d",
 			  __func__, STAId);
 		++adapter->hdd_stats.tx_rx_stats.tx_dropped_ac[ac];
 		goto drop_pkt_and_release_skb;
@@ -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.peer_macaddr[idx],
 				 mac_address, QDF_MAC_ADDR_SIZE)) {
-			*sta_id = sta_ctx->conn_info.staid[idx];
+			*sta_id = sta_ctx->conn_info.sta_id[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.sta_id[idx] == HDD_WLAN_INVALID_STA_ID)
 			continue;
 		if (qdf_mem_cmp(&sta_ctx->conn_info.peer_macaddr[idx],
 				addr, sizeof(struct qdf_mac_addr)))

core/hdd/src/wlan_hdd_wext.c

@@ -2215,9 +2215,9 @@
  * <ioctl>
  * ibssPeerInfo - Print the ibss peers's MAC, rate and RSSI
  *
- * @INPUT: staid
+ * @INPUT: sta_id
  *
- * @OUTPUT: print ibss peer corresponding to staid in info logs
+ * @OUTPUT: print ibss peer corresponding to sta_id in info logs
  *  PEER ADDR : 8c:fd:f0:01:9c:bf TxRate: 1 Mbps RSSI: -35
  *
  * This IOCTL is used to print the specific ibss peers's MAC,
@@ -3391,13 +3391,13 @@ int hdd_wlan_dump_stats(struct hdd_adapter *adapter, int value)
 /**
  * hdd_wlan_get_ibss_peer_info() - Print IBSS peer information
  * @adapter: Adapter upon which the IBSS client is active
- * @staid: Station index of the IBSS peer
+ * @sta_id: Station index of the IBSS peer
  *
  * Return: QDF_STATUS_STATUS if the peer was found and displayed,
  * otherwise an appropriate QDF_STATUS_E_* failure code.
  */
 static QDF_STATUS hdd_wlan_get_ibss_peer_info(struct hdd_adapter *adapter,
-					      uint8_t staid)
+					      uint8_t sta_id)
 {
 	QDF_STATUS status = QDF_STATUS_E_FAILURE;
 	mac_handle_t mac_handle = adapter->hdd_ctx->mac_handle;
@@ -3407,7 +3407,7 @@ static QDF_STATUS hdd_wlan_get_ibss_peer_info(struct hdd_adapter *adapter,
 	INIT_COMPLETION(adapter->ibss_peer_info_comp);
 	status = sme_request_ibss_peer_info(mac_handle, adapter,
 					    hdd_get_ibss_peer_info_cb,
-					    false, staid);
+					    false, sta_id);
 
 	if (QDF_STATUS_SUCCESS == status) {
 		unsigned long rc;
@@ -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.sta_id[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.sta_id[idx],
 					      sta_ctx->conn_info.
 					      peer_macaddr[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.sta_id[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 *qos_context)
 	/* 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.sta_id[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 *qos_context)
 	if (pAc->wmmAcUapsdInfoValid == true) {
 		status =
 			sme_disable_uapsd_for_ac((WLAN_HDD_GET_STATION_CTX_PTR
-							     (adapter))->conn_info.staid[0],
+							     (adapter))->conn_info.sta_id[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.sta_id[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.sta_id[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.sta_id[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.sta_id[0],
 				SME_AC_BE, 3, 3, srv_value, sus_value,
 				SME_QOS_WMM_TS_DIR_BOTH, 1,
 				adapter->vdev_id,