diff options
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 429bca8d0b5f..f87fe10059ae 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -412,6 +412,7 @@ static int ray_config(struct pcmcia_device *link) | |||
412 | memreq_t mem; | 412 | memreq_t mem; |
413 | struct net_device *dev = (struct net_device *)link->priv; | 413 | struct net_device *dev = (struct net_device *)link->priv; |
414 | ray_dev_t *local = netdev_priv(dev); | 414 | ray_dev_t *local = netdev_priv(dev); |
415 | DECLARE_MAC_BUF(mac); | ||
415 | 416 | ||
416 | DEBUG(1, "ray_config(0x%p)\n", link); | 417 | DEBUG(1, "ray_config(0x%p)\n", link); |
417 | 418 | ||
@@ -482,10 +483,8 @@ static int ray_config(struct pcmcia_device *link) | |||
482 | strcpy(local->node.dev_name, dev->name); | 483 | strcpy(local->node.dev_name, dev->name); |
483 | link->dev_node = &local->node; | 484 | link->dev_node = &local->node; |
484 | 485 | ||
485 | printk(KERN_INFO "%s: RayLink, irq %d, hw_addr ", | 486 | printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %s\n", |
486 | dev->name, dev->irq); | 487 | dev->name, dev->irq, print_mac(mac, dev->dev_addr)); |
487 | for (i = 0; i < 6; i++) | ||
488 | printk("%02X%s", dev->dev_addr[i], ((i<5) ? ":" : "\n")); | ||
489 | 488 | ||
490 | return 0; | 489 | return 0; |
491 | 490 | ||
@@ -2610,6 +2609,7 @@ static int ray_cs_proc_read(char *buf, char **start, off_t offset, int len) | |||
2610 | UCHAR *p; | 2609 | UCHAR *p; |
2611 | struct freq_hop_element *pfh; | 2610 | struct freq_hop_element *pfh; |
2612 | UCHAR c[33]; | 2611 | UCHAR c[33]; |
2612 | DECLARE_MAC_BUF(mac); | ||
2613 | 2613 | ||
2614 | link = this_device; | 2614 | link = this_device; |
2615 | if (!link) | 2615 | if (!link) |
@@ -2639,9 +2639,8 @@ static int ray_cs_proc_read(char *buf, char **start, off_t offset, int len) | |||
2639 | nettype[local->sparm.b5.a_network_type], c); | 2639 | nettype[local->sparm.b5.a_network_type], c); |
2640 | 2640 | ||
2641 | p = local->bss_id; | 2641 | p = local->bss_id; |
2642 | len += sprintf(buf + len, | 2642 | len += sprintf(buf + len, "BSSID = %s\n", |
2643 | "BSSID = %02x:%02x:%02x:%02x:%02x:%02x\n", | 2643 | print_mac(mac, p)); |
2644 | p[0],p[1],p[2],p[3],p[4],p[5]); | ||
2645 | 2644 | ||
2646 | len += sprintf(buf + len, "Country code = %d\n", | 2645 | len += sprintf(buf + len, "Country code = %d\n", |
2647 | local->sparm.b5.a_curr_country_code); | 2646 | local->sparm.b5.a_curr_country_code); |