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
@@ -166,7 +166,6 @@ static void prism2_host_roaming(local_info_t *local)
|
||||
struct hfa384x_hostscan_result *selected, *entry;
|
||||
int i;
|
||||
unsigned long flags;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
if (local->last_join_time &&
|
||||
time_before(jiffies, local->last_join_time + 10 * HZ)) {
|
||||
@@ -199,9 +198,8 @@ static void prism2_host_roaming(local_info_t *local)
|
||||
local->preferred_ap[2] || local->preferred_ap[3] ||
|
||||
local->preferred_ap[4] || local->preferred_ap[5]) {
|
||||
/* Try to find preferred AP */
|
||||
PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID "
|
||||
"%s\n",
|
||||
dev->name, print_mac(mac, local->preferred_ap));
|
||||
PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID %pM\n",
|
||||
dev->name, local->preferred_ap);
|
||||
for (i = 0; i < local->last_scan_results_count; i++) {
|
||||
entry = &local->last_scan_results[i];
|
||||
if (memcmp(local->preferred_ap, entry->bssid, 6) == 0)
|
||||
@@ -218,9 +216,9 @@ static void prism2_host_roaming(local_info_t *local)
|
||||
req.channel = selected->chid;
|
||||
spin_unlock_irqrestore(&local->lock, flags);
|
||||
|
||||
PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=%s"
|
||||
PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=%pM"
|
||||
" channel=%d\n",
|
||||
dev->name, print_mac(mac, req.bssid), le16_to_cpu(req.channel));
|
||||
dev->name, req.bssid, le16_to_cpu(req.channel));
|
||||
if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
|
||||
sizeof(req))) {
|
||||
printk(KERN_DEBUG "%s: JoinRequest failed\n", dev->name);
|
||||
@@ -413,7 +411,6 @@ static void handle_info_queue_linkstatus(local_info_t *local)
|
||||
int val = local->prev_link_status;
|
||||
int connected;
|
||||
union iwreq_data wrqu;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
connected =
|
||||
val == HFA384X_LINKSTATUS_CONNECTED ||
|
||||
@@ -425,10 +422,9 @@ static void handle_info_queue_linkstatus(local_info_t *local)
|
||||
printk(KERN_DEBUG "%s: could not read CURRENTBSSID after "
|
||||
"LinkStatus event\n", local->dev->name);
|
||||
} else {
|
||||
PDEBUG(DEBUG_EXTRA, "%s: LinkStatus: BSSID="
|
||||
"%s\n",
|
||||
PDEBUG(DEBUG_EXTRA, "%s: LinkStatus: BSSID=%pM\n",
|
||||
local->dev->name,
|
||||
print_mac(mac, (unsigned char *) local->bssid));
|
||||
(unsigned char *) local->bssid);
|
||||
if (local->wds_type & HOSTAP_WDS_AP_CLIENT)
|
||||
hostap_add_sta(local->ap, local->bssid);
|
||||
}
|
||||
|
Reference in New Issue
Block a user