qcacld-3.0: Rename hdd_adapter macAddressCurrent field

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

Change-Id: If4c674f7d8f10089d72e78954922ed1e859ea08e
CRs-Fixed: 2134944

core/hdd/inc/wlan_hdd_main.h

@@ -1037,7 +1037,7 @@ struct hdd_adapter {
 	uint32_t ctw;
 
 	/** Current MAC Address for the adapter  */
-	struct qdf_mac_addr macAddressCurrent;
+	struct qdf_mac_addr mac_addr;
 
 	/**Event Flags*/
 	unsigned long event_flags;

core/hdd/src/wlan_hdd_assoc.c

@@ -1271,7 +1271,7 @@ static void hdd_send_association_event(struct net_device *dev,
 
 		pr_info("wlan: " MAC_ADDRESS_STR " connected to "
 			MAC_ADDRESS_STR "\n",
-			MAC_ADDR_ARRAY(adapter->macAddressCurrent.bytes),
+			MAC_ADDR_ARRAY(adapter->mac_addr.bytes),
 			MAC_ADDR_ARRAY(wrqu.ap_addr.sa_data));
 		hdd_send_update_beacon_ies_event(adapter, pCsrRoamInfo);
 

core/hdd/src/wlan_hdd_cfg80211.c

@@ -1874,7 +1874,7 @@ int wlan_hdd_cfg80211_start_acs(struct hdd_adapter *adapter)
 	acs_event_callback = hdd_hostapd_sap_event_cb;
 
 	qdf_mem_copy(sap_config->self_macaddr.bytes,
-		adapter->macAddressCurrent.bytes, sizeof(struct qdf_mac_addr));
+		adapter->mac_addr.bytes, sizeof(struct qdf_mac_addr));
 	hdd_notice("ACS Started for %s", adapter->dev->name);
 	status = wlansap_acs_chselect(
 		WLAN_HDD_GET_SAP_CTX_PTR(adapter),
@@ -7114,7 +7114,7 @@ wlan_hdd_add_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
 			MAC_ADDR_ARRAY(add_req->mac_address.bytes));
 
 	if (!qdf_is_macaddr_equal(&add_req->mac_address,
-				  &adapter->macAddressCurrent)) {
+				  &adapter->mac_addr)) {
 		hdd_err("input src mac address and connected ap bssid are different");
 		goto fail;
 	}
@@ -7227,7 +7227,7 @@ wlan_hdd_del_tx_ptrn(struct hdd_adapter *adapter, struct hdd_context *hdd_ctx,
 		return -ENOMEM;
 	}
 
-	qdf_copy_macaddr(&del_req->mac_address, &adapter->macAddressCurrent);
+	qdf_copy_macaddr(&del_req->mac_address, &adapter->mac_addr);
 	hdd_debug(MAC_ADDRESS_STR, MAC_ADDR_ARRAY(del_req->mac_address.bytes));
 	del_req->ucPtrnId = pattern_id;
 	hdd_debug("Request Id: %u Pattern id: %d",
@@ -13983,7 +13983,7 @@ static int __wlan_hdd_cfg80211_change_iface(struct wiphy *wiphy,
 				ndev->dev_addr[1] = 0x1A;
 				ndev->dev_addr[2] = 0x11;
 				ndev->dev_addr[3] |= 0xF0;
-				memcpy(adapter->macAddressCurrent.
+				memcpy(adapter->mac_addr.
 				       bytes, ndev->dev_addr,
 				       QDF_MAC_ADDR_SIZE);
 				pr_info("wlan: Generated HotSpot BSSID "
@@ -18114,7 +18114,7 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 	/* Clearing add IE of beacon */
-	qdf_mem_copy(updateIE.bssid.bytes, adapter->macAddressCurrent.bytes,
+	qdf_mem_copy(updateIE.bssid.bytes, adapter->mac_addr.bytes,
 		     sizeof(tSirMacAddr));
 	updateIE.smeSessionId = adapter->sessionId;
 	updateIE.ieBufferlength = 0;
@@ -19935,7 +19935,7 @@ static int __wlan_hdd_cfg80211_set_mon_ch(struct wiphy *wiphy,
 	roam_profile.ch_params.ch_width = hdd_map_nl_chan_width(chandef->width);
 	hdd_select_cbmode(adapter, chan_num, &roam_profile.ch_params);
 
-	qdf_mem_copy(bssid.bytes, adapter->macAddressCurrent.bytes,
+	qdf_mem_copy(bssid.bytes, adapter->mac_addr.bytes,
 		     QDF_MAC_ADDR_SIZE);
 
 	ch_params.ch_width = hdd_map_nl_chan_width(chandef->width);

core/hdd/src/wlan_hdd_debugfs.c

@@ -392,7 +392,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 		delPeriodicTxPtrnParams->ucPtrnId = pattern_idx;
 		delPeriodicTxPtrnParams->ucPatternIdBitmap = 1 << pattern_idx;
 		qdf_copy_macaddr(&delPeriodicTxPtrnParams->mac_address,
-				 &adapter->macAddressCurrent);
+				 &adapter->mac_addr);
 
 		/* Delete pattern */
 		status = sme_del_periodic_tx_ptrn(hdd_ctx->hHal,
@@ -454,7 +454,7 @@ static ssize_t __wcnss_patterngen_write(struct file *file,
 	addPeriodicTxPtrnParams->usPtrnIntervalMs = pattern_duration * 500;
 	addPeriodicTxPtrnParams->ucPtrnSize = pattern_len;
 	qdf_copy_macaddr(&addPeriodicTxPtrnParams->mac_address,
-			 &adapter->macAddressCurrent);
+			 &adapter->mac_addr);
 
 	/* Extract the pattern */
 	for (i = 0; i < addPeriodicTxPtrnParams->ucPtrnSize; i++) {

core/hdd/src/wlan_hdd_hostapd.c

@@ -252,8 +252,8 @@ hdd_hostapd_init_sap_session(struct hdd_adapter *adapter,
 		goto error;
 	}
 	status = wlansap_start(sap_ctx, adapter->device_mode,
-			adapter->macAddressCurrent.bytes,
-			adapter->sessionId);
+			       adapter->mac_addr.bytes,
+			       adapter->sessionId);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("wlansap_start failed!! status: %d", status);
 		adapter->sessionCtx.ap.sap_context = NULL;
@@ -1123,7 +1123,7 @@ static void __wlan_hdd_sap_pre_cac_failure(void *data)
 	}
 
 	wlan_hdd_release_intf_addr(hdd_ctx,
-				   adapter->macAddressCurrent.bytes);
+				   adapter->mac_addr.bytes);
 	hdd_stop_adapter(hdd_ctx, adapter, true);
 	hdd_close_adapter(hdd_ctx, adapter, false);
 }
@@ -1174,7 +1174,7 @@ static void wlan_hdd_sap_pre_cac_success(void *data)
 
 	cds_ssr_protect(__func__);
 	wlan_hdd_release_intf_addr(hdd_ctx,
-				   adapter->macAddressCurrent.bytes);
+				   adapter->mac_addr.bytes);
 	hdd_stop_adapter(hdd_ctx, adapter, true);
 	hdd_close_adapter(hdd_ctx, adapter, false);
 	cds_ssr_unprotect(__func__);
@@ -3371,7 +3371,7 @@ static __iw_softap_setparam(struct net_device *dev,
 
 		hdd_debug("MC Target rate %d", set_value);
 		qdf_copy_macaddr(&rateUpdate.bssid,
-				 &adapter->macAddressCurrent);
+				 &adapter->mac_addr);
 		rateUpdate.nss = (pConfig->enable2x2 == 0) ? 0 : 1;
 		rateUpdate.dev_mode = adapter->device_mode;
 		rateUpdate.mcastDataRate24GHz = set_value;
@@ -4435,8 +4435,8 @@ static __iw_softap_set_max_tx_power(struct net_device *dev,
 		return ret;
 
 	/* Assign correct self MAC address */
-	qdf_copy_macaddr(&bssid, &adapter->macAddressCurrent);
-	qdf_copy_macaddr(&selfMac, &adapter->macAddressCurrent);
+	qdf_copy_macaddr(&bssid, &adapter->mac_addr);
+	qdf_copy_macaddr(&selfMac, &adapter->mac_addr);
 
 	set_value = value[0];
 	if (QDF_STATUS_SUCCESS !=
@@ -4526,7 +4526,7 @@ static __iw_softap_set_tx_power(struct net_device *dev,
 	if (0 != ret)
 		return ret;
 
-	qdf_copy_macaddr(&bssid, &adapter->macAddressCurrent);
+	qdf_copy_macaddr(&bssid, &adapter->mac_addr);
 
 	set_value = value[0];
 	if (QDF_STATUS_SUCCESS !=
@@ -6369,7 +6369,7 @@ struct hdd_adapter *hdd_wlan_create_ap_dev(struct hdd_context *hdd_ctx,
 
 	qdf_mem_copy(dev->dev_addr, (void *)macAddr,
 		     sizeof(tSirMacAddr));
-	qdf_mem_copy(adapter->macAddressCurrent.bytes,
+	qdf_mem_copy(adapter->mac_addr.bytes,
 		     (void *)macAddr, sizeof(tSirMacAddr));
 
 	adapter->offloads_configured = false;
@@ -7033,7 +7033,7 @@ int wlan_hdd_cfg80211_update_apies(struct hdd_adapter *adapter)
 
 	wlan_hdd_add_sap_obss_scan_ie(adapter, genie, &total_ielen);
 
-	qdf_copy_macaddr(&updateIE.bssid, &adapter->macAddressCurrent);
+	qdf_copy_macaddr(&updateIE.bssid, &adapter->mac_addr);
 	updateIE.smeSessionId = adapter->sessionId;
 
 	if (test_bit(SOFTAP_BSS_STARTED, &adapter->event_flags)) {
@@ -7849,7 +7849,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 	}
 
 	qdf_mem_copy(pConfig->self_macaddr.bytes,
-		     adapter->macAddressCurrent.bytes,
+		     adapter->mac_addr.bytes,
 		     QDF_MAC_ADDR_SIZE);
 
 	/* default value */
@@ -8032,7 +8032,7 @@ int wlan_hdd_cfg80211_start_bss(struct hdd_adapter *adapter,
 #endif
 
 	hdd_debug("SOftAP macaddress : " MAC_ADDRESS_STR,
-	       MAC_ADDR_ARRAY(adapter->macAddressCurrent.bytes));
+	       MAC_ADDR_ARRAY(adapter->mac_addr.bytes));
 	hdd_debug("ssid =%s, beaconint=%d, channel=%d",
 	       pConfig->SSIDinfo.ssid.ssId, (int)pConfig->beacon_int,
 	       (int)pConfig->channel);
@@ -8323,7 +8323,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
 		return -EINVAL;
 	}
 
-	qdf_copy_macaddr(&updateIE.bssid, &adapter->macAddressCurrent);
+	qdf_copy_macaddr(&updateIE.bssid, &adapter->mac_addr);
 	updateIE.smeSessionId = adapter->sessionId;
 	updateIE.ieBufferlength = 0;
 	updateIE.pAdditionIEBuffer = NULL;

core/hdd/src/wlan_hdd_ioctl.c

@@ -1126,7 +1126,7 @@ hdd_sendactionframe(struct hdd_adapter *adapter, const uint8_t *bssid,
 	hdr->frame_control =
 		cpu_to_le16(IEEE80211_FTYPE_MGMT | IEEE80211_STYPE_ACTION);
 	qdf_mem_copy(hdr->addr1, bssid, QDF_MAC_ADDR_SIZE);
-	qdf_mem_copy(hdr->addr2, adapter->macAddressCurrent.bytes,
+	qdf_mem_copy(hdr->addr2, adapter->mac_addr.bytes,
 		     QDF_MAC_ADDR_SIZE);
 	qdf_mem_copy(hdr->addr3, bssid, QDF_MAC_ADDR_SIZE);
 	qdf_mem_copy(hdr + 1, payload, payload_len);
@@ -2016,7 +2016,7 @@ static int hdd_set_app_type1_parser(struct hdd_adapter *adapter,
 
 	memset(&params, 0, sizeof(tSirAppType1Params));
 	params.vdev_id = adapter->sessionId;
-	qdf_copy_macaddr(&params.wakee_mac_addr, &adapter->macAddressCurrent);
+	qdf_copy_macaddr(&params.wakee_mac_addr, &adapter->mac_addr);
 
 	params.id_length = strlen(id);
 	qdf_mem_copy(params.identification_id, id, params.id_length);
@@ -2823,7 +2823,7 @@ int wlan_hdd_set_mc_rate(struct hdd_adapter *adapter, int targetRate)
 	rateUpdate.mcastDataRate24GHzTxFlag = 1;
 	rateUpdate.mcastDataRate5GHz = targetRate;
 	rateUpdate.bcastDataRate = -1;
-	qdf_copy_macaddr(&rateUpdate.bssid, &adapter->macAddressCurrent);
+	qdf_copy_macaddr(&rateUpdate.bssid, &adapter->mac_addr);
 	hdd_debug("MC Target rate %d, mac = %pM, dev_mode %s(%d)",
 		  rateUpdate.mcastDataRate24GHz, rateUpdate.bssid.bytes,
 		  hdd_device_mode_to_string(adapter->device_mode),
@@ -5218,7 +5218,7 @@ static int drv_cmd_set_rmc_tx_rate(struct hdd_adapter *adapter,
 	rateUpdateParams.dev_mode = adapter->device_mode;
 	rateUpdateParams.bcastDataRate = -1;
 	memcpy(rateUpdateParams.bssid.bytes,
-	       adapter->macAddressCurrent.bytes,
+	       adapter->mac_addr.bytes,
 	       sizeof(rateUpdateParams.bssid));
 	status = sme_send_rate_update_ind((tHalHandle) (hdd_ctx->hHal),
 							 &rateUpdateParams);
@@ -5694,9 +5694,9 @@ static int drv_cmd_max_tx_power(struct hdd_adapter *adapter,
 		adapter = pAdapterNode->adapter;
 		/* Assign correct self MAC address */
 		qdf_copy_macaddr(&bssid,
-				 &adapter->macAddressCurrent);
+				 &adapter->mac_addr);
 		qdf_copy_macaddr(&selfMac,
-				 &adapter->macAddressCurrent);
+				 &adapter->mac_addr);
 
 		hdd_debug("Device mode %d max tx power %d selfMac: "
 			 MAC_ADDRESS_STR " bssId: " MAC_ADDRESS_STR " ",

core/hdd/src/wlan_hdd_ipa.c

@@ -1431,7 +1431,7 @@ void hdd_ipa_set_tx_flow_info(void)
 			    QDF_STATUS_SUCCESS) {
 				p2pChannel = hdd_ap_ctx->operating_channel;
 				qdf_copy_macaddr(&p2pBssid,
-						 &adapter->macAddressCurrent);
+						 &adapter->mac_addr);
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL
 				targetChannel = p2pChannel;
 #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */
@@ -1446,7 +1446,7 @@ void hdd_ipa_set_tx_flow_info(void)
 			    QDF_STATUS_SUCCESS) {
 				apChannel = hdd_ap_ctx->operating_channel;
 				qdf_copy_macaddr(&apBssid,
-						&adapter->macAddressCurrent);
+						&adapter->mac_addr);
 #ifdef QCA_LL_LEGACY_TX_FLOW_CONTROL
 				targetChannel = apChannel;
 #endif /* QCA_LL_LEGACY_TX_FLOW_CONTROL */

core/hdd/src/wlan_hdd_main.c

@@ -2886,7 +2886,7 @@ static int __hdd_set_mac_address(struct net_device *dev, void *addr)
 	if (0 != ret)
 		return ret;
 
-	memcpy(&adapter->macAddressCurrent, psta_mac_addr->sa_data, ETH_ALEN);
+	memcpy(&adapter->mac_addr, psta_mac_addr->sa_data, ETH_ALEN);
 	memcpy(dev->dev_addr, psta_mac_addr->sa_data, ETH_ALEN);
 
 	EXIT();
@@ -3174,7 +3174,7 @@ static struct hdd_adapter *hdd_alloc_station_adapter(struct hdd_context *hdd_ctx
 
 		qdf_mem_copy(pWlanDev->dev_addr, (void *)macAddr,
 			     sizeof(tSirMacAddr));
-		qdf_mem_copy(adapter->macAddressCurrent.bytes, macAddr,
+		qdf_mem_copy(adapter->mac_addr.bytes, macAddr,
 			     sizeof(tSirMacAddr));
 		pWlanDev->watchdog_timeo = HDD_TX_TIMEOUT;
 
@@ -3390,7 +3390,7 @@ int hdd_vdev_create(struct hdd_adapter *adapter)
 	/* Open a SME session (prepare vdev in firmware via legacy API) */
 	INIT_COMPLETION(adapter->session_open_comp_var);
 	status = sme_open_session(hdd_ctx->hHal, hdd_sme_roam_callback, adapter,
-				  (uint8_t *)&adapter->macAddressCurrent,
+				  (uint8_t *)&adapter->mac_addr,
 				  adapter->sessionId, type, sub_type);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("failed to open sme session: %d", status);
@@ -3641,7 +3641,7 @@ static QDF_STATUS hdd_check_for_existing_macaddr(struct hdd_context *hdd_ctx,
 	while (NULL != adapterNode && QDF_STATUS_SUCCESS == status) {
 		adapter = adapterNode->adapter;
 		if (adapter
-		    && !qdf_mem_cmp(adapter->macAddressCurrent.bytes,
+		    && !qdf_mem_cmp(adapter->mac_addr.bytes,
 				       macAddr, sizeof(tSirMacAddr))) {
 			return QDF_STATUS_E_FAILURE;
 		}
@@ -4126,7 +4126,7 @@ struct hdd_adapter *hdd_open_adapter(struct hdd_context *hdd_ctx, uint8_t sessio
 	return adapter;
 
 err_free_netdev:
-	wlan_hdd_release_intf_addr(hdd_ctx, adapter->macAddressCurrent.bytes);
+	wlan_hdd_release_intf_addr(hdd_ctx, adapter->mac_addr.bytes);
 	free_netdev(adapter->dev);
 
 	return NULL;
@@ -4209,7 +4209,7 @@ QDF_STATUS hdd_close_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held)
 		status = hdd_remove_front_adapter(hdd_ctx, &pHddAdapterNode);
 		if (pHddAdapterNode && QDF_STATUS_SUCCESS == status) {
 			wlan_hdd_release_intf_addr(hdd_ctx,
-			pHddAdapterNode->adapter->macAddressCurrent.bytes);
+			pHddAdapterNode->adapter->mac_addr.bytes);
 			hdd_cleanup_adapter(hdd_ctx, pHddAdapterNode->adapter,
 					    rtnl_held);
 			qdf_mem_free(pHddAdapterNode);
@@ -4242,7 +4242,7 @@ void wlan_hdd_reset_prob_rspies(struct hdd_adapter *adapter)
 	case QDF_P2P_GO_MODE:
 	case QDF_IBSS_MODE:
 	{
-		bssid = &adapter->macAddressCurrent;
+		bssid = &adapter->mac_addr;
 		break;
 	}
 	case QDF_FTM_MODE:
@@ -4428,7 +4428,7 @@ QDF_STATUS hdd_stop_adapter(struct hdd_context *hdd_ctx, struct hdd_adapter *ada
 						adapter->sessionId);
 
 			qdf_copy_macaddr(&updateIE.bssid,
-					 &adapter->macAddressCurrent);
+					 &adapter->mac_addr);
 			updateIE.smeSessionId = adapter->sessionId;
 			updateIE.ieBufferlength = 0;
 			updateIE.pAdditionIEBuffer = NULL;
@@ -5356,7 +5356,7 @@ struct hdd_adapter *hdd_get_adapter_by_macaddr(struct hdd_context *hdd_ctx,
 		adapter = adapterNode->adapter;
 
 		if (adapter
-		    && !qdf_mem_cmp(adapter->macAddressCurrent.bytes,
+		    && !qdf_mem_cmp(adapter->mac_addr.bytes,
 				       macAddr, sizeof(tSirMacAddr)))
 			return adapter;
 
@@ -12397,7 +12397,7 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 				&& (false ==
 				hdd_sta_ctx->conn_info.uIsAuthenticated)) {
 				sta_mac = (uint8_t *)
-					&(adapter->macAddressCurrent.bytes[0]);
+					&(adapter->mac_addr.bytes[0]);
 				hdd_debug("client " MAC_ADDRESS_STR
 					" is in middle of WPS/EAPOL exchange.",
 					MAC_ADDR_ARRAY(sta_mac));

core/hdd/src/wlan_hdd_nan_datapath.c

@@ -252,7 +252,7 @@ static int hdd_ndi_start_bss(struct hdd_adapter *adapter,
 	roam_profile->BSSType = eCSR_BSS_TYPE_NDI;
 	roam_profile->BSSIDs.numOfBSSIDs = 1;
 	qdf_mem_copy((void *)(roam_profile->BSSIDs.bssid),
-		&adapter->macAddressCurrent.bytes[0],
+		&adapter->mac_addr.bytes[0],
 		QDF_MAC_ADDR_SIZE);
 
 	roam_profile->AuthType.numEntries = 1;
@@ -592,7 +592,7 @@ static int hdd_ndp_initiator_req_handler(struct hdd_context *hdd_ctx,
 		nla_get_u32(tb[QCA_WLAN_VENDOR_ATTR_NDP_SERVICE_INSTANCE_ID]);
 
 	qdf_mem_copy(req.self_ndi_mac_addr.bytes,
-		     adapter->macAddressCurrent.bytes, QDF_MAC_ADDR_SIZE);
+		     adapter->mac_addr.bytes, QDF_MAC_ADDR_SIZE);
 
 	if (!tb[QCA_WLAN_VENDOR_ATTR_NDP_PEER_DISCOVERY_MAC_ADDR]) {
 		hdd_err("NDI peer discovery mac addr is unavailable");

core/hdd/src/wlan_hdd_object_manager.c

@@ -168,7 +168,7 @@ int hdd_objmgr_create_and_store_vdev(struct wlan_objmgr_pdev *pdev,
 	struct wlan_vdev_create_params vdev_params;
 
 	vdev_params.opmode = adapter->device_mode;
-	qdf_mem_copy(vdev_params.macaddr, adapter->macAddressCurrent.bytes,
+	qdf_mem_copy(vdev_params.macaddr, adapter->mac_addr.bytes,
 						QDF_NET_MAC_ADDR_MAX_LEN);
 	if (!pdev) {
 		hdd_err("pdev NULL");

core/hdd/src/wlan_hdd_ocb.c

@@ -240,7 +240,7 @@ static int hdd_ocb_register_sta(struct hdd_adapter *adapter)
 	void *pdev = cds_get_context(QDF_MODULE_ID_TXRX);
 
 	qdf_status = cdp_peer_register_ocb_peer(soc,
-				adapter->macAddressCurrent.bytes,
+				adapter->mac_addr.bytes,
 				&peer_id);
 	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
 		hdd_err("Error registering OCB Self Peer!");
@@ -276,7 +276,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],
-			 &adapter->macAddressCurrent);
+			 &adapter->mac_addr);
 
 	return 0;
 }
@@ -537,7 +537,7 @@ static int __iw_set_dot11p_channel_sched(struct net_device *dev,
 		 */
 		if (i == 0) {
 			qdf_copy_macaddr(&curr_chan->mac_address,
-				     &adapter->macAddressCurrent);
+				     &adapter->mac_addr);
 		} else {
 			mac_addr = wlan_hdd_get_intf_addr(hdd_ctx);
 			if (mac_addr == NULL) {
@@ -888,7 +888,7 @@ static int __wlan_hdd_cfg80211_ocb_set_config(struct wiphy *wiphy,
 	for (i = 0; i < config->channel_count; i++) {
 		if (i == 0) {
 			qdf_copy_macaddr(&config->channels[i].mac_address,
-				&adapter->macAddressCurrent);
+				&adapter->mac_addr);
 		} else {
 			mac_addr = wlan_hdd_get_intf_addr(hdd_ctx);
 			if (mac_addr == NULL) {
@@ -1145,7 +1145,7 @@ __wlan_hdd_cfg80211_ocb_start_timing_advert(struct wiphy *wiphy,
 
 	timing_advert->template_length =
 		sme_ocb_gen_timing_advert_frame(hdd_ctx->hHal,
-			*(tSirMacAddr *)&adapter->macAddressCurrent.bytes,
+			*(tSirMacAddr *)&adapter->mac_addr.bytes,
 			&timing_advert->template_value,
 			&timing_advert->timestamp_offset,
 			&timing_advert->time_value_offset);

core/hdd/src/wlan_hdd_p2p.c

@@ -796,7 +796,7 @@ int __wlan_hdd_del_virtual_intf(struct wiphy *wiphy, struct wireless_dev *wdev)
 		hdd_clean_up_pre_cac_interface(hdd_ctx);
 	} else {
 		wlan_hdd_release_intf_addr(hdd_ctx,
-					 pVirtAdapter->macAddressCurrent.bytes);
+					 pVirtAdapter->mac_addr.bytes);
 		hdd_stop_adapter(hdd_ctx, pVirtAdapter, true);
 		hdd_close_adapter(hdd_ctx, pVirtAdapter, true);
 	}

core/hdd/src/wlan_hdd_power.c

@@ -1961,7 +1961,7 @@ static void hdd_stop_dhcp_ind(struct hdd_adapter *adapter)
 
 	hdd_debug("DHCP stop indicated through power save");
 	sme_dhcp_stop_ind(hdd_ctx->hHal, adapter->device_mode,
-			  adapter->macAddressCurrent.bytes,
+			  adapter->mac_addr.bytes,
 			  adapter->sessionId);
 	hdd_allow_suspend(WIFI_POWER_EVENT_WAKELOCK_DHCP);
 	qdf_runtime_pm_allow_suspend(&adapter->connect_rpm_ctx.connect);
@@ -1985,7 +1985,7 @@ static void hdd_start_dhcp_ind(struct hdd_adapter *adapter)
 	hdd_prevent_suspend_timeout(HDD_WAKELOCK_TIMEOUT_CONNECT,
 				    WIFI_POWER_EVENT_WAKELOCK_DHCP);
 	sme_dhcp_start_ind(hdd_ctx->hHal, adapter->device_mode,
-			   adapter->macAddressCurrent.bytes,
+			   adapter->mac_addr.bytes,
 			   adapter->sessionId);
 }
 

core/hdd/src/wlan_hdd_stats.c

@@ -490,7 +490,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 
 	pInfo->mode = hdd_map_device_to_ll_iface_mode(adapter->device_mode);
 
-	qdf_copy_macaddr(&pInfo->macAddr, &adapter->macAddressCurrent);
+	qdf_copy_macaddr(&pInfo->macAddr, &adapter->mac_addr);
 
 	if (((QDF_STA_MODE == adapter->device_mode) ||
 	     (QDF_P2P_CLIENT_MODE == adapter->device_mode) ||
@@ -510,7 +510,7 @@ bool hdd_get_interface_info(struct hdd_adapter *adapter,
 		     sta_ctx->conn_info.connState)
 		    && (false == sta_ctx->conn_info.uIsAuthenticated)) {
 			staMac =
-				(uint8_t *) &(adapter->macAddressCurrent.
+				(uint8_t *) &(adapter->mac_addr.
 					      bytes[0]);
 			hdd_err("client " MAC_ADDRESS_STR
 				" is in the middle of WPS/EAPOL exchange.",

core/hdd/src/wlan_hdd_tx_rx.c

@@ -1755,7 +1755,7 @@ int hdd_set_mon_rx_cb(struct net_device *dev)
 	}
 
 	qdf_status = sme_create_mon_session(hdd_ctx->hHal,
-				     adapter->macAddressCurrent.bytes);
+				     adapter->mac_addr.bytes);
 	if (QDF_STATUS_SUCCESS != qdf_status) {
 		hdd_err("sme_create_mon_session() failed to register. Status= %d [0x%08X]",
 			qdf_status, qdf_status);

core/hdd/src/wlan_hdd_wext.c

@@ -10593,7 +10593,7 @@ int wlan_hdd_set_mon_chan(struct hdd_adapter *adapter, uint32_t chan,
 	roam_profile.ch_params.ch_width = bandwidth;
 	hdd_select_cbmode(adapter, chan, &roam_profile.ch_params);
 
-	qdf_mem_copy(bssid.bytes, adapter->macAddressCurrent.bytes,
+	qdf_mem_copy(bssid.bytes, adapter->mac_addr.bytes,
 		     QDF_MAC_ADDR_SIZE);
 
 	ch_params.ch_width = bandwidth;

core/hdd/src/wlan_hdd_wowl.c

@@ -489,7 +489,7 @@ bool hdd_enter_wowl(struct hdd_adapter *adapter,
 	wowParams.sessionId = adapter->sessionId;
 	if (enable_mp) {
 		qdf_copy_macaddr(&wowParams.magic_ptrn,
-				 &adapter->macAddressCurrent);
+				 &adapter->mac_addr);
 	}
 #ifdef WLAN_WAKEUP_EVENTS
 	wowParams.ucWoWEAPIDRequestEnable = true;