Эх сурвалжийг харах

qcacld-3.0: Rename hdd_station_info isDeauthInProgress field

Per the Linux coding style "mixed-case names are frowned upon" so
rename field isDeauthInProgress in struct hdd_station_info.

Change-Id: I8e30bb8b91e8eddd32e3122902543b44a8cdd170
CRs-Fixed: 2131086
Jeff Johnson 7 жил өмнө
parent
commit
e4f5d93019

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

@@ -777,7 +777,7 @@ struct hdd_fw_txrx_stats {
  * @tlSTAState: Current Station state so HDD knows how to deal with packet
  *              queue. Most recent states used to change TLSHIM STA state.
  * @isQosEnabled: Track QoS status of station
- * @isDeauthInProgress: The station entry for which Deauth is in progress
+ * @is_deauth_in_progress: The station entry for which Deauth is in progress
  * @nss: Number of spatial streams supported
  * @rate_flags: Rate Flags for this connection
  * @ecsa_capable: Extended CSA capabilities
@@ -809,7 +809,7 @@ struct hdd_station_info {
 	struct qdf_mac_addr macAddrSTA;
 	enum ol_txrx_peer_state tlSTAState;
 	bool isQosEnabled;
-	bool isDeauthInProgress;
+	bool is_deauth_in_progress;
 	uint8_t   nss;
 	uint32_t  rate_flags;
 	uint8_t   ecsa_capable;

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

@@ -18252,7 +18252,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 			for (i = 0; i < WLAN_MAX_STA_COUNT; i++) {
 				if ((adapter->aStaInfo[i].in_use) &&
 				    (!adapter->aStaInfo[i].
-				     isDeauthInProgress)) {
+				     is_deauth_in_progress)) {
 					qdf_mem_copy(
 						mac,
 						adapter->aStaInfo[i].
@@ -18282,7 +18282,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 							pDelStaParams);
 					if (QDF_IS_STATUS_SUCCESS(qdf_status)) {
 						adapter->aStaInfo[i].
-						isDeauthInProgress = true;
+						is_deauth_in_progress = true;
 						qdf_status =
 							qdf_wait_single_event(
 							 &hapd_state->
@@ -18311,7 +18311,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 					HDD_IPA_CLIENT_DISCONNECT, mac);
 			}
 
-			if (adapter->aStaInfo[staId].isDeauthInProgress ==
+			if (adapter->aStaInfo[staId].is_deauth_in_progress ==
 			    true) {
 				hdd_debug("Skip DEL STA as deauth is in progress::"
 					  MAC_ADDRESS_STR,
@@ -18319,7 +18319,7 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
 				return -ENOENT;
 			}
 
-			adapter->aStaInfo[staId].isDeauthInProgress = true;
+			adapter->aStaInfo[staId].is_deauth_in_progress = true;
 
 			hdd_debug("Delete STA with MAC::" MAC_ADDRESS_STR,
 			       MAC_ADDR_ARRAY(mac));
@@ -18342,7 +18342,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->aStaInfo[staId].isDeauthInProgress =
+				adapter->aStaInfo[staId].is_deauth_in_progress =
 					false;
 				hdd_debug("STA removal failed for ::"
 					  MAC_ADDRESS_STR,

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

@@ -3063,7 +3063,7 @@ static int hdd_ipa_uc_disconnect_client(struct hdd_adapter *adapter)
 		if (qdf_is_macaddr_broadcast(&adapter->aStaInfo[i].macAddrSTA))
 			continue;
 		if ((adapter->aStaInfo[i].in_use) &&
-		   (!adapter->aStaInfo[i].isDeauthInProgress) &&
+		   (!adapter->aStaInfo[i].is_deauth_in_progress) &&
 		   hdd_ipa->sap_num_connected_sta) {
 			hdd_ipa_uc_send_evt(adapter, WLAN_CLIENT_DISCONNECT,
 				adapter->aStaInfo[i].macAddrSTA.bytes);

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

@@ -361,7 +361,7 @@ static int __hdd_softap_hard_start_xmit(struct sk_buff *skb,
 				  STAId);
 			goto drop_pkt;
 		} else if (true == adapter->aStaInfo[STAId].
-							isDeauthInProgress) {
+							is_deauth_in_progress) {
 			QDF_TRACE(QDF_MODULE_ID_HDD_SAP_DATA,
 				  QDF_TRACE_LEVEL_INFO_HIGH,
 				  "%s: STA %d deauth in progress", __func__,
@@ -654,7 +654,7 @@ QDF_STATUS hdd_softap_init_tx_rx_sta(struct hdd_adapter *adapter,
 		     sizeof(struct hdd_station_info));
 
 	adapter->aStaInfo[STAId].in_use = true;
-	adapter->aStaInfo[STAId].isDeauthInProgress = false;
+	adapter->aStaInfo[STAId].is_deauth_in_progress = false;
 	qdf_copy_macaddr(&adapter->aStaInfo[STAId].macAddrSTA, pmacAddrSTA);
 
 	spin_unlock_bh(&adapter->staInfo_lock);
@@ -686,7 +686,7 @@ QDF_STATUS hdd_softap_deinit_tx_rx_sta(struct hdd_adapter *adapter,
 	}
 
 	adapter->aStaInfo[STAId].in_use = false;
-	adapter->aStaInfo[STAId].isDeauthInProgress = false;
+	adapter->aStaInfo[STAId].is_deauth_in_progress = false;
 
 	spin_unlock_bh(&adapter->staInfo_lock);
 	return status;