소스 검색

qcacld-3.0: Rename peerMacAddress in struct hdd_connection_info

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

Change-Id: Id6ef7a5f51431d799bdee9a3bae8da5158ece8a3
CRs-Fixed: 2409880
Jeff Johnson 6 년 전
부모
커밋
5ec1abfc11
5개의 변경된 파일19개의 추가작업 그리고 19개의 파일을 삭제
  1. 2 2
      core/hdd/inc/wlan_hdd_assoc.h
  2. 8 8
      core/hdd/src/wlan_hdd_assoc.c
  3. 1 1
      core/hdd/src/wlan_hdd_ocb.c
  4. 2 2
      core/hdd/src/wlan_hdd_tx_rx.c
  5. 6 6
      core/hdd/src/wlan_hdd_wext.c

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

@@ -142,7 +142,7 @@ struct hdd_conn_flag {
  * @bssid: BSSID
  * @SSID: SSID Info
  * @staid: Station ID
- * @peerMacAddress:Peer Mac Address of the IBSS Stations
+ * @peer_macaddr:Peer Mac Address of the IBSS Stations
  * @authType: Auth Type
  * @uc_encrypt_type: Unicast Encryption Type
  * @mc_encrypt_type: Multicast Encryption Type
@@ -177,7 +177,7 @@ struct hdd_connection_info {
 	struct qdf_mac_addr bssid;
 	tCsrSSIDInfo ssid;
 	uint8_t staid[MAX_PEERS];
-	struct qdf_mac_addr peerMacAddress[MAX_PEERS];
+	struct qdf_mac_addr peer_macaddr[MAX_PEERS];
 	eCsrAuthType authType;
 	eCsrEncryptionType uc_encrypt_type;
 	eCsrEncryptionType mc_encrypt_type;

+ 8 - 8
core/hdd/src/wlan_hdd_assoc.c

@@ -1533,10 +1533,10 @@ 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 */
+	/* Remove staid, bssid and peer_macaddr */
 	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_mem_zero(&sta_ctx->conn_info.peer_macaddr[0],
 		     QDF_MAC_ADDR_SIZE);
 
 	/* Clear all security settings */
@@ -1844,7 +1844,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 			 */
 			sta_ctx->conn_info.staid[i] =
 						HDD_WLAN_INVALID_STA_ID;
-			qdf_mem_zero(&sta_ctx->conn_info.peerMacAddress[i],
+			qdf_mem_zero(&sta_ctx->conn_info.peer_macaddr[i],
 				sizeof(struct qdf_mac_addr));
 			if (sta_id < HDD_MAX_ADAPTERS)
 				hdd_ctx->sta_to_adapter[sta_id] = NULL;
@@ -3642,7 +3642,7 @@ bool hdd_save_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id,
 				 peer_mac_addr, sta_id, idx);
 			sta_ctx->conn_info.staid[idx] = sta_id;
 			qdf_copy_macaddr(
-				&sta_ctx->conn_info.peerMacAddress[idx],
+				&sta_ctx->conn_info.peer_macaddr[idx],
 				peer_mac_addr);
 			return true;
 		}
@@ -3693,7 +3693,7 @@ static bool roam_remove_ibss_station(struct hdd_adapter *adapter, uint8_t staid)
 						HDD_WLAN_INVALID_STA_ID;
 
 			qdf_zero_macaddr(&sta_ctx->conn_info.
-					 peerMacAddress[idx]);
+					 peer_macaddr[idx]);
 
 			fSuccess = true;
 
@@ -3729,14 +3729,14 @@ static bool roam_remove_ibss_station(struct hdd_adapter *adapter, uint8_t staid)
 				sta_ctx->conn_info.staid[0] =
 					sta_ctx->conn_info.staid[valid_idx];
 				qdf_copy_macaddr(&sta_ctx->conn_info.
-						 peerMacAddress[0],
+						 peer_macaddr[0],
 						 &sta_ctx->conn_info.
-						 peerMacAddress[valid_idx]);
+						 peer_macaddr[valid_idx]);
 
 				sta_ctx->conn_info.staid[valid_idx] =
 							HDD_WLAN_INVALID_STA_ID;
 				qdf_zero_macaddr(&sta_ctx->conn_info.
-						 peerMacAddress[valid_idx]);
+						 peer_macaddr[valid_idx]);
 			}
 		}
 	}

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

@@ -261,7 +261,7 @@ static int hdd_ocb_register_sta(struct hdd_adapter *adapter)
 	}
 
 	sta_ctx->conn_info.staid[0] = peer_id;
-	qdf_copy_macaddr(&sta_ctx->conn_info.peerMacAddress[0],
+	qdf_copy_macaddr(&sta_ctx->conn_info.peer_macaddr[0],
 			 &adapter->mac_addr);
 
 	return 0;

+ 2 - 2
core/hdd/src/wlan_hdd_tx_rx.c

@@ -1185,7 +1185,7 @@ QDF_STATUS hdd_get_peer_sta_id(struct hdd_station_ctx *sta_ctx,
 	uint8_t idx;
 
 	for (idx = 0; idx < MAX_PEERS; idx++) {
-		if (!qdf_mem_cmp(&sta_ctx->conn_info.peerMacAddress[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];
 			return QDF_STATUS_SUCCESS;
@@ -1429,7 +1429,7 @@ int hdd_get_peer_idx(struct hdd_station_ctx *sta_ctx,
 	for (idx = 0; idx < MAX_PEERS; idx++) {
 		if (sta_ctx->conn_info.staid[idx] == HDD_WLAN_INVALID_STA_ID)
 			continue;
-		if (qdf_mem_cmp(&sta_ctx->conn_info.peerMacAddress[idx],
+		if (qdf_mem_cmp(&sta_ctx->conn_info.peer_macaddr[idx],
 				addr, sizeof(struct qdf_mac_addr)))
 			continue;
 		return idx;

+ 6 - 6
core/hdd/src/wlan_hdd_wext.c

@@ -7221,17 +7221,17 @@ static int __iw_get_char_setnone(struct net_device *dev,
 					      "\n%d .%02x:%02x:%02x:%02x:%02x:%02x\n",
 					      sta_ctx->conn_info.staid[idx],
 					      sta_ctx->conn_info.
-					      peerMacAddress[idx].bytes[0],
+					      peer_macaddr[idx].bytes[0],
 					      sta_ctx->conn_info.
-					      peerMacAddress[idx].bytes[1],
+					      peer_macaddr[idx].bytes[1],
 					      sta_ctx->conn_info.
-					      peerMacAddress[idx].bytes[2],
+					      peer_macaddr[idx].bytes[2],
 					      sta_ctx->conn_info.
-					      peerMacAddress[idx].bytes[3],
+					      peer_macaddr[idx].bytes[3],
 					      sta_ctx->conn_info.
-					      peerMacAddress[idx].bytes[4],
+					      peer_macaddr[idx].bytes[4],
 					      sta_ctx->conn_info.
-					      peerMacAddress[idx].bytes[5]
+					      peer_macaddr[idx].bytes[5]
 					      );
 				length += buf;
 			}