Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 824afaac authored by Srinivas Girigowda's avatar Srinivas Girigowda Committed by snandini
Browse files

qcacmn: umac: Replace %pM/QDF_MAC_ADR_STR/ARRAY with proper macros 

For kernel and driver logs, replace %pM and QDF_MAC_ADDR_STR/ARRAY
with QDF_MAC_ADDR_FMT.
For tx/rx mask, use QDF_FULL_MAC_FMT.

CRs-Fixed: 2763028
Change-Id: I6c56c2040967b279dd31100c4f376f2452146742
parent c9849701

umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c

+4 −4
Original line number Diff line number Diff line
@@ -712,12 +712,12 @@ QDF_STATUS ucfg_cfr_get_cfg(struct wlan_objmgr_vdev *vdev) 
			glbl_cfg->data_subtype_filter);

		cfr_err("TX Addr: " QDF_MAC_ADDR_FMT,

			QDF_MAC_ADDR_REF(glbl_cfg->tx_addr));

		cfr_err("TX Addr Mask: " QDF_MAC_ADDR_FMT,

			QDF_MAC_ADDR_REF(glbl_cfg->tx_addr_mask));

		cfr_err("TX Addr Mask: " QDF_FULL_MAC_FMT,

			QDF_FULL_MAC_REF(glbl_cfg->tx_addr_mask));

		cfr_err("RX Addr: " QDF_MAC_ADDR_FMT,

			QDF_MAC_ADDR_REF(glbl_cfg->rx_addr));

		cfr_err("RX Addr Mask: " QDF_MAC_ADDR_FMT,

			QDF_MAC_ADDR_REF(glbl_cfg->rx_addr_mask));

		cfr_err("RX Addr Mask: " QDF_FULL_MAC_FMT,

			QDF_FULL_MAC_REF(glbl_cfg->rx_addr_mask));

	}



	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);

umac/cmn_services/obj_mgr/src/wlan_objmgr_debug.c

+2 −2
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ void wlan_objmgr_notify_destroy(void *obj, 
		obj_mgr_err("obj_name is null");

		return;

	}

	obj_mgr_debug("#%s, macaddr: " QDF_MAC_ADDR_FMT" exited L-state",

	obj_mgr_debug("#%s : macaddr: "QDF_MAC_ADDR_FMT" exited L-state",

		      obj_name, QDF_MAC_ADDR_REF(macaddr));



	wlan_objmgr_rem_ld_obj_from_list(del_obj,

umac/scan/core/src/wlan_scan_cache_db.c

+2 −2
Original line number Diff line number Diff line
@@ -963,9 +963,9 @@ QDF_STATUS __scm_handle_bcn_probe(struct scan_bcn_probe_event *bcn) 
		if (scan_obj->drop_bcn_on_invalid_freq &&

		    wlan_reg_is_disable_for_freq(pdev,

					scan_entry->channel.chan_freq)) {

			scm_nofl_debug("Drop frame for invalid freq %d: %pM Seq Num: %d RSSI %d",

			scm_nofl_debug("Drop frame for invalid freq %d: "QDF_MAC_ADDR_FMT" Seq Num: %d RSSI %d",

				       scan_entry->channel.chan_freq,

				       scan_entry->bssid.bytes,

				       QDF_MAC_ADDR_REF(scan_entry->bssid.bytes),

				       scan_entry->seq_num,

				       scan_entry->rssi_raw);

			util_scan_free_cache_entry(scan_entry);

umac/scan/dispatcher/src/wlan_scan_utils_api.c

+4 −4
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ util_scan_get_chan_from_he_6g_params(struct wlan_objmgr_pdev *pdev, 
						band_mask);

	if (scan_obj->drop_bcn_on_invalid_freq &&

	    wlan_reg_is_disable_for_freq(pdev, *chan_freq)) {

		scm_debug_rl("%pM: Drop as invalid channel %d freq %d in HE 6Ghz params",

		scm_debug_rl(QDF_MAC_ADDR_FMT": Drop as invalid channel %d freq %d in HE 6Ghz params",

			     scan_params->bssid.bytes,

			     he_6g_params->primary_channel, *chan_freq);

		return QDF_STATUS_E_INVAL;
@@ -932,7 +932,7 @@ util_scan_populate_bcn_ie_list(struct wlan_objmgr_pdev *pdev, 
			/* Drop if invalid freq */

			if (scan_obj->drop_bcn_on_invalid_freq &&

			    wlan_reg_is_disable_for_freq(pdev, *chan_freq)) {

				scm_debug_rl("%pM: Drop as invalid channel %d freq %d in DS IE",

				scm_debug_rl(QDF_MAC_ADDR_FMT": Drop as invalid channel %d freq %d in DS IE",

					     scan_params->bssid.bytes,

					     chan_idx, *chan_freq);

				return QDF_STATUS_E_INVAL;
@@ -1020,7 +1020,7 @@ util_scan_populate_bcn_ie_list(struct wlan_objmgr_pdev *pdev, 
			/* Drop if invalid freq */

			if (scan_obj->drop_bcn_on_invalid_freq &&

			    wlan_reg_is_disable_for_freq(pdev, *chan_freq)) {

				scm_debug_rl("%pM: Drop as invalid channel %d freq %d in HT_INFO IE",

				scm_debug_rl(QDF_MAC_ADDR_FMT": Drop as invalid channel %d freq %d in HT_INFO IE",

					     scan_params->bssid.bytes,

					     chan_idx, *chan_freq);

				return QDF_STATUS_E_INVAL;
@@ -1556,7 +1556,7 @@ util_scan_gen_scan_entry(struct wlan_objmgr_pdev *pdev, 
	status = util_scan_populate_bcn_ie_list(pdev, scan_entry, &chan_freq,

						band_mask);

	if (QDF_IS_STATUS_ERROR(status)) {

		scm_debug("%pM: failed to parse beacon IE",

		scm_debug(QDF_MAC_ADDR_FMT": failed to parse beacon IE",

			  scan_entry->bssid.bytes);

		qdf_mem_free(scan_entry->raw_frame.ptr);

		qdf_mem_free(scan_entry);