diff options
Diffstat (limited to 'drivers/net/wimax')
-rw-r--r-- | drivers/net/wimax/i2400m/driver.c | 17 | ||||
-rw-r--r-- | drivers/net/wimax/i2400m/fw.c | 11 |
2 files changed, 6 insertions, 22 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"); |
diff --git a/drivers/net/wimax/i2400m/fw.c b/drivers/net/wimax/i2400m/fw.c index 6c459f5cb5df..25c24f0368d8 100644 --- a/drivers/net/wimax/i2400m/fw.c +++ b/drivers/net/wimax/i2400m/fw.c | |||
@@ -1041,21 +1041,14 @@ int i2400m_read_mac_addr(struct i2400m *i2400m) | |||
1041 | dev_err(dev, "BM: read mac addr failed: %d\n", result); | 1041 | dev_err(dev, "BM: read mac addr failed: %d\n", result); |
1042 | goto error_read_mac; | 1042 | goto error_read_mac; |
1043 | } | 1043 | } |
1044 | d_printf(2, dev, | 1044 | d_printf(2, dev, "mac addr is %pM\n", ack_buf.ack_pl); |
1045 | "mac addr is %02x:%02x:%02x:%02x:%02x:%02x\n", | ||
1046 | ack_buf.ack_pl[0], ack_buf.ack_pl[1], | ||
1047 | ack_buf.ack_pl[2], ack_buf.ack_pl[3], | ||
1048 | ack_buf.ack_pl[4], ack_buf.ack_pl[5]); | ||
1049 | if (i2400m->bus_bm_mac_addr_impaired == 1) { | 1045 | if (i2400m->bus_bm_mac_addr_impaired == 1) { |
1050 | ack_buf.ack_pl[0] = 0x00; | 1046 | ack_buf.ack_pl[0] = 0x00; |
1051 | ack_buf.ack_pl[1] = 0x16; | 1047 | ack_buf.ack_pl[1] = 0x16; |
1052 | ack_buf.ack_pl[2] = 0xd3; | 1048 | ack_buf.ack_pl[2] = 0xd3; |
1053 | get_random_bytes(&ack_buf.ack_pl[3], 3); | 1049 | get_random_bytes(&ack_buf.ack_pl[3], 3); |
1054 | dev_err(dev, "BM is MAC addr impaired, faking MAC addr to " | 1050 | dev_err(dev, "BM is MAC addr impaired, faking MAC addr to " |
1055 | "mac addr is %02x:%02x:%02x:%02x:%02x:%02x\n", | 1051 | "mac addr is %pM\n", ack_buf.ack_pl); |
1056 | ack_buf.ack_pl[0], ack_buf.ack_pl[1], | ||
1057 | ack_buf.ack_pl[2], ack_buf.ack_pl[3], | ||
1058 | ack_buf.ack_pl[4], ack_buf.ack_pl[5]); | ||
1059 | result = 0; | 1052 | result = 0; |
1060 | } | 1053 | } |
1061 | net_dev->addr_len = ETH_ALEN; | 1054 | net_dev->addr_len = ETH_ALEN; |