Kaynağa Gözat

qcacld-3.0: Rename SSID in struct hdd_connection_info

To conform to the expectation that uppercase identifiers are only used
for macros, rename field SSID in struct hdd_connection_info.

Change-Id: Ia6d3c45be952ed7c044a21c723a7fddb0038ad81
CRs-Fixed: 2409874
Jeff Johnson 6 yıl önce
ebeveyn
işleme
4aea180e1c

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

@@ -175,7 +175,7 @@ struct hdd_conn_flag {
 struct hdd_connection_info {
 	eConnectionState conn_state;
 	struct qdf_mac_addr bssId;
-	tCsrSSIDInfo SSID;
+	tCsrSSIDInfo ssid;
 	uint8_t staId[MAX_PEERS];
 	struct qdf_mac_addr peerMacAddress[MAX_PEERS];
 	eCsrAuthType authType;

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

@@ -1020,7 +1020,7 @@ hdd_conn_save_connect_info(struct hdd_adapter *adapter,
 			    roam_info->u.pConnectedProfile->operationChannel;
 
 			/* Save the ssid for the connection */
-			qdf_mem_copy(&sta_ctx->conn_info.SSID.SSID,
+			qdf_mem_copy(&sta_ctx->conn_info.ssid.SSID,
 				     &roam_info->u.pConnectedProfile->SSID,
 				     sizeof(tSirMacSSid));
 			qdf_mem_copy(&sta_ctx->conn_info.last_ssid.SSID,
@@ -1549,7 +1549,7 @@ static void hdd_conn_remove_connect_info(struct hdd_station_ctx *sta_ctx)
 
 	sta_ctx->conn_info.proxyARPService = 0;
 
-	qdf_mem_zero(&sta_ctx->conn_info.SSID, sizeof(tCsrSSIDInfo));
+	qdf_mem_zero(&sta_ctx->conn_info.ssid, sizeof(tCsrSSIDInfo));
 }
 
 /**
@@ -5760,7 +5760,7 @@ void hdd_roam_profile_init(struct hdd_adapter *adapter)
 
 	/* Configure the roaming profile links to SSID and bssid. */
 	roam_profile->SSIDs.numOfSSIDs = 0;
-	roam_profile->SSIDs.SSIDList = &sta_ctx->conn_info.SSID;
+	roam_profile->SSIDs.SSIDList = &sta_ctx->conn_info.ssid;
 
 	roam_profile->BSSIDs.numOfBSSIDs = 0;
 	roam_profile->BSSIDs.bssid = &sta_ctx->conn_info.bssId;

+ 4 - 4
core/hdd/src/wlan_hdd_lpass.c

@@ -143,11 +143,11 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 		data->freq =
 			cds_chan_to_freq(sta_ctx->conn_info.operationChannel);
 		if (WLAN_SVC_MAX_SSID_LEN >=
-		    sta_ctx->conn_info.SSID.SSID.length) {
-			data->ssid_len = sta_ctx->conn_info.SSID.SSID.length;
+		    sta_ctx->conn_info.ssid.SSID.length) {
+			data->ssid_len = sta_ctx->conn_info.ssid.SSID.length;
 			memcpy(data->ssid,
-			       sta_ctx->conn_info.SSID.SSID.ssId,
-			       sta_ctx->conn_info.SSID.SSID.length);
+			       sta_ctx->conn_info.ssid.SSID.ssId,
+			       sta_ctx->conn_info.ssid.SSID.length);
 		}
 		if (QDF_MAC_ADDR_SIZE >= sizeof(sta_ctx->conn_info.bssId))
 			memcpy(data->bssid, sta_ctx->conn_info.bssId.bytes,

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

@@ -579,12 +579,12 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 			qdf_copy_macaddr(&pInfo->bssid,
 					 &sta_ctx->conn_info.bssId);
 			qdf_mem_copy(pInfo->ssid,
-				     sta_ctx->conn_info.SSID.SSID.ssId,
-				     sta_ctx->conn_info.SSID.SSID.length);
+				     sta_ctx->conn_info.ssid.SSID.ssId,
+				     sta_ctx->conn_info.ssid.SSID.length);
 			/*
 			 * NULL Terminate the string
 			 */
-			pInfo->ssid[sta_ctx->conn_info.SSID.SSID.length] = 0;
+			pInfo->ssid[sta_ctx->conn_info.ssid.SSID.length] = 0;
 		}
 	}