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

Commit 415f8b71 authored by Srinivas Girigowda's avatar Srinivas Girigowda Committed by snandini
Browse files

qcacmn: wmi: 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: I7f6a1bd0b125732bcf64c669dc82e854116ed16f
parent 94fe247a

wmi/src/wmi_unified_nan_tlv.c

+8 −5
Original line number Original line Diff line number Diff line
@@ -787,13 +787,15 @@ static QDF_STATUS extract_ndp_ind_tlv(wmi_unified_t wmi_handle, 
	WMI_MAC_ADDR_TO_CHAR_ARRAY(&fixed_params->peer_discovery_mac_addr,

	WMI_MAC_ADDR_TO_CHAR_ARRAY(&fixed_params->peer_discovery_mac_addr,

				rsp->peer_discovery_mac_addr.bytes);

				rsp->peer_discovery_mac_addr.bytes);





	WMI_LOGD("WMI_NDP_INDICATION_EVENTID(0x%X) received. vdev %d service_instance %d, ndp_instance %d, role %d, policy %d csid: %d, scid_len: %d, peer_addr: %pM, peer_disc_addr: %pM ndp_cfg - %d bytes ndp_app_info - %d bytes",

	WMI_LOGD("WMI_NDP_INDICATION_EVENTID(0x%X) received. vdev %d service_instance %d, ndp_instance %d, role %d, policy %d csid: %d, scid_len: %d, peer_addr: "QDF_MAC_ADDR_FMT", peer_disc_addr: "QDF_MAC_ADDR_FMT" ndp_cfg - %d bytes ndp_app_info - %d bytes",

		 WMI_NDP_INDICATION_EVENTID, fixed_params->vdev_id,

		 WMI_NDP_INDICATION_EVENTID, fixed_params->vdev_id,

		 fixed_params->service_instance_id,

		 fixed_params->service_instance_id,

		 fixed_params->ndp_instance_id, fixed_params->self_ndp_role,

		 fixed_params->ndp_instance_id, fixed_params->self_ndp_role,

		 fixed_params->accept_policy, fixed_params->nan_csid,

		 fixed_params->accept_policy, fixed_params->nan_csid,

		 fixed_params->nan_scid_len, rsp->peer_mac_addr.bytes,

		 fixed_params->nan_scid_len,

		 rsp->peer_discovery_mac_addr.bytes, fixed_params->ndp_cfg_len,

		 QDF_MAC_ADDR_REF(rsp->peer_mac_addr.bytes),

		 QDF_MAC_ADDR_REF(rsp->peer_discovery_mac_addr.bytes),

		 fixed_params->ndp_cfg_len,

		 fixed_params->ndp_app_info_len);

		 fixed_params->ndp_app_info_len);





	rsp->ncs_sk_type = fixed_params->nan_csid;

	rsp->ncs_sk_type = fixed_params->nan_csid;
@@ -999,9 +1001,10 @@ static QDF_STATUS extract_ndp_responder_rsp_tlv(wmi_unified_t wmi_handle, 
	rsp->create_peer = fixed_params->create_peer;

	rsp->create_peer = fixed_params->create_peer;

	WMI_MAC_ADDR_TO_CHAR_ARRAY(&fixed_params->peer_ndi_mac_addr,

	WMI_MAC_ADDR_TO_CHAR_ARRAY(&fixed_params->peer_ndi_mac_addr,

				   rsp->peer_mac_addr.bytes);

				   rsp->peer_mac_addr.bytes);

	WMI_LOGD("WMI_NDP_RESPONDER_RSP_EVENTID(0x%X) received. vdev_id: %d, peer_mac_addr: %pM,transaction_id: %d, status_code %d, reason_code: %d, create_peer: %d",

	WMI_LOGD("WMI_NDP_RESPONDER_RSP_EVENTID(0x%X) received. vdev_id: %d, peer_mac_addr: "QDF_MAC_ADDR_FMT",transaction_id: %d, status_code %d, reason_code: %d, create_peer: %d",

		 WMI_NDP_RESPONDER_RSP_EVENTID, fixed_params->vdev_id,

		 WMI_NDP_RESPONDER_RSP_EVENTID, fixed_params->vdev_id,

		 rsp->peer_mac_addr.bytes, rsp->transaction_id,

		 QDF_MAC_ADDR_REF(rsp->peer_mac_addr.bytes),

		 rsp->transaction_id,

		 rsp->status, rsp->reason, rsp->create_peer);

		 rsp->status, rsp->reason, rsp->create_peer);





	return QDF_STATUS_SUCCESS;

	return QDF_STATUS_SUCCESS;

wmi/src/wmi_unified_ocb_ut.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -286,7 +286,7 @@ static QDF_STATUS fake_ocb_set_config_cmd_tlv(wmi_unified_t wmi_handle, 
			" max_pwr=%d, min_pwr=%d, reg_pwr=%d, antenna_max=%d, "

			" max_pwr=%d, min_pwr=%d, reg_pwr=%d, antenna_max=%d, "

			"flags=%d", __func__, i, config->channels[i].chan_freq,

			"flags=%d", __func__, i, config->channels[i].chan_freq,

			config->channels[i].bandwidth,

			config->channels[i].bandwidth,

			QDF_MAC_ADDR_ARRAY(

			QDF_MAC_ADDR_REF(

				config->channels[i].mac_address.bytes),

				config->channels[i].mac_address.bytes),

			config->channels[i].max_pwr,

			config->channels[i].max_pwr,

			config->channels[i].min_pwr,

			config->channels[i].min_pwr,

wmi/src/wmi_unified_p2p_tlv.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -250,8 +250,9 @@ send_set_mac_addr_rx_filter_cmd_tlv(wmi_unified_t wmi_handle, 
		cmd->enable = 1;

		cmd->enable = 1;

	else

	else

		cmd->enable = 0;

		cmd->enable = 0;

	WMI_LOGD("set random mac rx vdev %d freq %d set %d %pM",

	WMI_LOGD("set random mac rx vdev %d freq %d set %d "QDF_MAC_ADDR_FMT,

		 param->vdev_id, param->freq, param->set, param->mac);

		 param->vdev_id, param->freq, param->set,

		 QDF_MAC_ADDR_REF(param->mac));

	ret = wmi_unified_cmd_send(wmi_handle, buf, len,

	ret = wmi_unified_cmd_send(wmi_handle, buf, len,

				   WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID);

				   WMI_VDEV_ADD_MAC_ADDR_TO_RX_FILTER_CMDID);

	if (ret) {

	if (ret) {

wmi/src/wmi_unified_pmo_tlv.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -596,8 +596,9 @@ static QDF_STATUS send_add_clear_mcbc_filter_cmd_tlv(wmi_unified_t wmi_handle, 
	cmd->vdev_id = vdev_id;

	cmd->vdev_id = vdev_id;

	WMI_CHAR_ARRAY_TO_MAC_ADDR(multicast_addr.bytes, &cmd->mcastbdcastaddr);

	WMI_CHAR_ARRAY_TO_MAC_ADDR(multicast_addr.bytes, &cmd->mcastbdcastaddr);





	WMI_LOGD("Action:%d; vdev_id:%d; clearList:%d; MCBC MAC Addr: %pM",

	WMI_LOGD("Action:%d; vdev_id:%d; clearList:%d; MCBC MAC Addr: "QDF_MAC_ADDR_FMT,

		 cmd->action, vdev_id, clearList, multicast_addr.bytes);

		 cmd->action, vdev_id, clearList,

		 QDF_MAC_ADDR_REF(multicast_addr.bytes));





	wmi_mtrace(WMI_SET_MCASTBCAST_FILTER_CMDID, cmd->vdev_id, 0);

	wmi_mtrace(WMI_SET_MCASTBCAST_FILTER_CMDID, cmd->vdev_id, 0);

	err = wmi_unified_cmd_send(wmi_handle, buf,

	err = wmi_unified_cmd_send(wmi_handle, buf,
@@ -1824,14 +1825,15 @@ static QDF_STATUS send_set_app_type2_params_in_fw_cmd_tlv(wmi_unified_t wmi_hand 
	cmd->tcp_tx_timeout_val = appType2Params->tcp_tx_timeout_val;

	cmd->tcp_tx_timeout_val = appType2Params->tcp_tx_timeout_val;

	cmd->tcp_rx_timeout_val = appType2Params->tcp_rx_timeout_val;

	cmd->tcp_rx_timeout_val = appType2Params->tcp_rx_timeout_val;





	WMI_LOGD("%s: vdev_id %d gateway_mac %pM "

	WMI_LOGD("%s: vdev_id %d gateway_mac "QDF_MAC_ADDR_FMT" "

		 "rc4_key %.16s rc4_key_len %u "

		 "rc4_key %.16s rc4_key_len %u "

		 "ip_id %x ip_device_ip %x ip_server_ip %x "

		 "ip_id %x ip_device_ip %x ip_server_ip %x "

		 "tcp_src_port %u tcp_dst_port %u tcp_seq %u "

		 "tcp_src_port %u tcp_dst_port %u tcp_seq %u "

		 "tcp_ack_seq %u keepalive_init %u keepalive_min %u "

		 "tcp_ack_seq %u keepalive_init %u keepalive_min %u "

		 "keepalive_max %u keepalive_inc %u "

		 "keepalive_max %u keepalive_inc %u "

		 "tcp_tx_timeout_val %u tcp_rx_timeout_val %u",

		 "tcp_tx_timeout_val %u tcp_rx_timeout_val %u",

		 __func__, cmd->vdev_id, appType2Params->gateway_mac.bytes,

		 __func__, cmd->vdev_id,

		 QDF_MAC_ADDR_REF(appType2Params->gateway_mac.bytes),

		 cmd->rc4_key, cmd->rc4_key_len,

		 cmd->rc4_key, cmd->rc4_key_len,

		 cmd->ip_id, cmd->ip_device_ip, cmd->ip_server_ip,

		 cmd->ip_id, cmd->ip_device_ip, cmd->ip_server_ip,

		 cmd->tcp_src_port, cmd->tcp_dst_port, cmd->tcp_seq,

		 cmd->tcp_src_port, cmd->tcp_dst_port, cmd->tcp_seq,
@@ -1889,10 +1891,11 @@ static QDF_STATUS send_app_type1_params_in_fw_cmd_tlv(wmi_unified_t wmi_handle, 
	qdf_mem_copy(cmd->passwd, app_type1_params->password, 16);

	qdf_mem_copy(cmd->passwd, app_type1_params->password, 16);

	cmd->passwd_len = app_type1_params->pass_length;

	cmd->passwd_len = app_type1_params->pass_length;





	WMI_LOGD("%s: vdev_id %d wakee_mac_addr %pM "

	WMI_LOGD("%s: vdev_id %d wakee_mac_addr "QDF_MAC_ADDR_FMT" "

		 "identification_id %.8s id_length %u "

		 "identification_id %.8s id_length %u "

		 "password %.16s pass_length %u",

		 "password %.16s pass_length %u",

		 __func__, cmd->vdev_id, app_type1_params->wakee_mac_addr.bytes,

		 __func__, cmd->vdev_id,

		 QDF_MAC_ADDR_REF(app_type1_params->wakee_mac_addr.bytes),

		 cmd->ident, cmd->ident_len, cmd->passwd, cmd->passwd_len);

		 cmd->ident, cmd->ident_len, cmd->passwd, cmd->passwd_len);





	wmi_mtrace(WMI_EXTWOW_SET_APP_TYPE1_PARAMS_CMDID, cmd->vdev_id, 0);

	wmi_mtrace(WMI_EXTWOW_SET_APP_TYPE1_PARAMS_CMDID, cmd->vdev_id, 0);

wmi/src/wmi_unified_roam_tlv.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -2449,8 +2449,9 @@ send_roam_preauth_status_tlv(wmi_unified_t wmi_handle, 
	buf_ptr += WMI_TLV_HDR_SIZE;

	buf_ptr += WMI_TLV_HDR_SIZE;





	qdf_mem_copy(buf_ptr, params->pmkid, PMKID_LEN);

	qdf_mem_copy(buf_ptr, params->pmkid, PMKID_LEN);

	WMI_LOGD("%s: vdev_id:%d status:%d bssid:%pM", __func__, cmd->vdev_id,

	WMI_LOGD("%s: vdev_id:%d status:%d bssid:"QDF_MAC_ADDR_FMT, __func__, cmd->vdev_id,

		 cmd->preauth_status, params->bssid.bytes);

		 cmd->preauth_status,

		 QDF_MAC_ADDR_REF(params->bssid.bytes));





	wmi_mtrace(WMI_ROAM_PREAUTH_STATUS_CMDID, cmd->vdev_id, 0);

	wmi_mtrace(WMI_ROAM_PREAUTH_STATUS_CMDID, cmd->vdev_id, 0);

	if (wmi_unified_cmd_send(wmi_handle, buf, len,

	if (wmi_unified_cmd_send(wmi_handle, buf, len,