[PATCH] libertas: use MAC_FMT and MAC_ARG where appropriate

Signed-off-by: Dan Williams <dcbw@redhat.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

3 files changed, 8 insertions, 17 deletions

diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 1545935f7a9..debefb6eab7 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -74,11 +74,9 @@ static ssize_t libertas_getscantable(struct file *file, char __user *userbuf,
 
                 memcpy(&cap, &iter_bss->cap, sizeof(cap));
                 pos += snprintf(buf+pos, len-pos,
-                        "%02u| %03d | %03ld | %02x:%02x:%02x:%02x:%02x:%02x |",
+                        "%02u| %03d | %03ld | " MAC_FMT " |",
                         numscansdone, iter_bss->channel, iter_bss->rssi,
-                        iter_bss->bssid[0], iter_bss->bssid[1],
-                        iter_bss->bssid[2], iter_bss->bssid[3],
-                        iter_bss->bssid[4], iter_bss->bssid[5]);
+                        MAC_ARG(iter_bss->bssid));
                 pos += snprintf(buf+pos, len-pos, " %04x-", cap);
                 pos += snprintf(buf+pos, len-pos, "%c%c%c |",
                                 iter_bss->cap.ibss ? 'A' : 'I',
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 65777b40d57..944f7acf261 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -286,8 +286,7 @@ int libertas_cmd_80211_authenticate(wlan_private * priv,
 
         memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
 
-        lbs_deb_join("AUTH_CMD: Bssid is : %x:%x:%x:%x:%x:%x\n",
-               bssid[0], bssid[1], bssid[2], bssid[3], bssid[4], bssid[5]);
+        lbs_deb_join("AUTH_CMD: Bssid is : " MAC_FMT "\n", MAC_ARG(bssid));
         ret = 0;
 
 out:
@@ -865,10 +864,8 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
 
         lbs_deb_join("ADHOC_RESP: - Joined/Started Ad Hoc\n");
         lbs_deb_join("ADHOC_RESP: channel = %d\n", adapter->curbssparams.channel);
-        lbs_deb_join("ADHOC_RESP: BSSID = %02x:%02x:%02x:%02x:%02x:%02x\n",
-               padhocresult->BSSID[0], padhocresult->BSSID[1],
-               padhocresult->BSSID[2], padhocresult->BSSID[3],
-               padhocresult->BSSID[4], padhocresult->BSSID[5]);
+        lbs_deb_join("ADHOC_RESP: BSSID = " MAC_FMT "\n",
+               MAC_ARG(padhocresult->BSSID));
 
 done:
         lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 334da0c5c5a..133be93d608 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -241,10 +241,8 @@ static void wlan_scan_process_results(wlan_private * priv)
         mutex_lock(&adapter->lock);
         list_for_each_entry (iter_bss, &adapter->network_list, list) {
                 lbs_deb_scan("Scan:(%02d) " MAC_FMT ", RSSI[%03d], SSID[%s]\n",
-                       i++,
-                       iter_bss->bssid[0], iter_bss->bssid[1], iter_bss->bssid[2],
-                       iter_bss->bssid[3], iter_bss->bssid[4], iter_bss->bssid[5],
-                       (s32) iter_bss->rssi, iter_bss->ssid.ssid);
+                       i++, MAC_ARG(iter_bss->bssid), (s32) iter_bss->rssi,
+                       iter_bss->ssid.ssid);
         }
         mutex_unlock(&adapter->lock);
 }
@@ -983,9 +981,7 @@ static int libertas_process_bss(struct bss_descriptor * bss,
         bytesleftforcurrentbeacon = beaconsize;
 
         memcpy(bss->bssid, pcurrentptr, ETH_ALEN);
-        lbs_deb_scan("process_bss: AP BSSID " MAC_FMT "\n",
-               bss->bssid[0], bss->bssid[1], bss->bssid[2],
-               bss->bssid[3], bss->bssid[4], bss->bssid[5]);
+        lbs_deb_scan("process_bss: AP BSSID " MAC_FMT "\n", MAC_ARG(bss->bssid));
 
         pcurrentptr += ETH_ALEN;
         bytesleftforcurrentbeacon -= ETH_ALEN;