qcacmn: os_if: Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF (d0442634) · Commits · e / devices / android_kernel_oneplus_sm7250

os_if/linux/cp_stats/src/wlan_cfg80211_mc_cp_stats.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -675,9 +675,9 @@ wlan_cfg80211_mc_cp_stats_get_mib_stats(struct wlan_objmgr_vdev *vdev,
	}		}
	qdf_mem_copy(info.peer_mac_addr, peer->macaddr, QDF_MAC_ADDR_SIZE);		qdf_mem_copy(info.peer_mac_addr, peer->macaddr, QDF_MAC_ADDR_SIZE);

	osif_debug("vdev id %d, pdev id %d, peer " QDF_MAC_ADDR_STR,		osif_debug("vdev id %d, pdev id %d, peer " QDF_MAC_ADDR_FMT,
	info.vdev_id, info.pdev_id,		info.vdev_id, info.pdev_id,
	QDF_MAC_ADDR_ARRAY(info.peer_mac_addr));		QDF_MAC_ADDR_REF(info.peer_mac_addr));

	wlan_objmgr_peer_release_ref(peer, WLAN_CP_STATS_ID);		wlan_objmgr_peer_release_ref(peer, WLAN_CP_STATS_ID);

os_if/linux/crypto/src/wlan_cfg80211_crypto.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -67,7 +67,8 @@ static void wlan_cfg80211_translate_key(struct wlan_objmgr_vdev *vdev,
	vdev->vdev_mlme.macaddr,		vdev->vdev_mlme.macaddr,
	QDF_MAC_ADDR_SIZE);		QDF_MAC_ADDR_SIZE);
	}		}
	osif_debug("mac %pM", crypto_key->macaddr);		osif_debug("mac "QDF_MAC_ADDR_FMT,
			QDF_MAC_ADDR_REF(crypto_key->macaddr));
	}		}

	int wlan_cfg80211_store_key(struct wlan_objmgr_vdev *vdev,		int wlan_cfg80211_store_key(struct wlan_objmgr_vdev *vdev,

os_if/linux/scan/src/wlan_cfg80211_scan.c

+19 −15

Original line number	Original line	Diff line number	Diff line
	@@ -86,8 +86,8 @@ static void wlan_fill_scan_rand_attrs(struct wlan_objmgr_vdev *vdev,
	*randomize = true;		*randomize = true;
	memcpy(addr, mac_addr, QDF_MAC_ADDR_SIZE);		memcpy(addr, mac_addr, QDF_MAC_ADDR_SIZE);
	memcpy(mask, mac_addr_mask, QDF_MAC_ADDR_SIZE);		memcpy(mask, mac_addr_mask, QDF_MAC_ADDR_SIZE);
	osif_debug("Random mac addr: %pM and Random mac mask: %pM",		osif_debug("Random mac addr: "QDF_MAC_ADDR_FMT" and Random mac mask: "QDF_MAC_ADDR_FMT,
	addr, mask);		QDF_MAC_ADDR_REF(addr), QDF_MAC_ADDR_REF(mask));
	}		}

	/**		/**
	@@ -1915,8 +1915,9 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
	bss_data.frame_len = wlan_get_frame_len(scan_params);		bss_data.frame_len = wlan_get_frame_len(scan_params);
	bss_data.mgmt = qdf_mem_malloc_atomic(bss_data.frame_len);		bss_data.mgmt = qdf_mem_malloc_atomic(bss_data.frame_len);
	if (!bss_data.mgmt) {		if (!bss_data.mgmt) {
	osif_err("mem alloc failed for bss %pM seq %d",		osif_err("mem alloc failed for bss "QDF_MAC_ADDR_FMT" seq %d",
	bss_data.mgmt->bssid, scan_params->seq_num);		QDF_MAC_ADDR_REF(bss_data.mgmt->bssid),
			scan_params->seq_num);
	return;		return;
	}		}
	qdf_mem_copy(bss_data.mgmt,		qdf_mem_copy(bss_data.mgmt,
	@@ -1937,8 +1938,9 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,
	bss_data.chan = wlan_get_ieee80211_channel(wiphy, pdev,		bss_data.chan = wlan_get_ieee80211_channel(wiphy, pdev,
	scan_params->channel.chan_freq);		scan_params->channel.chan_freq);
	if (!bss_data.chan) {		if (!bss_data.chan) {
	osif_err("Channel not found for bss %pM seq %d chan_freq %d",		osif_err("Channel not found for bss "QDF_MAC_ADDR_FMT" seq %d chan_freq %d",
	bss_data.mgmt->bssid, scan_params->seq_num,		QDF_MAC_ADDR_REF(bss_data.mgmt->bssid),
			scan_params->seq_num,
	scan_params->channel.chan_freq);		scan_params->channel.chan_freq);
	qdf_mem_free(bss_data.mgmt);		qdf_mem_free(bss_data.mgmt);
	return;		return;
	@@ -1957,8 +1959,9 @@ void wlan_cfg80211_inform_bss_frame(struct wlan_objmgr_pdev *pdev,

	bss = wlan_cfg80211_inform_bss_frame_data(wiphy, &bss_data);		bss = wlan_cfg80211_inform_bss_frame_data(wiphy, &bss_data);
	if (!bss)		if (!bss)
	osif_err("failed to inform bss %pM seq %d",		osif_err("failed to inform bss "QDF_MAC_ADDR_FMT" seq %d",
	bss_data.mgmt->bssid, scan_params->seq_num);		QDF_MAC_ADDR_REF(bss_data.mgmt->bssid),
			scan_params->seq_num);
	else		else
	wlan_cfg80211_put_bss(wiphy, bss);		wlan_cfg80211_put_bss(wiphy, bss);

	@@ -1998,10 +2001,11 @@ void __wlan_cfg80211_unlink_bss_list(struct wiphy wiphy, uint8_t bssid,
	bss = wlan_cfg80211_get_bss(wiphy, NULL, bssid,		bss = wlan_cfg80211_get_bss(wiphy, NULL, bssid,
	ssid, ssid_len);		ssid, ssid_len);
	if (!bss) {		if (!bss) {
	osif_info("BSS %pM not found", bssid);		osif_info("BSS "QDF_MAC_ADDR_FMT" not found",
			QDF_MAC_ADDR_REF(bssid));
	} else {		} else {
	osif_debug("unlink entry for ssid:%.*s and BSSID %pM",		osif_debug("unlink entry for ssid:%.*s and BSSID "QDF_MAC_ADDR_FMT,
	ssid_len, ssid, bssid);		ssid_len, ssid, QDF_MAC_ADDR_REF(bssid));
	cfg80211_unlink_bss(wiphy, bss);		cfg80211_unlink_bss(wiphy, bss);
	wlan_cfg80211_put_bss(wiphy, bss);		wlan_cfg80211_put_bss(wiphy, bss);
	}		}
	@@ -2017,11 +2021,11 @@ void __wlan_cfg80211_unlink_bss_list(struct wiphy wiphy, uint8_t bssid,
	*/		*/
	bss = wlan_cfg80211_get_bss(wiphy, NULL, bssid, NULL, 0);		bss = wlan_cfg80211_get_bss(wiphy, NULL, bssid, NULL, 0);
	if (!bss) {		if (!bss) {
	osif_debug("Hidden bss not found for Ssid:%.*s BSSID: %pM sid_len %d",		osif_debug("Hidden bss not found for Ssid:%.*s BSSID: "QDF_MAC_ADDR_FMT" sid_len %d",
	ssid_len, ssid, bssid, ssid_len);		ssid_len, ssid, QDF_MAC_ADDR_REF(bssid), ssid_len);
	} else {		} else {
	osif_debug("unlink entry for Hidden ssid:%.*s and BSSID %pM",		osif_debug("unlink entry for Hidden ssid:%.*s and BSSID "QDF_MAC_ADDR_FMT,
	ssid_len, ssid, bssid);		ssid_len, ssid, QDF_MAC_ADDR_REF(bssid));

	cfg80211_unlink_bss(wiphy, bss);		cfg80211_unlink_bss(wiphy, bss);
	/* cfg80211_get_bss get bss with ref count so release it */		/* cfg80211_get_bss get bss with ref count so release it */