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

Commit d3134c3b authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Greg Kroah-Hartman
Browse files

uwb: use '%pM' format to print MAC address 



Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Cc: David Vrabel <david.vrabel@csr.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent ecfa153e

drivers/uwb/address.c

+1 −4
Original line number Diff line number Diff line
@@ -363,10 +363,7 @@ size_t __uwb_addr_print(char *buf, size_t buf_size, const unsigned char *addr, 
{

	size_t result;

	if (type)

		result = scnprintf(buf, buf_size,

				  "%02x:%02x:%02x:%02x:%02x:%02x",

				  addr[0], addr[1], addr[2],

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

		result = scnprintf(buf, buf_size, "%pM", addr);

	else

		result = scnprintf(buf, buf_size, "%02x:%02x",

				  addr[1], addr[0]);

drivers/uwb/wlp/wss-lc.c

+2 −5
Original line number Diff line number Diff line
@@ -791,11 +791,8 @@ int wlp_wss_prep_hdr(struct wlp *wlp, struct wlp_eda_node *eda_entry, 
	} else {

		if (printk_ratelimit())

			dev_err(dev, "WLP: Destination neighbor (Ethernet: "

				"%02x:%02x:%02x:%02x:%02x:%02x, Dev: "

				"%02x:%02x) is not connected. \n", eth_addr[0],

				eth_addr[1], eth_addr[2], eth_addr[3],

				eth_addr[4], eth_addr[5], dev_addr->data[1],

				dev_addr->data[0]);

				"%pM, Dev: %02x:%02x) is not connected.\n",

				eth_addr, dev_addr->data[1], dev_addr->data[0]);

		result = -EINVAL;

	}

	return result;