aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wimax
diff options
context:
space:
mode:
authorhartleys <hartleys@visionengravers.com>2010-01-05 02:00:57 -0500
committerDavid S. Miller <davem@davemloft.net>2010-01-07 04:14:01 -0500
commit4754b3de93f893e85d811031ff742fc7a4f53db4 (patch)
tree7a63533c06c4693e883458a510200894a6fa90d8 /drivers/net/wimax
parentfcb635e8c6d68bf06531603a1caa6e59ba7e356d (diff)
drivers/net/wimax/i2400m/driver.c: use %pM to show MAC address
Use the %pM kernel extension to display the MAC address. Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com> Cc: David S. Miller <davem@davemloft.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r--drivers/net/wimax/i2400m/driver.c17
1 files changed, 4 insertions, 13 deletions
diff --git a/drivers/net/wimax/i2400m/driver.c b/drivers/net/wimax/i2400m/driver.c
index 96a615fe09de..6cead321bc15 100644
--- a/drivers/net/wimax/i2400m/driver.c
+++ b/drivers/net/wimax/i2400m/driver.c
@@ -301,24 +301,15 @@ int i2400m_check_mac_addr(struct i2400m *i2400m)
301 /* Extract MAC addresss */ 301 /* Extract MAC addresss */
302 ddi = (void *) skb->data; 302 ddi = (void *) skb->data;
303 BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address)); 303 BUILD_BUG_ON(ETH_ALEN != sizeof(ddi->mac_address));
304 d_printf(2, dev, "GET DEVICE INFO: mac addr " 304 d_printf(2, dev, "GET DEVICE INFO: mac addr %pM\n",
305 "%02x:%02x:%02x:%02x:%02x:%02x\n", 305 ddi->mac_address);
306 ddi->mac_address[0], ddi->mac_address[1],
307 ddi->mac_address[2], ddi->mac_address[3],
308 ddi->mac_address[4], ddi->mac_address[5]);
309 if (!memcmp(net_dev->perm_addr, ddi->mac_address, 306 if (!memcmp(net_dev->perm_addr, ddi->mac_address,
310 sizeof(ddi->mac_address))) 307 sizeof(ddi->mac_address)))
311 goto ok; 308 goto ok;
312 dev_warn(dev, "warning: device reports a different MAC address " 309 dev_warn(dev, "warning: device reports a different MAC address "
313 "to that of boot mode's\n"); 310 "to that of boot mode's\n");
314 dev_warn(dev, "device reports %02x:%02x:%02x:%02x:%02x:%02x\n", 311 dev_warn(dev, "device reports %pM\n", ddi->mac_address);
315 ddi->mac_address[0], ddi->mac_address[1], 312 dev_warn(dev, "boot mode reported %pM\n", net_dev->perm_addr);
316 ddi->mac_address[2], ddi->mac_address[3],
317 ddi->mac_address[4], ddi->mac_address[5]);
318 dev_warn(dev, "boot mode reported %02x:%02x:%02x:%02x:%02x:%02x\n",
319 net_dev->perm_addr[0], net_dev->perm_addr[1],
320 net_dev->perm_addr[2], net_dev->perm_addr[3],
321 net_dev->perm_addr[4], net_dev->perm_addr[5]);
322 if (!memcmp(zeromac, ddi->mac_address, sizeof(zeromac))) 313 if (!memcmp(zeromac, ddi->mac_address, sizeof(zeromac)))
323 dev_err(dev, "device reports an invalid MAC address, " 314 dev_err(dev, "device reports an invalid MAC address, "
324 "not updating\n"); 315 "not updating\n");