Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 214512
b: refs/heads/master
c: bc0ed0b
h: refs/heads/master
v: v3
  • Loading branch information
Andy Shevchenko authored and David S. Miller committed Sep 14, 2010
1 parent 25bf6da commit 959b013
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 251415808306a19be93ec93268e2985f10d3db8b
refs/heads/master: bc0ed0be10a4925efa7b81a84af53f12fbdbcb4e
5 changes: 1 addition & 4 deletions trunk/drivers/uwb/address.c
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand Down
7 changes: 2 additions & 5 deletions trunk/drivers/uwb/wlp/wss-lc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 959b013

Please sign in to comment.