qcacld-3.0: Rename bssId in struct hdd_connection_info

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

Change-Id: I49a1a68fbec0582d8bbc82c2e92c171bb6343dfc
CRs-Fixed: 2409878

core/hdd/inc/wlan_hdd_assoc.h

@@ -139,7 +139,7 @@ struct hdd_conn_flag {
 /**
  * struct hdd_connection_info - structure to store connection information
  * @conn_state: connection state of the NIC
- * @bssId: BSSID
+ * @bssid: BSSID
  * @SSID: SSID Info
  * @staId: Station ID
  * @peerMacAddress:Peer Mac Address of the IBSS Stations
@@ -174,7 +174,7 @@ struct hdd_conn_flag {
  */
 struct hdd_connection_info {
 	eConnectionState conn_state;
-	struct qdf_mac_addr bssId;
+	struct qdf_mac_addr bssid;
 	tCsrSSIDInfo ssid;
 	uint8_t staId[MAX_PEERS];
 	struct qdf_mac_addr peerMacAddress[MAX_PEERS];

core/hdd/src/wlan_hdd_assoc.c

@@ -971,7 +971,7 @@ hdd_conn_save_connect_info(struct hdd_adapter *adapter,
 		/* Save the BSSID for the connection */
 		if (eCSR_BSS_TYPE_INFRASTRUCTURE == bss_type) {
 			QDF_ASSERT(roam_info->pBssDesc);
-			qdf_copy_macaddr(&sta_ctx->conn_info.bssId,
+			qdf_copy_macaddr(&sta_ctx->conn_info.bssid,
 					 &roam_info->bssid);
 
 			/*
@@ -986,7 +986,7 @@ hdd_conn_save_connect_info(struct hdd_adapter *adapter,
 					roam_info->staId;
 			}
 		} else if (eCSR_BSS_TYPE_IBSS == bss_type) {
-			qdf_copy_macaddr(&sta_ctx->conn_info.bssId,
+			qdf_copy_macaddr(&sta_ctx->conn_info.bssid,
 					 &roam_info->bssid);
 		} else {
 			/*
@@ -1405,7 +1405,7 @@ static void hdd_send_association_event(struct net_device *dev,
 			hdd_send_ft_assoc_response(dev, adapter, pCsrRoamInfo);
 		}
 		qdf_copy_macaddr(&peer_macaddr,
-				 &sta_ctx->conn_info.bssId);
+				 &sta_ctx->conn_info.bssid);
 		chan_info.chan_id = pCsrRoamInfo->chan_info.chan_id;
 		chan_info.mhz = pCsrRoamInfo->chan_info.mhz;
 		chan_info.info = pCsrRoamInfo->chan_info.info;
@@ -1455,10 +1455,10 @@ static void hdd_send_association_event(struct net_device *dev,
 			sta_ctx->conn_info.conn_state) {
 		policy_mgr_update_connection_info(hdd_ctx->psoc,
 				adapter->vdev_id);
-		memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssId.bytes,
+		memcpy(wrqu.ap_addr.sa_data, sta_ctx->conn_info.bssid.bytes,
 				ETH_ALEN);
 		hdd_debug("wlan: new IBSS peer connection to BSSID " MAC_ADDRESS_STR,
-			MAC_ADDR_ARRAY(sta_ctx->conn_info.bssId.bytes));
+			MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes));
 	} else {                /* Not Associated */
 		hdd_debug("wlan: disconnected");
 		memset(wrqu.ap_addr.sa_data, '\0', ETH_ALEN);
@@ -1474,7 +1474,7 @@ static void hdd_send_association_event(struct net_device *dev,
 		if ((adapter->device_mode == QDF_STA_MODE) ||
 		    (adapter->device_mode == QDF_P2P_CLIENT_MODE)) {
 			qdf_copy_macaddr(&peer_macaddr,
-					 &sta_ctx->conn_info.bssId);
+					 &sta_ctx->conn_info.bssid);
 
 			/* send peer status indication to oem app */
 			hdd_send_peer_status_ind_to_app(&peer_macaddr,
@@ -1533,9 +1533,9 @@ 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 peerMacAddress */
 	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.bssid, QDF_MAC_ADDR_SIZE);
 	qdf_mem_zero(&sta_ctx->conn_info.peerMacAddress[0],
 		     QDF_MAC_ADDR_SIZE);
 
@@ -1733,7 +1733,7 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 				  sta_ctx->conn_info.staId[0],
 				  adapter->vdev_id,
 				  WLAN_IPA_STA_DISCONNECT,
-				  sta_ctx->conn_info.bssId.bytes);
+				  sta_ctx->conn_info.bssid.bytes);
 
 #ifdef FEATURE_WLAN_AUTO_SHUTDOWN
 	wlan_hdd_auto_shutdown_enable(hdd_ctx, true);
@@ -1860,9 +1860,9 @@ static QDF_STATUS hdd_dis_connect_handler(struct hdd_adapter *adapter,
 		    eCSR_ROAM_RESULT_DISASSOC_IND == roam_result ||
 		    eCSR_ROAM_LOSTLINK == roam_status) {
 			wlan_hdd_cfg80211_update_bss_list(adapter,
-				sta_ctx->conn_info.bssId.bytes);
+				sta_ctx->conn_info.bssid.bytes);
 			sme_remove_bssid_from_scan_list(mac_handle,
-			sta_ctx->conn_info.bssId.bytes);
+			sta_ctx->conn_info.bssid.bytes);
 		}
 		if (sta_id < HDD_MAX_ADAPTERS)
 			hdd_ctx->sta_to_adapter[sta_id] = NULL;
@@ -3884,7 +3884,7 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
 			 "with peerMac " MAC_ADDRESS_STR " BSSID: "
 			 MAC_ADDRESS_STR " and stationID= %d",
 			 MAC_ADDR_ARRAY(roam_info->peerMac.bytes),
-			 MAC_ADDR_ARRAY(sta_ctx->conn_info.bssId.bytes),
+			 MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes),
 			 roam_info->staId);
 
 		if (!hdd_save_peer
@@ -3972,7 +3972,7 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
 			 "with peerMac " MAC_ADDRESS_STR " BSSID: "
 			 MAC_ADDRESS_STR " and stationID= %d",
 			 MAC_ADDR_ARRAY(roam_info->peerMac.bytes),
-			 MAC_ADDR_ARRAY(sta_ctx->conn_info.bssId.bytes),
+			 MAC_ADDR_ARRAY(sta_ctx->conn_info.bssid.bytes),
 			 roam_info->staId);
 
 		hdd_roam_deregister_sta(adapter, roam_info->staId);
@@ -5763,7 +5763,7 @@ void hdd_roam_profile_init(struct hdd_adapter *adapter)
 	roam_profile->SSIDs.SSIDList = &sta_ctx->conn_info.ssid;
 
 	roam_profile->BSSIDs.numOfBSSIDs = 0;
-	roam_profile->BSSIDs.bssid = &sta_ctx->conn_info.bssId;
+	roam_profile->BSSIDs.bssid = &sta_ctx->conn_info.bssid;
 
 	/* Set the numOfChannels to zero to scan all the channels */
 	roam_profile->ChannelInfo.numOfChannels = 0;

core/hdd/src/wlan_hdd_bss_transition.c

@@ -201,7 +201,7 @@ __wlan_hdd_cfg80211_fetch_bss_transition_status(struct wiphy *wiphy,
 
 	mac_handle = hdd_ctx->mac_handle;
 	status = sme_get_bss_transition_status(mac_handle, transition_reason,
-					       &hdd_sta_ctx->conn_info.bssId,
+					       &hdd_sta_ctx->conn_info.bssid,
 					       candidate_info,
 					       nof_candidates,
 					       is_bt_in_progress);

core/hdd/src/wlan_hdd_cfg80211.c

@@ -4950,7 +4950,7 @@ void wlan_hdd_save_gtk_offload_params(struct hdd_adapter *adapter,
 		qdf_mem_copy(gtk_req->kek, kek_ptr, kek_len);
 	}
 
-	qdf_copy_macaddr(&gtk_req->bssid, &hdd_sta_ctx->conn_info.bssId);
+	qdf_copy_macaddr(&gtk_req->bssid, &hdd_sta_ctx->conn_info.bssid);
 
 	gtk_req->kek_len = kek_len;
 	gtk_req->is_fils_connection = hdd_is_fils_connection(adapter);
@@ -8195,7 +8195,7 @@ static int __wlan_hdd_cfg80211_get_link_properties(struct wiphy *wiphy,
 		hdd_sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 		if ((hdd_sta_ctx->conn_info.conn_state !=
 			eConnectionState_Associated) ||
-		    qdf_mem_cmp(hdd_sta_ctx->conn_info.bssId.bytes,
+		    qdf_mem_cmp(hdd_sta_ctx->conn_info.bssid.bytes,
 			peer_mac, QDF_MAC_ADDR_SIZE)) {
 			hdd_err("Not Associated to mac "MAC_ADDRESS_STR,
 			       MAC_ADDR_ARRAY(peer_mac));
@@ -14234,7 +14234,7 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
 	if (!pairwise && ((adapter->device_mode == QDF_STA_MODE) ||
 	    (adapter->device_mode == QDF_P2P_CLIENT_MODE))) {
 		qdf_mem_copy(mac_address.bytes,
-			     adapter->session.station.conn_info.bssId.bytes,
+			     adapter->session.station.conn_info.bssid.bytes,
 			     QDF_MAC_ADDR_SIZE);
 	} else {
 		qdf_mem_copy(mac_address.bytes, mac_addr, QDF_MAC_ADDR_SIZE);
@@ -14870,7 +14870,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
 	if (unicast)
 		status =
 		wlan_cfg80211_set_default_key(adapter->vdev, key_index,
-					      &sta_ctx->conn_info.bssId);
+					      &sta_ctx->conn_info.bssid);
 	else
 		status = wlan_cfg80211_set_default_key(adapter->vdev, key_index,
 						       &bssid);
@@ -14975,7 +14975,7 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
 			setKey.keyDirection = eSIR_TX_RX;
 
 			qdf_copy_macaddr(&setKey.peerMac,
-					 &sta_ctx->conn_info.bssId);
+					 &sta_ctx->conn_info.bssid);
 
 			if (Keys->KeyLength[key_index] == CSR_WEP40_KEY_LEN &&
 			    roam_profile->EncryptionType.

core/hdd/src/wlan_hdd_debugfs_connect.c

@@ -368,7 +368,7 @@ wlan_hdd_connect_info_debugfs(struct hdd_adapter *adapter, uint8_t *buf,
 			    "last_auth_type = %s\n"
 			    "dot11Mode = %s\n",
 			    conn_info->last_ssid.SSID.ssId,
-			    MAC_ADDR_ARRAY(conn_info->bssId.bytes),
+			    MAC_ADDR_ARRAY(conn_info->bssid.bytes),
 			    conn_info->connect_time,
 			    conn_info->auth_time,
 			    conn_info->freq,

core/hdd/src/wlan_hdd_ioctl.c

@@ -216,7 +216,7 @@ static int hdd_get_tsm_stats(struct hdd_adapter *adapter,
 
 	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.bssId,
+				   hdd_sta_ctx->conn_info.bssid,
 				   cookie, tid);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Unable to retrieve tsm statistics");
@@ -672,7 +672,7 @@ QDF_STATUS hdd_wma_send_fastreassoc_cmd(struct hdd_adapter *adapter,
 	tSirMacAddr connected_bssid;
 
 	roam_profile = hdd_roam_profile(adapter);
-	qdf_mem_copy(connected_bssid, hdd_sta_ctx->conn_info.bssId.bytes,
+	qdf_mem_copy(connected_bssid, hdd_sta_ctx->conn_info.bssid.bytes,
 		     ETH_ALEN);
 	return sme_fast_reassoc(adapter->hdd_ctx->mac_handle,
 				roam_profile, bssid, channel,
@@ -734,7 +734,7 @@ int hdd_reassoc(struct hdd_adapter *adapter, const uint8_t *bssid,
 	 * if the target bssid is same as currently associated AP,
 	 * use the current connections's channel.
 	 */
-	if (!memcmp(bssid, sta_ctx->conn_info.bssId.bytes,
+	if (!memcmp(bssid, sta_ctx->conn_info.bssid.bytes,
 			QDF_MAC_ADDR_SIZE)) {
 		hdd_warn("Reassoc BSSID is same as currently associated AP bssid");
 		channel = sta_ctx->conn_info.operationChannel;
@@ -938,7 +938,7 @@ hdd_sendactionframe(struct hdd_adapter *adapter, const uint8_t *bssid,
 	 * if the target bssid is different from currently associated AP,
 	 * then no need to send action frame
 	 */
-	if (memcmp(bssid, sta_ctx->conn_info.bssId.bytes,
+	if (memcmp(bssid, sta_ctx->conn_info.bssid.bytes,
 			QDF_MAC_ADDR_SIZE)) {
 		hdd_warn("STA is not associated to this AP");
 		ret = -EINVAL;
@@ -4315,7 +4315,7 @@ static int drv_cmd_fast_reassoc(struct hdd_adapter *adapter,
 	 * if the target bssid is same as currently associated AP,
 	 * issue reassoc to same AP
 	 */
-	if (!qdf_mem_cmp(bssid, sta_ctx->conn_info.bssId.bytes,
+	if (!qdf_mem_cmp(bssid, sta_ctx->conn_info.bssid.bytes,
 			 QDF_MAC_ADDR_SIZE)) {
 		hdd_warn("Reassoc BSSID is same as currently associated AP bssid");
 		if (roaming_offload_enabled(hdd_ctx)) {

core/hdd/src/wlan_hdd_ipa.c

@@ -78,7 +78,7 @@ void hdd_ipa_set_tx_flow_info(void)
 				staChannel =
 					sta_ctx->conn_info.operationChannel;
 				qdf_copy_macaddr(&staBssid,
-						 &sta_ctx->conn_info.bssId);
+						 &sta_ctx->conn_info.bssid);
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL
 				targetChannel = staChannel;
 #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */
@@ -91,7 +91,7 @@ void hdd_ipa_set_tx_flow_info(void)
 				p2pChannel =
 					sta_ctx->conn_info.operationChannel;
 				qdf_copy_macaddr(&p2pBssid,
-						&sta_ctx->conn_info.bssId);
+						&sta_ctx->conn_info.bssid);
 				p2pMode = "CLI";
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL
 				targetChannel = p2pChannel;

core/hdd/src/wlan_hdd_lpass.c

@@ -149,8 +149,8 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
 			       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,
+		if (QDF_MAC_ADDR_SIZE >= sizeof(sta_ctx->conn_info.bssid))
+			memcpy(data->bssid, sta_ctx->conn_info.bssid.bytes,
 			       QDF_MAC_ADDR_SIZE);
 	}
 	return 0;

core/hdd/src/wlan_hdd_main.c

@@ -5323,7 +5323,7 @@ void wlan_hdd_reset_prob_rspies(struct hdd_adapter *adapter)
 	{
 		struct hdd_station_ctx *sta_ctx =
 			WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-		bssid = &sta_ctx->conn_info.bssId;
+		bssid = &sta_ctx->conn_info.bssid;
 		break;
 	}
 	case QDF_SAP_MODE:
@@ -5842,7 +5842,7 @@ QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx)
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
 			sta_ctx = WLAN_HDD_GET_STATION_CTX_PTR(adapter);
 			qdf_copy_macaddr(&peer_macaddr,
-					 &sta_ctx->conn_info.bssId);
+					 &sta_ctx->conn_info.bssid);
 
 		} else if (adapter->device_mode == QDF_P2P_GO_MODE) {
 			clear_bit(SOFTAP_BSS_STARTED, &adapter->event_flags);

core/hdd/src/wlan_hdd_power.c

@@ -710,7 +710,7 @@ static int hdd_set_grat_arp_keepalive(struct hdd_adapter *adapter)
 	qdf_mem_copy(&req.destIpv4Addr, &req.hostIpv4Addr,
 		     sizeof(req.destIpv4Addr));
 
-	qdf_copy_macaddr(&req.bssid, &sta_ctx->conn_info.bssId);
+	qdf_copy_macaddr(&req.bssid, &sta_ctx->conn_info.bssid);
 	ucfg_mlme_get_sta_keep_alive_period(hdd_ctx->psoc, &req.timePeriod);
 	req.sessionId = adapter->vdev_id;
 

core/hdd/src/wlan_hdd_station_info.c

@@ -449,7 +449,7 @@ hdd_add_link_standard_info(struct sk_buff *skb,
 		goto fail;
 	}
 	if (nla_put(skb, NL80211_ATTR_MAC, QDF_MAC_ADDR_SIZE,
-		    hdd_sta_ctx->cache_conn_info.bssId.bytes)) {
+		    hdd_sta_ctx->cache_conn_info.bssid.bytes)) {
 		hdd_err("put bssid failed");
 		goto fail;
 	}

core/hdd/src/wlan_hdd_stats.c

@@ -577,7 +577,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 		    sta_ctx->conn_info.conn_state) {
 			pInfo->state = WIFI_ASSOCIATED;
 			qdf_copy_macaddr(&pInfo->bssid,
-					 &sta_ctx->conn_info.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);
@@ -4452,7 +4452,7 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy,
 	/* for new connection there might be no valid previous RSSI */
 	if (!adapter->rssi) {
 		hdd_get_rssi_snr_by_bssid(adapter,
-				sta_ctx->conn_info.bssId.bytes,
+				sta_ctx->conn_info.bssid.bytes,
 				&adapter->rssi, &snr);
 	}
 
@@ -4992,7 +4992,7 @@ static bool hdd_is_rcpi_applicable(struct hdd_adapter *adapter,
 			return false;
 		}
 
-		if (qdf_mem_cmp(mac_addr, &hdd_sta_ctx->conn_info.bssId,
+		if (qdf_mem_cmp(mac_addr, &hdd_sta_ctx->conn_info.bssid,
 				sizeof(*mac_addr))) {
 			hdd_err("mac addr is different from bssid connected");
 			return false;
@@ -5223,7 +5223,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
 
 	rssi_info = wlan_cfg80211_mc_cp_stats_get_peer_rssi(
 			adapter->vdev,
-			sta_ctx->conn_info.bssId.bytes,
+			sta_ctx->conn_info.bssid.bytes,
 			&ret);
 	if (ret || !rssi_info) {
 		wlan_cfg80211_mc_cp_stats_free_stats_event(rssi_info);
@@ -5232,7 +5232,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
 
 	for (i = 0; i < rssi_info->num_peer_stats; i++) {
 		if (!qdf_mem_cmp(rssi_info->peer_stats[i].peer_macaddr,
-				 sta_ctx->conn_info.bssId.bytes,
+				 sta_ctx->conn_info.bssid.bytes,
 				 WLAN_MACADDR_LEN)) {
 			*rssi_value = rssi_info->peer_stats[i].peer_rssi;
 			hdd_debug("RSSI = %d", *rssi_value);
@@ -5328,7 +5328,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
 
 	status = sme_get_rssi(hdd_ctx->mac_handle, hdd_get_rssi_cb,
 			      sta_ctx->conn_info.staId[0],
-			      sta_ctx->conn_info.bssId, adapter->rssi,
+			      sta_ctx->conn_info.bssid, adapter->rssi,
 			      cookie);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Unable to retrieve RSSI");
@@ -5351,7 +5351,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
 			 */
 			if (!adapter->rssi) {
 				hdd_get_rssi_snr_by_bssid(adapter,
-					sta_ctx->conn_info.bssId.bytes,
+					sta_ctx->conn_info.bssid.bytes,
 					&adapter->rssi, NULL);
 			}
 		}
@@ -5440,7 +5440,7 @@ QDF_STATUS wlan_hdd_get_snr(struct hdd_adapter *adapter, int8_t *snr)
 
 	status = sme_get_snr(hdd_ctx->mac_handle, hdd_get_snr_cb,
 			     sta_ctx->conn_info.staId[0],
-			     sta_ctx->conn_info.bssId, cookie);
+			     sta_ctx->conn_info.bssid, cookie);
 	if (QDF_STATUS_SUCCESS != status) {
 		hdd_err("Unable to retrieve RSSI");
 		/* we'll returned a cached value below */
@@ -5582,7 +5582,7 @@ int wlan_hdd_get_link_speed(struct hdd_adapter *adapter, uint32_t *link_speed)
 	} else {
 		struct qdf_mac_addr bssid;
 
-		qdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssId);
+		qdf_copy_macaddr(&bssid, &hdd_stactx->conn_info.bssid);
 
 		ret = wlan_hdd_get_linkspeed_for_peermac(adapter, &bssid,
 							 link_speed);

core/hdd/src/wlan_hdd_tsf.c

@@ -868,7 +868,7 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 		size = scnprintf(buf, PAGE_SIZE, "%s%llu %llu %pM\n",
 				 buf, adapter->last_target_time,
 				 tsf_sync_qtime,
-				 hdd_sta_ctx->conn_info.bssId.bytes);
+				 hdd_sta_ctx->conn_info.bssid.bytes);
 	} else {
 		size = scnprintf(buf, PAGE_SIZE, "%s%llu %llu %pM\n",
 				 buf, adapter->last_target_time,
@@ -1015,7 +1015,7 @@ static ssize_t __hdd_wlan_tsf_show(struct device *dev,
 		    adapter->device_mode == QDF_P2P_CLIENT_MODE) {
 			size = scnprintf(buf, PAGE_SIZE, "%s%llu %llu %pM\n",
 					 buf, target_time, host_time,
-					 hdd_sta_ctx->conn_info.bssId.bytes);
+					 hdd_sta_ctx->conn_info.bssid.bytes);
 		} else {
 			size = scnprintf(buf, PAGE_SIZE, "%s%llu %llu %pM\n",
 					 buf, target_time, host_time,

core/hdd/src/wlan_hdd_wext.c

@@ -4461,7 +4461,7 @@ static int hdd_we_set_tx_power(struct hdd_adapter *adapter, int value)
 		return -EINVAL;
 
 	status = sme_set_tx_power(mac_handle, adapter->vdev_id,
-				  sta_ctx->conn_info.bssId,
+				  sta_ctx->conn_info.bssid,
 				  adapter->device_mode, value);
 
 	if (QDF_IS_STATUS_ERROR(status))
@@ -4481,8 +4481,8 @@ static int hdd_we_set_max_tx_power(struct hdd_adapter *adapter, int value)
 		return -EINVAL;
 
 	status = sme_set_max_tx_power(mac_handle,
-				      sta_ctx->conn_info.bssId,
-				      sta_ctx->conn_info.bssId,
+				      sta_ctx->conn_info.bssid,
+				      sta_ctx->conn_info.bssid,
 				      value);
 
 	if (QDF_IS_STATUS_ERROR(status))
@@ -7494,7 +7494,7 @@ static int __iw_setnone_getnone(struct net_device *dev,
 					      &mod_fields);
 		if (roaming_offload_enabled(hdd_ctx)) {
 			qdf_mem_copy(bssid,
-				&adapter->session.station.conn_info.bssId,
+				&adapter->session.station.conn_info.bssid,
 				sizeof(bssid));
 			hdd_wma_send_fastreassoc_cmd(adapter,
 						     bssid, operating_ch);
@@ -8092,9 +8092,9 @@ static int __iw_set_var_ints_getnone(struct net_device *dev,
 		if (apps_args[0] == CDP_TXRX_STATS_28) {
 			if (sta_ctx->conn_info.is_authenticated) {
 				hdd_debug("ap mac addr: %pM",
-					  (void *)&sta_ctx->conn_info.bssId);
+					  (void *)&sta_ctx->conn_info.bssid);
 				req.peer_addr =
-					(char *)&sta_ctx->conn_info.bssId;
+					(char *)&sta_ctx->conn_info.bssid;
 			}
 		}
 		ret = cdp_txrx_stats_request(soc, vdev, &req);