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

Commit 674a5835 authored by Srinivas Girigowda's avatar Srinivas Girigowda Committed by snandini
Browse files

qcacmn: qdf: 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: I89d17f8e7b58d10f56882310bd4e47a9519d0425
parent f6ddff3d

qdf/linux/src/qdf_trace.c

+14 −12
Original line number Diff line number Diff line
@@ -1557,13 +1557,15 @@ void qdf_dp_log_proto_pkt_info(uint8_t *sa, uint8_t *da, uint8_t type, 
		last_ticks_rx[subtype] = curr_ticks;



	if (status == QDF_TX_RX_STATUS_INVALID)

		qdf_nofl_info("%s %s: SA:%pM DA:%pM",

		qdf_nofl_info("%s %s: SA:"QDF_MAC_ADDR_FMT" DA:"QDF_MAC_ADDR_FMT,

			      qdf_get_pkt_type_string(type, subtype),

			      dir ? "RX":"TX", sa, da);

			      dir ? "RX":"TX", QDF_MAC_ADDR_REF(sa),

			      QDF_MAC_ADDR_REF(da));

	else

		qdf_nofl_info("%s %s: SA:%pM DA:%pM msdu_id:%d status: %s",

		qdf_nofl_info("%s %s: SA:"QDF_MAC_ADDR_FMT" DA:"QDF_MAC_ADDR_FMT" msdu_id:%d status: %s",

			      qdf_get_pkt_type_string(type, subtype),

			      dir ? "RX":"TX", sa, da, msdu_id,

			      dir ? "RX":"TX", QDF_MAC_ADDR_REF(sa),

			      QDF_MAC_ADDR_REF(da), msdu_id,

			      qdf_get_pkt_status_string(status));

}
@@ -2084,14 +2086,14 @@ void qdf_dp_display_proto_pkt(struct qdf_dp_trace_record_s *record, 
	loc = qdf_dp_trace_fill_meta_str(prepend_str, sizeof(prepend_str),

					 index, info, record);

	DPTRACE_PRINT("%s [%d] [%s] SA: "

		      QDF_MAC_ADDR_STR " %s DA: "

		      QDF_MAC_ADDR_STR,

		      QDF_MAC_ADDR_FMT " %s DA: "

		      QDF_MAC_ADDR_FMT,

		      prepend_str,

		      buf->vdev_id,

		      qdf_dp_subtype_to_str(buf->subtype),

		      QDF_MAC_ADDR_ARRAY(buf->sa.bytes),

		      QDF_MAC_ADDR_REF(buf->sa.bytes),

		      qdf_dp_dir_to_str(buf->dir),

		      QDF_MAC_ADDR_ARRAY(buf->da.bytes));

		      QDF_MAC_ADDR_REF(buf->da.bytes));

}

qdf_export_symbol(qdf_dp_display_proto_pkt);
@@ -2546,14 +2548,14 @@ static void qdf_dpt_display_proto_pkt_debugfs(qdf_debugfs_file_t file, 
	loc = qdf_dp_trace_fill_meta_str(prepend_str, sizeof(prepend_str),

					 index, 0, record);

	qdf_debugfs_printf(file, "%s [%d] [%s] SA: "

			   QDF_MAC_ADDR_STR " %s DA: "

			   QDF_MAC_ADDR_STR,

			   QDF_MAC_ADDR_FMT " %s DA: "

			   QDF_MAC_ADDR_FMT,

			   prepend_str,

			   buf->vdev_id,

			   qdf_dp_subtype_to_str(buf->subtype),

			   QDF_MAC_ADDR_ARRAY(buf->sa.bytes),

			   QDF_MAC_ADDR_REF(buf->sa.bytes),

			   qdf_dp_dir_to_str(buf->dir),

			   QDF_MAC_ADDR_ARRAY(buf->da.bytes));

			   QDF_MAC_ADDR_REF(buf->da.bytes));

	qdf_debugfs_printf(file, "\n");

}

qdf/test/qdf_types_test.c

+4 −4
Original line number Diff line number Diff line
@@ -360,11 +360,11 @@ __ut_mac(const char *str, const char *display_str, QDF_STATUS exp_status, 
		return 0;



	if (qdf_mem_cmp(&value, exp_value, sizeof(value))) {

		qdf_nofl_alert("FAIL: qdf_mac_parse(%s) -> " QDF_MAC_ADDR_STR

			       "; expected " QDF_MAC_ADDR_STR,

		qdf_nofl_alert("FAIL: qdf_mac_parse(%s) -> " QDF_MAC_ADDR_FMT

			       "; expected " QDF_MAC_ADDR_FMT,

			       display_str,

			       QDF_MAC_ADDR_ARRAY(value.bytes),

			       QDF_MAC_ADDR_ARRAY(exp_value->bytes));

			       QDF_MAC_ADDR_REF(value.bytes),

			       QDF_MAC_ADDR_REF(exp_value->bytes));

		return 1;

	}