diff options
Diffstat (limited to 'drivers/net/wireless/hostap/hostap_ioctl.c')
-rw-r--r-- | drivers/net/wireless/hostap/hostap_ioctl.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c index 3f8b1d7036e5..2318c5df7a08 100644 --- a/drivers/net/wireless/hostap/hostap_ioctl.c +++ b/drivers/net/wireless/hostap/hostap_ioctl.c | |||
@@ -664,7 +664,6 @@ static int hostap_join_ap(struct net_device *dev) | |||
664 | unsigned long flags; | 664 | unsigned long flags; |
665 | int i; | 665 | int i; |
666 | struct hfa384x_hostscan_result *entry; | 666 | struct hfa384x_hostscan_result *entry; |
667 | DECLARE_MAC_BUF(mac); | ||
668 | 667 | ||
669 | iface = netdev_priv(dev); | 668 | iface = netdev_priv(dev); |
670 | local = iface->local; | 669 | local = iface->local; |
@@ -686,14 +685,13 @@ static int hostap_join_ap(struct net_device *dev) | |||
686 | 685 | ||
687 | if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req, | 686 | if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req, |
688 | sizeof(req))) { | 687 | sizeof(req))) { |
689 | printk(KERN_DEBUG "%s: JoinRequest %s" | 688 | printk(KERN_DEBUG "%s: JoinRequest %pM failed\n", |
690 | " failed\n", | 689 | dev->name, local->preferred_ap); |
691 | dev->name, print_mac(mac, local->preferred_ap)); | ||
692 | return -1; | 690 | return -1; |
693 | } | 691 | } |
694 | 692 | ||
695 | printk(KERN_DEBUG "%s: Trying to join BSSID %s\n", | 693 | printk(KERN_DEBUG "%s: Trying to join BSSID %pM\n", |
696 | dev->name, print_mac(mac, local->preferred_ap)); | 694 | dev->name, local->preferred_ap); |
697 | 695 | ||
698 | return 0; | 696 | return 0; |
699 | } | 697 | } |
@@ -3701,10 +3699,8 @@ static int prism2_ioctl_set_assoc_ap_addr(local_info_t *local, | |||
3701 | struct prism2_hostapd_param *param, | 3699 | struct prism2_hostapd_param *param, |
3702 | int param_len) | 3700 | int param_len) |
3703 | { | 3701 | { |
3704 | DECLARE_MAC_BUF(mac); | 3702 | printk(KERN_DEBUG "%ssta: associated as client with AP %pM\n", |
3705 | printk(KERN_DEBUG "%ssta: associated as client with AP " | 3703 | local->dev->name, param->sta_addr); |
3706 | "%s\n", | ||
3707 | local->dev->name, print_mac(mac, param->sta_addr)); | ||
3708 | memcpy(local->assoc_ap_addr, param->sta_addr, ETH_ALEN); | 3704 | memcpy(local->assoc_ap_addr, param->sta_addr, ETH_ALEN); |
3709 | return 0; | 3705 | return 0; |
3710 | } | 3706 | } |