Merge "net: qrtr: Use proper endianness when logging" (17d9e542) · Commits · e / devices / android_kernel_fairphone_FP5

net/qrtr/qrtr.c

+14 −12

Original line number	Diff line number	Diff line
		@@ -211,11 +211,13 @@ static void qrtr_log_tx_msg(struct qrtr_node node, struct qrtr_hdr_v1 hdr,
		{
		struct qrtr_ctrl_pkt pkt = {0,};
		u64 pl_buf = 0;
		int type;

		if (!hdr \|\| !skb)
		return;

		if (hdr->type == QRTR_TYPE_DATA) {
		type = le32_to_cpu(hdr->type);
		if (type == QRTR_TYPE_DATA) {
		skb_copy_bits(skb, QRTR_HDR_MAX_SIZE, &pl_buf, sizeof(pl_buf));
		QRTR_INFO(node->ilc,
		"TX DATA: Len:0x%x CF:0x%x src[0x%x:0x%x] dst[0x%x:0x%x] [%08x %08x] [%s]\n",
		@@ -226,29 +228,29 @@ static void qrtr_log_tx_msg(struct qrtr_node node, struct qrtr_hdr_v1 hdr,
		current->comm);
		} else {
		skb_copy_bits(skb, QRTR_HDR_MAX_SIZE, &pkt, sizeof(pkt));
		if (hdr->type == QRTR_TYPE_NEW_SERVER \|\|
		hdr->type == QRTR_TYPE_DEL_SERVER)
		if (type == QRTR_TYPE_NEW_SERVER \|\|
		type == QRTR_TYPE_DEL_SERVER)
		QRTR_INFO(node->ilc,
		"TX CTRL: cmd:0x%x SVC[0x%x:0x%x] addr[0x%x:0x%x]\n",
		hdr->type, le32_to_cpu(pkt.server.service),
		type, le32_to_cpu(pkt.server.service),
		le32_to_cpu(pkt.server.instance),
		le32_to_cpu(pkt.server.node),
		le32_to_cpu(pkt.server.port));
		else if (hdr->type == QRTR_TYPE_DEL_CLIENT \|\|
		hdr->type == QRTR_TYPE_RESUME_TX)
		else if (type == QRTR_TYPE_DEL_CLIENT \|\|
		type == QRTR_TYPE_RESUME_TX)
		QRTR_INFO(node->ilc,
		"TX CTRL: cmd:0x%x addr[0x%x:0x%x]\n",
		hdr->type, le32_to_cpu(pkt.client.node),
		type, le32_to_cpu(pkt.client.node),
		le32_to_cpu(pkt.client.port));
		else if (hdr->type == QRTR_TYPE_HELLO \|\|
		hdr->type == QRTR_TYPE_BYE)
		else if (type == QRTR_TYPE_HELLO \|\|
		type == QRTR_TYPE_BYE)
		QRTR_INFO(node->ilc,
		"TX CTRL: cmd:0x%x node[0x%x]\n",
		hdr->type, hdr->src_node_id);
		else if (hdr->type == QRTR_TYPE_DEL_PROC)
		type, hdr->src_node_id);
		else if (type == QRTR_TYPE_DEL_PROC)
		QRTR_INFO(node->ilc,
		"TX CTRL: cmd:0x%x node[0x%x]\n",
		hdr->type, pkt.proc.node);
		type, pkt.proc.node);
		}
		}