diff options
Diffstat (limited to 'drivers/net/wireless/ray_cs.c')
-rw-r--r-- | drivers/net/wireless/ray_cs.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c index 1404a5717520..bf0b9299b5df 100644 --- a/drivers/net/wireless/ray_cs.c +++ b/drivers/net/wireless/ray_cs.c | |||
@@ -414,7 +414,6 @@ static int ray_config(struct pcmcia_device *link) | |||
414 | memreq_t mem; | 414 | memreq_t mem; |
415 | struct net_device *dev = (struct net_device *)link->priv; | 415 | struct net_device *dev = (struct net_device *)link->priv; |
416 | ray_dev_t *local = netdev_priv(dev); | 416 | ray_dev_t *local = netdev_priv(dev); |
417 | DECLARE_MAC_BUF(mac); | ||
418 | 417 | ||
419 | DEBUG(1, "ray_config(0x%p)\n", link); | 418 | DEBUG(1, "ray_config(0x%p)\n", link); |
420 | 419 | ||
@@ -485,8 +484,8 @@ static int ray_config(struct pcmcia_device *link) | |||
485 | strcpy(local->node.dev_name, dev->name); | 484 | strcpy(local->node.dev_name, dev->name); |
486 | link->dev_node = &local->node; | 485 | link->dev_node = &local->node; |
487 | 486 | ||
488 | printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %s\n", | 487 | printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %pM\n", |
489 | dev->name, dev->irq, print_mac(mac, dev->dev_addr)); | 488 | dev->name, dev->irq, dev->dev_addr); |
490 | 489 | ||
491 | return 0; | 490 | return 0; |
492 | 491 | ||
@@ -2595,7 +2594,6 @@ static int ray_cs_proc_show(struct seq_file *m, void *v) | |||
2595 | UCHAR *p; | 2594 | UCHAR *p; |
2596 | struct freq_hop_element *pfh; | 2595 | struct freq_hop_element *pfh; |
2597 | UCHAR c[33]; | 2596 | UCHAR c[33]; |
2598 | DECLARE_MAC_BUF(mac); | ||
2599 | 2597 | ||
2600 | link = this_device; | 2598 | link = this_device; |
2601 | if (!link) | 2599 | if (!link) |
@@ -2623,8 +2621,7 @@ static int ray_cs_proc_show(struct seq_file *m, void *v) | |||
2623 | nettype[local->sparm.b5.a_network_type], c); | 2621 | nettype[local->sparm.b5.a_network_type], c); |
2624 | 2622 | ||
2625 | p = local->bss_id; | 2623 | p = local->bss_id; |
2626 | seq_printf(m, "BSSID = %s\n", | 2624 | seq_printf(m, "BSSID = %pM\n", p); |
2627 | print_mac(mac, p)); | ||
2628 | 2625 | ||
2629 | seq_printf(m, "Country code = %d\n", | 2626 | seq_printf(m, "Country code = %d\n", |
2630 | local->sparm.b5.a_curr_country_code); | 2627 | local->sparm.b5.a_curr_country_code); |