Skip to content

Commit

Permalink
drivers/net/wimax/i2400m/driver.c: use %pM to show MAC address
Browse files Browse the repository at this point in the history
Use the %pM kernel extension to display the MAC address.

Signed-off-by: H Hartley Sweeten <[email protected]>
Cc: David S. Miller <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
hartleys authored and davem330 committed Jan 7, 2010
1 parent fcb635e commit 4754b3d
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions drivers/net/wimax/i2400m/driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -301,24 +301,15 @@ int i2400m_check_mac_addr(struct i2400m *i2400m)
/* Extract MAC addresss */
ddi = (void *) skb->data;
BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address));
d_printf(2, dev, "GET DEVICE INFO: mac addr "
"%02x:%02x:%02x:%02x:%02x:%02x\n",
ddi->mac_address[0], ddi->mac_address[1],
ddi->mac_address[2], ddi->mac_address[3],
ddi->mac_address[4], ddi->mac_address[5]);
d_printf(2, dev, "GET DEVICE INFO: mac addr %pM\n",
ddi->mac_address);
if (!memcmp(net_dev->perm_addr, ddi->mac_address,
sizeof(ddi->mac_address)))
goto ok;
dev_warn(dev, "warning: device reports a different MAC address "
"to that of boot mode's\n");
dev_warn(dev, "device reports %02x:%02x:%02x:%02x:%02x:%02x\n",
ddi->mac_address[0], ddi->mac_address[1],
ddi->mac_address[2], ddi->mac_address[3],
ddi->mac_address[4], ddi->mac_address[5]);
dev_warn(dev, "boot mode reported %02x:%02x:%02x:%02x:%02x:%02x\n",
net_dev->perm_addr[0], net_dev->perm_addr[1],
net_dev->perm_addr[2], net_dev->perm_addr[3],
net_dev->perm_addr[4], net_dev->perm_addr[5]);
dev_warn(dev, "device reports %pM\n", ddi->mac_address);
dev_warn(dev, "boot mode reported %pM\n", net_dev->perm_addr);
if (!memcmp(zeromac, ddi->mac_address, sizeof(zeromac)))
dev_err(dev, "device reports an invalid MAC address, "
"not updating\n");
Expand Down

0 comments on commit 4754b3d

Please sign in to comment.