Browse Source

qcacld-3.0: Rename hdd_station_info ucSTAId field

Per the Linux coding style "mixed-case names are frowned upon" and
"so-called Hungarian notation [...] is brain damaged" so rename field
ucSTAId in struct hdd_station_info.

Change-Id: Ifff172f180d6a769f25d29b655d1d4bb834318d1
CRs-Fixed: 2131094
Jeff Johnson 7 năm trước cách đây
mục cha
commit
4c0ab7b697

+ 2 - 2
core/hdd/inc/wlan_hdd_main.h

@@ -770,7 +770,7 @@ struct hdd_fw_txrx_stats {
  * struct hdd_station_info - Per station structure kept in HDD for
  *                                     multiple station support for SoftAP
  * @in_use: Is the station entry in use?
- * @ucSTAId: Station ID reported back from HAL (through SAP).
+ * @sta_id: Station ID reported back from HAL (through SAP).
  *           Broadcast uses station ID zero by default.
  * @staType: Type of station i.e. p2p client or infrastructure station
  * @sta_mac: MAC address of the station
@@ -804,7 +804,7 @@ struct hdd_fw_txrx_stats {
  */
 struct hdd_station_info {
 	bool in_use;
-	uint8_t ucSTAId;
+	uint8_t sta_id;
 	eStationType staType;
 	struct qdf_mac_addr sta_mac;
 	enum ol_txrx_peer_state peer_state;

+ 1 - 1
core/hdd/src/wlan_hdd_cfg80211.c

@@ -18262,7 +18262,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 						hdd_ipa_wlan_evt(adapter,
 							adapter->
 								 aStaInfo[i].
-								 ucSTAId,
+								 sta_id,
 							HDD_IPA_CLIENT_DISCONNECT,
 							mac);
 					}

+ 1 - 1
core/hdd/src/wlan_hdd_hostapd.c

@@ -5137,7 +5137,7 @@ static int hdd_softap_get_sta_info(struct hdd_adapter *adapter,
 
 		written += scnprintf(buf + written, size - written,
 				     "%5d %02x:%02x:%02x:%02x:%02x:%02x ecsa=%d\n",
-				     sta->ucSTAId,
+				     sta->sta_id,
 				     sta->sta_mac.bytes[0],
 				     sta->sta_mac.bytes[1],
 				     sta->sta_mac.bytes[2],

+ 10 - 10
core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -950,12 +950,12 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 	 * put TL directly into 'authenticated' state
 	 */
 
-	adapter->aStaInfo[staId].ucSTAId = staId;
+	adapter->aStaInfo[staId].sta_id = staId;
 	adapter->aStaInfo[staId].is_qos_enabled = fWmmEnabled;
 
 	if (!fAuthRequired) {
 		hdd_info("open/shared auth StaId= %d.  Changing TL state to AUTHENTICATED at Join time",
-			 adapter->aStaInfo[staId].ucSTAId);
+			 adapter->aStaInfo[staId].sta_id);
 
 		/* Connections that do not need Upper layer auth,
 		 * transition TL directly to 'Authenticated' state.
@@ -968,7 +968,7 @@ QDF_STATUS hdd_softap_register_sta(struct hdd_adapter *adapter,
 	} else {
 
 		hdd_info("ULA auth StaId= %d.  Changing TL state to CONNECTED at Join time",
-			 adapter->aStaInfo[staId].ucSTAId);
+			 adapter->aStaInfo[staId].sta_id);
 
 		qdf_status = hdd_change_peer_state(adapter, staDesc.sta_id,
 						OL_TXRX_PEER_STATE_CONN, false);
@@ -1082,30 +1082,30 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter,
 				       struct qdf_mac_addr *pDestMacAddress,
 				       enum ol_txrx_peer_state state)
 {
-	uint8_t ucSTAId = WLAN_MAX_STA_COUNT;
+	uint8_t sta_id = WLAN_MAX_STA_COUNT;
 	QDF_STATUS qdf_status;
 
 	ENTER_DEV(adapter->dev);
 
-	qdf_status = hdd_softap_get_sta_id(adapter, pDestMacAddress, &ucSTAId);
+	qdf_status = hdd_softap_get_sta_id(adapter, pDestMacAddress, &sta_id);
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		hdd_err("Failed to find right station");
 		return qdf_status;
 	}
 
 	if (false ==
-	    qdf_is_macaddr_equal(&adapter->aStaInfo[ucSTAId].sta_mac,
+	    qdf_is_macaddr_equal(&adapter->aStaInfo[sta_id].sta_mac,
 				 pDestMacAddress)) {
-		hdd_err("Station %u MAC address not matching", ucSTAId);
+		hdd_err("Station %u MAC address not matching", sta_id);
 		return QDF_STATUS_E_FAILURE;
 	}
 
 	qdf_status =
-		hdd_change_peer_state(adapter, ucSTAId, state, false);
-	hdd_info("Station %u changed to state %d", ucSTAId, state);
+		hdd_change_peer_state(adapter, sta_id, state, false);
+	hdd_info("Station %u changed to state %d", sta_id, state);
 
 	if (QDF_STATUS_SUCCESS == qdf_status) {
-		adapter->aStaInfo[ucSTAId].peer_state =
+		adapter->aStaInfo[sta_id].peer_state =
 			OL_TXRX_PEER_STATE_AUTH;
 		p2p_peer_authorized(adapter->hdd_vdev, pDestMacAddress->bytes);
 	}