net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were a few things that had conflicts which I have just dropped for now, no harm done. I've built an allyesconfig with this and looked at the files that weren't built very carefully, but it's a huge patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
0c68ae2605
commit
e174961ca1
@@ -664,7 +664,6 @@ static int hostap_join_ap(struct net_device *dev)
|
||||
unsigned long flags;
|
||||
int i;
|
||||
struct hfa384x_hostscan_result *entry;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
iface = netdev_priv(dev);
|
||||
local = iface->local;
|
||||
@@ -686,14 +685,13 @@ static int hostap_join_ap(struct net_device *dev)
|
||||
|
||||
if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
|
||||
sizeof(req))) {
|
||||
printk(KERN_DEBUG "%s: JoinRequest %s"
|
||||
" failed\n",
|
||||
dev->name, print_mac(mac, local->preferred_ap));
|
||||
printk(KERN_DEBUG "%s: JoinRequest %pM failed\n",
|
||||
dev->name, local->preferred_ap);
|
||||
return -1;
|
||||
}
|
||||
|
||||
printk(KERN_DEBUG "%s: Trying to join BSSID %s\n",
|
||||
dev->name, print_mac(mac, local->preferred_ap));
|
||||
printk(KERN_DEBUG "%s: Trying to join BSSID %pM\n",
|
||||
dev->name, local->preferred_ap);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -3701,10 +3699,8 @@ static int prism2_ioctl_set_assoc_ap_addr(local_info_t *local,
|
||||
struct prism2_hostapd_param *param,
|
||||
int param_len)
|
||||
{
|
||||
DECLARE_MAC_BUF(mac);
|
||||
printk(KERN_DEBUG "%ssta: associated as client with AP "
|
||||
"%s\n",
|
||||
local->dev->name, print_mac(mac, param->sta_addr));
|
||||
printk(KERN_DEBUG "%ssta: associated as client with AP %pM\n",
|
||||
local->dev->name, param->sta_addr);
|
||||
memcpy(local->assoc_ap_addr, param->sta_addr, ETH_ALEN);
|
||||
return 0;
|
||||
}
|
||||
|
Reference in New Issue
Block a user