diff options
author | Joe Perches <joe@perches.com> | 2007-10-03 20:59:30 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:51:42 -0400 |
commit | 0795af5729b18218767fab27c44b1384f72dc9ad (patch) | |
tree | 67c16df84aa6ec219340b8ea1b5cfb0e8150a216 /drivers/net/wireless/wl3501_cs.c | |
parent | 95ea36275f3c9a1d3d04c217b4b576c657c4e70e (diff) |
[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()
This is nicer than the MAC_FMT stuff.
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/wireless/wl3501_cs.c')
-rw-r--r-- | drivers/net/wireless/wl3501_cs.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 2690f291e3f7..42a36b3f3ff7 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c | |||
@@ -860,11 +860,10 @@ static int wl3501_esbq_confirm(struct wl3501_card *this) | |||
860 | static void wl3501_online(struct net_device *dev) | 860 | static void wl3501_online(struct net_device *dev) |
861 | { | 861 | { |
862 | struct wl3501_card *this = netdev_priv(dev); | 862 | struct wl3501_card *this = netdev_priv(dev); |
863 | DECLARE_MAC_BUF(mac); | ||
863 | 864 | ||
864 | printk(KERN_INFO "%s: Wireless LAN online. BSSID: " | 865 | printk(KERN_INFO "%s: Wireless LAN online. BSSID: %s\n", |
865 | "%02X %02X %02X %02X %02X %02X\n", dev->name, | 866 | dev->name, print_mac(mac, this->bssid)); |
866 | this->bssid[0], this->bssid[1], this->bssid[2], | ||
867 | this->bssid[3], this->bssid[4], this->bssid[5]); | ||
868 | netif_wake_queue(dev); | 867 | netif_wake_queue(dev); |
869 | } | 868 | } |
870 | 869 | ||
@@ -1966,6 +1965,7 @@ static int wl3501_config(struct pcmcia_device *link) | |||
1966 | struct net_device *dev = link->priv; | 1965 | struct net_device *dev = link->priv; |
1967 | int i = 0, j, last_fn, last_ret; | 1966 | int i = 0, j, last_fn, last_ret; |
1968 | struct wl3501_card *this; | 1967 | struct wl3501_card *this; |
1968 | DECLARE_MAC_BUF(mac); | ||
1969 | 1969 | ||
1970 | /* Try allocating IO ports. This tries a few fixed addresses. If you | 1970 | /* Try allocating IO ports. This tries a few fixed addresses. If you |
1971 | * want, you can also read the card's config table to pick addresses -- | 1971 | * want, you can also read the card's config table to pick addresses -- |
@@ -2019,14 +2019,14 @@ static int wl3501_config(struct pcmcia_device *link) | |||
2019 | } | 2019 | } |
2020 | strcpy(this->node.dev_name, dev->name); | 2020 | strcpy(this->node.dev_name, dev->name); |
2021 | 2021 | ||
2022 | /* print probe information */ | 2022 | for (i = 0; i < 6; i++) |
2023 | printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, MAC addr in flash ROM:", | ||
2024 | dev->name, this->base_addr, (int)dev->irq); | ||
2025 | for (i = 0; i < 6; i++) { | ||
2026 | dev->dev_addr[i] = ((char *)&this->mac_addr)[i]; | 2023 | dev->dev_addr[i] = ((char *)&this->mac_addr)[i]; |
2027 | printk("%c%02x", i ? ':' : ' ', dev->dev_addr[i]); | 2024 | |
2028 | } | 2025 | /* print probe information */ |
2029 | printk("\n"); | 2026 | printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, " |
2027 | "MAC addr in flash ROM:%s\n", | ||
2028 | dev->name, this->base_addr, (int)dev->irq, | ||
2029 | print_mac(mac, dev->dev_addr)); | ||
2030 | /* | 2030 | /* |
2031 | * Initialize card parameters - added by jss | 2031 | * Initialize card parameters - added by jss |
2032 | */ | 2032 | */ |