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

Commit 1df400ca authored by Srinivas Girigowda's avatar Srinivas Girigowda Committed by snandini
Browse files

qcacmn: umac: Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF 

Change %pM/QDF_MAC_ADDR_STR/ARRAY to QDF_MAC_ADDR_FMT/REF.

CRs-Fixed: 2751002
Change-Id: I78b072b5cc623477135823512f9b8e7ef7ef4309
parent 0761d6c2

umac/cfr/dispatcher/src/wlan_cfr_ucfg_api.c

+8 −8
Original line number Diff line number Diff line
@@ -710,14 +710,14 @@ QDF_STATUS ucfg_cfr_get_cfg(struct wlan_objmgr_vdev *vdev) 
			glbl_cfg->ctrl_subtype_filter);

		cfr_err("Data subtype : 0x%x\n",

			glbl_cfg->data_subtype_filter);

		cfr_err("TX Addr: " QDF_MAC_ADDR_STR,

			QDF_MAC_ADDR_ARRAY(glbl_cfg->tx_addr));

		cfr_err("TX Addr Mask: " QDF_MAC_ADDR_STR,

			QDF_MAC_ADDR_ARRAY(glbl_cfg->tx_addr_mask));

		cfr_err("RX Addr: " QDF_MAC_ADDR_STR,

			QDF_MAC_ADDR_ARRAY(glbl_cfg->rx_addr));

		cfr_err("RX Addr Mask: " QDF_MAC_ADDR_STR,

			QDF_MAC_ADDR_ARRAY(glbl_cfg->rx_addr_mask));

		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("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));

	}



	wlan_objmgr_pdev_release_ref(pdev, WLAN_CFR_ID);

umac/cmn_services/mgmt_txrx/dispatcher/src/wlan_mgmt_txrx_tgt_api.c

+9 −6
Original line number Diff line number Diff line
@@ -971,8 +971,9 @@ QDF_STATUS tgt_mgmt_txrx_rx_frame_handler( 
							      wh->i_addr3);



	if (!is_from_addr_valid && !is_bssid_valid) {

		mgmt_txrx_debug_rl("from addr %pM bssid addr %pM both not valid, dropping them",

				   wh->i_addr2, wh->i_addr3);

		mgmt_txrx_debug_rl("from addr "QDF_MAC_ADDR_FMT" bssid addr "QDF_MAC_ADDR_FMT" both not valid, dropping them",

				   QDF_MAC_ADDR_REF(wh->i_addr2),

				   QDF_MAC_ADDR_REF(wh->i_addr3));

		qdf_nbuf_free(buf);

		return QDF_STATUS_E_FAILURE;

	}
@@ -980,8 +981,9 @@ QDF_STATUS tgt_mgmt_txrx_rx_frame_handler( 
	if ((mgmt_subtype == MGMT_SUBTYPE_BEACON ||

	     mgmt_subtype == MGMT_SUBTYPE_PROBE_RESP) &&

	    !(is_from_addr_valid && is_bssid_valid)) {

		mgmt_txrx_debug_rl("from addr %pM bssid addr %pM not valid, modifying them",

				   wh->i_addr2, wh->i_addr3);

		mgmt_txrx_debug_rl("from addr "QDF_MAC_ADDR_FMT" bssid addr "QDF_MAC_ADDR_FMT" not valid, modifying them",

				   QDF_MAC_ADDR_REF(wh->i_addr2),

				   QDF_MAC_ADDR_REF(wh->i_addr3));

		if (!is_from_addr_valid)

			qdf_mem_copy(wh->i_addr2, wh->i_addr3,

				     QDF_MAC_ADDR_SIZE);
@@ -1033,8 +1035,9 @@ QDF_STATUS tgt_mgmt_txrx_rx_frame_handler( 
	if (!(mgmt_subtype == MGMT_SUBTYPE_BEACON ||

	      mgmt_subtype == MGMT_SUBTYPE_PROBE_RESP ||

	      mgmt_subtype == MGMT_SUBTYPE_PROBE_REQ))

		mgmt_txrx_debug("Rcvd mgmt frame subtype %x (frame type %u) from %pM, seq_num = %d, rssi = %d tsf_delta: %u",

				mgmt_subtype, frm_type, wh->i_addr2,

		mgmt_txrx_debug("Rcvd mgmt frame subtype %x (frame type %u) from "QDF_MAC_ADDR_FMT", seq_num = %d, rssi = %d tsf_delta: %u",

				mgmt_subtype, frm_type,

				QDF_MAC_ADDR_REF(wh->i_addr2),

				(le16toh(*(uint16_t *)wh->i_seq) >>

				WLAN_SEQ_SEQ_SHIFT), mgmt_rx_params->rssi,

				mgmt_rx_params->tsf_delta);

umac/cmn_services/obj_mgr/src/wlan_objmgr_debug.c

+6 −6
Original line number Diff line number Diff line
@@ -202,8 +202,8 @@ void wlan_objmgr_notify_log_delete(void *obj, 
	wlan_obj_type_get_obj(del_obj, &node->obj, obj_type);

	node->obj_type = obj_type;

	node->tstamp = tstamp;

	obj_mgr_debug("#%s : mac_addr :" QDF_MAC_ADDR_STR" entered L-state",

		      obj_name, QDF_MAC_ADDR_ARRAY(macaddr));

	obj_mgr_debug("#%s : mac_addr :" QDF_MAC_ADDR_FMT" entered L-state",

		      obj_name, QDF_MAC_ADDR_REF(macaddr));

	wlan_objmgr_insert_ld_obj_to_list(debug_info, &node->node);

}
@@ -290,8 +290,8 @@ void wlan_objmgr_notify_destroy(void *obj, 
		obj_mgr_err("obj_name is null");

		return;

	}

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

		      obj_name, QDF_MAC_ADDR_ARRAY(macaddr));

	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,

					 debug_info, obj_type);
@@ -492,8 +492,8 @@ static void wlan_objmgr_iterate_log_del_obj_handler(void *timer_arg) 
			break;

		}



		obj_mgr_alert("#%s in L-state,MAC: " QDF_MAC_ADDR_STR,

			      obj_name, QDF_MAC_ADDR_ARRAY(macaddr));

		obj_mgr_alert("#%s in L-state,MAC: " QDF_MAC_ADDR_FMT,

			      obj_name, QDF_MAC_ADDR_REF(macaddr));

		wlan_objmgr_print_pending_refs(&del_obj->obj, obj_type);



		wlan_objmgr_trace_print_ref(&del_obj->obj, obj_type);

umac/cmn_services/obj_mgr/src/wlan_objmgr_peer_obj.c

+36 −48
Original line number Diff line number Diff line
@@ -84,9 +84,8 @@ static QDF_STATUS wlan_objmgr_peer_obj_free(struct wlan_objmgr_peer *peer) 
	vdev = wlan_peer_get_vdev(peer);

	if (!vdev) {

		obj_mgr_err(

			"VDEV is NULL for peer(%02x:%02x:%02x:%02x:%02x:%02x)",

				macaddr[0], macaddr[1], macaddr[2],

				macaddr[3], macaddr[4], macaddr[5]);

			"VDEV is NULL for peer("QDF_MAC_ADDR_FMT")",

				QDF_MAC_ADDR_REF(macaddr));

		return QDF_STATUS_E_FAILURE;

	}
@@ -96,9 +95,8 @@ static QDF_STATUS wlan_objmgr_peer_obj_free(struct wlan_objmgr_peer *peer) 
	psoc = wlan_vdev_get_psoc(vdev);

	if (!psoc) {

		obj_mgr_err(

			"PSOC is NULL for peer(%02x:%02x:%02x:%02x:%02x:%02x)",

				macaddr[0], macaddr[1], macaddr[2],

				macaddr[3], macaddr[4], macaddr[5]);

			"PSOC is NULL for peer("QDF_MAC_ADDR_FMT")",

				QDF_MAC_ADDR_REF(macaddr));

		return QDF_STATUS_E_FAILURE;

	}
@@ -114,18 +112,16 @@ static QDF_STATUS wlan_objmgr_peer_obj_free(struct wlan_objmgr_peer *peer) 
	/* Detach peer from VDEV's peer list */

	if (wlan_objmgr_vdev_peer_detach(vdev, peer) == QDF_STATUS_E_FAILURE) {

		obj_mgr_err(

		"Peer(%02x:%02x:%02x:%02x:%02x:%02x) VDEV detach fail, vdev id: %d",

			macaddr[0], macaddr[1], macaddr[2],

			macaddr[3], macaddr[4], macaddr[5], vdev_id);

		"Peer("QDF_MAC_ADDR_FMT") VDEV detach fail, vdev id: %d",

			QDF_MAC_ADDR_REF(macaddr), vdev_id);

		wlan_objmgr_vdev_release_ref(vdev, WLAN_OBJMGR_ID);

		return QDF_STATUS_E_FAILURE;

	}

	/* Detach peer from PSOC's peer list */

	if (wlan_objmgr_psoc_peer_detach(psoc, peer) == QDF_STATUS_E_FAILURE) {

		obj_mgr_err(

		"Peer(%02x:%02x:%02x:%02x:%02x:%02x) PSOC detach failure",

			macaddr[0], macaddr[1], macaddr[2],

			macaddr[3], macaddr[4], macaddr[5]);

		"Peer("QDF_MAC_ADDR_FMT") PSOC detach failure",

			QDF_MAC_ADDR_REF(macaddr));

		wlan_objmgr_vdev_release_ref(vdev, WLAN_OBJMGR_ID);

		return QDF_STATUS_E_FAILURE;

	}
@@ -170,18 +166,16 @@ struct wlan_objmgr_peer *wlan_objmgr_peer_obj_create( 


	if (!vdev) {

		obj_mgr_err(

			"VDEV is NULL for peer (%02x:%02x:%02x:%02x:%02x:%02x)",

				macaddr[0], macaddr[1], macaddr[2],

				macaddr[3], macaddr[4], macaddr[5]);

			"VDEV is NULL for peer ("QDF_MAC_ADDR_FMT")",

				QDF_MAC_ADDR_REF(macaddr));

		return NULL;

	}

	/* Get psoc, if psoc is NULL, return */

	psoc = wlan_vdev_get_psoc(vdev);

	if (!psoc) {

		obj_mgr_err(

			"PSOC is NULL for peer (%02x:%02x:%02x:%02x:%02x:%02x)",

				macaddr[0], macaddr[1], macaddr[2],

				macaddr[3], macaddr[4], macaddr[5]);

			"PSOC is NULL for peer ("QDF_MAC_ADDR_FMT")",

				QDF_MAC_ADDR_REF(macaddr));

		return NULL;

	}

	/* Allocate memory for peer object */
@@ -210,9 +204,8 @@ struct wlan_objmgr_peer *wlan_objmgr_peer_obj_create( 
	if (wlan_objmgr_psoc_peer_attach(psoc, peer) !=

					QDF_STATUS_SUCCESS) {

		obj_mgr_warn(

		"Peer(%02x:%02x:%02x:%02x:%02x:%02x) PSOC attach failure",

				macaddr[0], macaddr[1], macaddr[2],

				macaddr[3], macaddr[4], macaddr[5]);

		"Peer("QDF_MAC_ADDR_FMT") PSOC attach failure",

				QDF_MAC_ADDR_REF(macaddr));

		qdf_spinlock_destroy(&peer->peer_lock);

		wlan_objmgr_peer_trace_deinit_lock(peer);

		qdf_mem_free(peer);
@@ -222,9 +215,8 @@ struct wlan_objmgr_peer *wlan_objmgr_peer_obj_create( 
	if (wlan_objmgr_vdev_peer_attach(vdev, peer) !=

					QDF_STATUS_SUCCESS) {

		obj_mgr_warn(

		"Peer(%02x:%02x:%02x:%02x:%02x:%02x) VDEV attach failure",

				macaddr[0], macaddr[1], macaddr[2],

				macaddr[3], macaddr[4], macaddr[5]);

		"Peer("QDF_MAC_ADDR_FMT") VDEV attach failure",

				QDF_MAC_ADDR_REF(macaddr));

		/* if attach fails, detach from psoc table before free */

		wlan_objmgr_psoc_peer_detach(psoc, peer);

		qdf_spinlock_destroy(&peer->peer_lock);
@@ -268,15 +260,14 @@ struct wlan_objmgr_peer *wlan_objmgr_peer_obj_create( 
	} else if (obj_status == QDF_STATUS_E_FAILURE) {

		/* Clean up the peer */

		obj_mgr_err(

		"Peer(%02x:%02x:%02x:%02x:%02x:%02x) comp object alloc fail",

				macaddr[0], macaddr[1], macaddr[2],

				macaddr[3], macaddr[4], macaddr[5]);

		"Peer("QDF_MAC_ADDR_FMT") comp object alloc fail",

				QDF_MAC_ADDR_REF(macaddr));

		wlan_objmgr_peer_obj_delete(peer);

		return NULL;

	}



	obj_mgr_debug("Created peer " QDF_MAC_ADDR_STR " type %d",

		      QDF_MAC_ADDR_ARRAY(macaddr), type);

	obj_mgr_debug("Created peer " QDF_MAC_ADDR_FMT " type %d",

		      QDF_MAC_ADDR_REF(macaddr), type);



	return peer;

}
@@ -297,13 +288,13 @@ static QDF_STATUS wlan_objmgr_peer_obj_destroy(struct wlan_objmgr_peer *peer) 


	macaddr = wlan_peer_get_macaddr(peer);



	obj_mgr_debug("Physically deleting peer " QDF_MAC_ADDR_STR,

		      QDF_MAC_ADDR_ARRAY(macaddr));

	obj_mgr_debug("Physically deleting peer " QDF_MAC_ADDR_FMT,

		      QDF_MAC_ADDR_REF(macaddr));



	if (peer->obj_state != WLAN_OBJ_STATE_LOGICALLY_DELETED) {

		obj_mgr_err("PEER object del is not invoked obj_state:%d peer "

			    QDF_MAC_ADDR_STR, peer->obj_state,

			    QDF_MAC_ADDR_ARRAY(macaddr));

			    QDF_MAC_ADDR_FMT, peer->obj_state,

			    QDF_MAC_ADDR_REF(macaddr));

		WLAN_OBJMGR_BUG(0);

	}
@@ -349,8 +340,8 @@ QDF_STATUS wlan_objmgr_peer_obj_delete(struct wlan_objmgr_peer *peer) 
	macaddr = wlan_peer_get_macaddr(peer);

	wlan_peer_obj_unlock(peer);



	obj_mgr_debug("Logically deleting peer " QDF_MAC_ADDR_STR,

		      QDF_MAC_ADDR_ARRAY(macaddr));

	obj_mgr_debug("Logically deleting peer " QDF_MAC_ADDR_FMT,

		      QDF_MAC_ADDR_REF(macaddr));



	print_idx = qdf_get_pidx();

	wlan_objmgr_print_peer_ref_ids(peer, QDF_TRACE_LEVEL_DEBUG);
@@ -619,9 +610,8 @@ wlan_objmgr_peer_release_debug_id_ref(struct wlan_objmgr_peer *peer, 


		macaddr = wlan_peer_get_macaddr(peer);

		obj_mgr_err(

		"peer(%02x:%02x:%02x:%02x:%02x:%02x) ref was not taken by %d",

			macaddr[0], macaddr[1], macaddr[2],

			macaddr[3], macaddr[4], macaddr[5], id);

		"peer("QDF_MAC_ADDR_FMT") ref was not taken by %d",

			QDF_MAC_ADDR_REF(macaddr), id);

		wlan_objmgr_print_ref_ids(peer->peer_objmgr.ref_id_dbg,

					  QDF_TRACE_LEVEL_FATAL);

		WLAN_OBJMGR_BUG(0);
@@ -725,8 +715,8 @@ QDF_STATUS wlan_objmgr_peer_try_get_ref_debug(struct wlan_objmgr_peer *peer, 


			macaddr = wlan_peer_get_macaddr(peer);

			obj_mgr_debug(

			"peer(" QDF_MAC_ADDR_STR ") not in Created st(%d)",

			QDF_MAC_ADDR_ARRAY(macaddr),

			"peer(" QDF_MAC_ADDR_FMT ") not in Created st(%d)",

			QDF_MAC_ADDR_REF(macaddr),

			peer->obj_state);

		}

		return QDF_STATUS_E_RESOURCES;
@@ -758,8 +748,8 @@ QDF_STATUS wlan_objmgr_peer_try_get_ref(struct wlan_objmgr_peer *peer, 


			macaddr = wlan_peer_get_macaddr(peer);

			obj_mgr_debug(

			"peer(" QDF_MAC_ADDR_STR ") not in Created st(%d)",

			QDF_MAC_ADDR_ARRAY(macaddr),

			"peer(" QDF_MAC_ADDR_FMT ") not in Created st(%d)",

			QDF_MAC_ADDR_REF(macaddr),

			peer->obj_state);

		}

		return QDF_STATUS_E_RESOURCES;
@@ -1189,9 +1179,8 @@ void wlan_objmgr_peer_release_ref_debug(struct wlan_objmgr_peer *peer, 
		uint8_t *macaddr;



		macaddr = wlan_peer_get_macaddr(peer);

		obj_mgr_err("peer(%02x:%02x:%02x:%02x:%02x:%02x) ref cnt is 0",

				macaddr[0], macaddr[1], macaddr[2],

				macaddr[3], macaddr[4], macaddr[5]);

		obj_mgr_err("peer("QDF_MAC_ADDR_FMT") ref cnt is 0",

				QDF_MAC_ADDR_REF(macaddr));

		WLAN_OBJMGR_BUG(0);

		return;

	}
@@ -1233,9 +1222,8 @@ void wlan_objmgr_peer_release_ref(struct wlan_objmgr_peer *peer, 
		uint8_t *macaddr;



		macaddr = wlan_peer_get_macaddr(peer);

		obj_mgr_err("peer(%02x:%02x:%02x:%02x:%02x:%02x) ref cnt is 0",

			    macaddr[0], macaddr[1], macaddr[2],

			    macaddr[3], macaddr[4], macaddr[5]);

		obj_mgr_err("peer("QDF_MAC_ADDR_FMT") ref cnt is 0",

			    QDF_MAC_ADDR_REF(macaddr));

		WLAN_OBJMGR_BUG(0);

		return;

	}

umac/cmn_services/obj_mgr/src/wlan_objmgr_psoc_obj.c

+4 −4
Original line number Diff line number Diff line
@@ -2889,8 +2889,8 @@ wlan_objmgr_print_peer_ref_leaks(struct wlan_objmgr_peer *peer, int vdev_id) 


	ref_id_dbg = peer->peer_objmgr.ref_id_dbg;

	wlan_objmgr_for_each_refs(ref_id_dbg, ref_id, refs) {

		obj_mgr_alert(QDF_MAC_ADDR_STR " %7u   %4u   %s",

			      QDF_MAC_ADDR_ARRAY(peer->macaddr),

		obj_mgr_alert(QDF_MAC_ADDR_FMT " %7u   %4u   %s",

			      QDF_MAC_ADDR_REF(peer->macaddr),

			      vdev_id,

			      refs,

			      string_from_dbgid(ref_id));
@@ -2900,8 +2900,8 @@ wlan_objmgr_print_peer_ref_leaks(struct wlan_objmgr_peer *peer, int vdev_id) 
static inline void

wlan_objmgr_print_peer_ref_leaks(struct wlan_objmgr_peer *peer, int vdev_id)

{

	obj_mgr_alert(QDF_MAC_ADDR_STR " %7u   %4u   %s",

		      QDF_MAC_ADDR_ARRAY(peer->macaddr),

	obj_mgr_alert(QDF_MAC_ADDR_FMT " %7u   %4u   %s",

		      QDF_MAC_ADDR_REF(peer->macaddr),

		      vdev_id,

		      qdf_atomic_read(&peer->peer_objmgr.ref_cnt),

		      "TOTAL_REF_COUNT");