7 files changed, 42 insertions, 34 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 3131afcf4590..2c6ddb1f0072 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -16,6 +16,7 @@ static const u8 bssid_off[ETH_ALEN] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
 
 static void print_assoc_req(const char * extra, struct assoc_request * assoc_req)
 {
+        DECLARE_MAC_BUF(mac);
         lbs_deb_assoc(
                "#### Association Request: %s\n"
                "       flags:      0x%08lX\n"
@@ -23,13 +24,13 @@ static void print_assoc_req(const char * extra, struct assoc_request * assoc_req
                "       channel:    %d\n"
                "       band:       %d\n"
                "       mode:       %d\n"
-               "       BSSID:      " MAC_FMT "\n"
+               "       BSSID:      %s\n"
                "       Encryption:%s%s%s\n"
                "       auth:       %d\n",
                extra, assoc_req->flags,
                escape_essid(assoc_req->ssid, assoc_req->ssid_len),
                assoc_req->channel, assoc_req->band, assoc_req->mode,
-               MAC_ARG(assoc_req->bssid),
+               print_mac(mac, assoc_req->bssid),
                assoc_req->secinfo.WPAenabled ? " WPA" : "",
                assoc_req->secinfo.WPA2enabled ? " WPA2" : "",
                assoc_req->secinfo.wep_enabled ? " WEP" : "",
@@ -104,16 +105,17 @@ static int assoc_helper_bssid(wlan_private *priv,
         wlan_adapter *adapter = priv->adapter;
         int ret = 0;
         struct bss_descriptor * bss;
+        DECLARE_MAC_BUF(mac);
 
-        lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID " MAC_FMT,
-                MAC_ARG(assoc_req->bssid));
+        lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID %s",
+                print_mac(mac, assoc_req->bssid));
 
         /* Search for index position in list for requested MAC */
         bss = libertas_find_bssid_in_list(adapter, assoc_req->bssid,
                             assoc_req->mode);
         if (bss == NULL) {
-                lbs_deb_assoc("ASSOC: WAP: BSSID " MAC_FMT " not found, "
-                        "cannot associate.\n", MAC_ARG(assoc_req->bssid));
+                lbs_deb_assoc("ASSOC: WAP: BSSID %s not found, "
+                        "cannot associate.\n", print_mac(mac, assoc_req->bssid));
                 goto out;
         }
 
@@ -481,6 +483,7 @@ void libertas_association_worker(struct work_struct *work)
         struct assoc_request * assoc_req = NULL;
         int ret = 0;
         int find_any_ssid = 0;
+        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_ASSOC);
 
@@ -629,10 +632,10 @@ void libertas_association_worker(struct work_struct *work)
 
                 if (success) {
                         lbs_deb_assoc("ASSOC: association attempt successful. "
-                                "Associated to '%s' (" MAC_FMT ")\n",
+                                "Associated to '%s' (%s)\n",
                                 escape_essid(adapter->curbssparams.ssid,
                                              adapter->curbssparams.ssid_len),
-                                MAC_ARG(adapter->curbssparams.bssid));
+                                print_mac(mac, adapter->curbssparams.bssid));
                         libertas_prepare_and_send_command(priv,
                                 CMD_802_11_RSSI,
                                 0, CMD_OPTION_WAITFORRSP, 0, NULL);
diff --git a/drivers/net/wireless/libertas/cmdresp.c b/drivers/net/wireless/libertas/cmdresp.c
index d64ad87db459..fe70e30b1f3c 100644
--- a/drivers/net/wireless/libertas/cmdresp.c
+++ b/drivers/net/wireless/libertas/cmdresp.c
@@ -159,6 +159,7 @@ static int wlan_ret_get_hw_spec(wlan_private * priv,
         struct cmd_ds_get_hw_spec *hwspec = &resp->params.hwspec;
         wlan_adapter *adapter = priv->adapter;
         int ret = 0;
+        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_CMD);
 
@@ -169,8 +170,8 @@ static int wlan_ret_get_hw_spec(wlan_private * priv,
         lbs_deb_cmd("GET_HW_SPEC: firmware release %u.%u.%up%u\n",
                     adapter->fwreleasenumber[2], adapter->fwreleasenumber[1],
                     adapter->fwreleasenumber[0], adapter->fwreleasenumber[3]);
-        lbs_deb_cmd("GET_HW_SPEC: MAC addr " MAC_FMT "\n",
-               MAC_ARG(hwspec->permanentaddr));
+        lbs_deb_cmd("GET_HW_SPEC: MAC addr %s\n",
+                    print_mac(mac, hwspec->permanentaddr));
         lbs_deb_cmd("GET_HW_SPEC: hardware interface 0x%x, hardware spec 0x%04x\n",
                hwspec->hwifversion, hwspec->version);
 
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 816f42e4f5b4..cb00b080409e 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -63,6 +63,7 @@ static ssize_t libertas_getscantable(struct file *file, char __user *userbuf,
         int numscansdone = 0, res;
         unsigned long addr = get_zeroed_page(GFP_KERNEL);
         char *buf = (char *)addr;
+        DECLARE_MAC_BUF(mac);
         struct bss_descriptor * iter_bss;
 
         pos += snprintf(buf+pos, len-pos,
@@ -75,9 +76,9 @@ static ssize_t libertas_getscantable(struct file *file, char __user *userbuf,
                 u16 spectrum_mgmt = (iter_bss->capability & WLAN_CAPABILITY_SPECTRUM_MGMT);
 
                 pos += snprintf(buf+pos, len-pos,
-                        "%02u| %03d | %04ld | " MAC_FMT " |",
+                        "%02u| %03d | %04ld | %s |",
                         numscansdone, iter_bss->channel, iter_bss->rssi,
-                        MAC_ARG(iter_bss->bssid));
+                        print_mac(mac, iter_bss->bssid));
                 pos += snprintf(buf+pos, len-pos, " %04x-", iter_bss->capability);
                 pos += snprintf(buf+pos, len-pos, "%c%c%c |",
                                 ibss ? 'A' : 'I', privacy ? 'P' : ' ',
diff --git a/drivers/net/wireless/libertas/join.c b/drivers/net/wireless/libertas/join.c
index 0ad1362b14e2..8dcff00574f3 100644
--- a/drivers/net/wireless/libertas/join.c
+++ b/drivers/net/wireless/libertas/join.c
@@ -293,6 +293,7 @@ int libertas_cmd_80211_authenticate(wlan_private * priv,
         struct cmd_ds_802_11_authenticate *pauthenticate = &cmd->params.auth;
         int ret = -1;
         u8 *bssid = pdata_buf;
+        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_JOIN);
 
@@ -319,8 +320,8 @@ int libertas_cmd_80211_authenticate(wlan_private * priv,
 
         memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
 
-        lbs_deb_join("AUTH_CMD: BSSID is : " MAC_FMT " auth=0x%X\n",
-                     MAC_ARG(bssid), pauthenticate->authtype);
+        lbs_deb_join("AUTH_CMD: BSSID is : %s auth=0x%X\n",
+                     print_mac(mac, bssid), pauthenticate->authtype);
         ret = 0;
 
 out:
@@ -598,6 +599,7 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
         int cmdappendsize = 0;
         int ret = 0;
         u16 ratesize = 0;
+        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_JOIN);
 
@@ -621,8 +623,9 @@ int libertas_cmd_80211_ad_hoc_join(wlan_private * priv,
 
         /* information on BSSID descriptor passed to FW */
         lbs_deb_join(
-               "ADHOC_J_CMD: BSSID = " MAC_FMT ", SSID = '%s'\n",
-               MAC_ARG(join_cmd->bss.bssid), join_cmd->bss.ssid);
+               "ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n",
+               print_mac(mac, join_cmd->bss.bssid),
+               join_cmd->bss.ssid);
 
         /* failtimeout */
         join_cmd->failtimeout = cpu_to_le16(MRVDRV_ASSOCIATION_TIME_OUT);
@@ -829,6 +832,7 @@ int libertas_ret_80211_ad_hoc_start(wlan_private * priv,
         struct cmd_ds_802_11_ad_hoc_result *padhocresult;
         union iwreq_data wrqu;
         struct bss_descriptor *bss;
+        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_JOIN);
 
@@ -894,8 +898,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 = " MAC_FMT "\n",
-               MAC_ARG(padhocresult->bssid));
+        lbs_deb_join("ADHOC_RESP: BSSID = %s\n",
+                     print_mac(mac, padhocresult->bssid));
 
 done:
         lbs_deb_leave_args(LBS_DEB_JOIN, "ret %d", ret);
diff --git a/drivers/net/wireless/libertas/main.c b/drivers/net/wireless/libertas/main.c
index a54171af7b97..5ead08312e1e 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -677,6 +677,7 @@ static void libertas_set_multicast_list(struct net_device *dev)
         wlan_private *priv = dev->priv;
         wlan_adapter *adapter = priv->adapter;
         int oldpacketfilter;
+        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_NET);
 
@@ -723,14 +724,9 @@ static void libertas_set_multicast_list(struct net_device *dev)
                                        dev->mc_count);
 
                                 for (i = 0; i < dev->mc_count; i++) {
-                                        lbs_deb_net("Multicast address %d:"
-                                               MAC_FMT "\n", i,
-                                               adapter->multicastlist[i][0],
-                                               adapter->multicastlist[i][1],
-                                               adapter->multicastlist[i][2],
-                                               adapter->multicastlist[i][3],
-                                               adapter->multicastlist[i][4],
-                                               adapter->multicastlist[i][5]);
+                                        lbs_deb_net("Multicast address %d:%s\n",
+                                               i, print_mac(mac,
+                                               adapter->multicastlist[i]));
                                 }
                                 /* send multicast addresses to firmware */
                                 libertas_prepare_and_send_command(priv,
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index e2e9ebcd8340..8f073ad1957f 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -777,6 +777,7 @@ int wlan_scan_networks(wlan_private * priv,
 #ifdef CONFIG_LIBERTAS_DEBUG
         struct bss_descriptor * iter_bss;
         int i = 0;
+        DECLARE_MAC_BUF(mac);
 #endif
 
         lbs_deb_enter(LBS_DEB_SCAN);
@@ -831,8 +832,8 @@ int wlan_scan_networks(wlan_private * priv,
         /* Dump the scan table */
         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++, MAC_ARG(iter_bss->bssid), (s32) iter_bss->rssi,
+                lbs_deb_scan("Scan:(%02d) %s, RSSI[%03d], SSID[%s]\n",
+                       i++, print_mac(mac, iter_bss->bssid), (s32) iter_bss->rssi,
                        escape_essid(iter_bss->ssid, iter_bss->ssid_len));
         }
         mutex_unlock(&adapter->lock);
@@ -876,6 +877,7 @@ static int libertas_process_bss(struct bss_descriptor * bss,
         struct ieeetypes_dsparamset *pDS;
         struct ieeetypes_cfparamset *pCF;
         struct ieeetypes_ibssparamset *pibss;
+        DECLARE_MAC_BUF(mac);
         struct ieeetypes_countryinfoset *pcountryinfo;
         u8 *pos, *end, *p;
         u8 n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
@@ -906,7 +908,7 @@ static int libertas_process_bss(struct bss_descriptor * bss,
         *bytesleft -= beaconsize;
 
         memcpy(bss->bssid, pos, ETH_ALEN);
-        lbs_deb_scan("process_bss: AP BSSID " MAC_FMT "\n", MAC_ARG(bss->bssid));
+        lbs_deb_scan("process_bss: AP BSSID %s\n", print_mac(mac, bss->bssid));
         pos += ETH_ALEN;
 
         if ((end - pos) < 12) {
@@ -1724,6 +1726,7 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
                 struct bss_descriptor new;
                 struct bss_descriptor * found = NULL;
                 struct bss_descriptor * oldest = NULL;
+                DECLARE_MAC_BUF(mac);
 
                 /* Process the data fields and IEs returned for this BSS */
                 memset(&new, 0, sizeof (struct bss_descriptor));
@@ -1762,9 +1765,8 @@ int libertas_ret_80211_scan(wlan_private * priv, struct cmd_ds_command *resp)
                         continue;
                 }
 
-                lbs_deb_scan("SCAN_RESP: BSSID = " MAC_FMT "\n",
-                       new.bssid[0], new.bssid[1], new.bssid[2],
-                       new.bssid[3], new.bssid[4], new.bssid[5]);
+                lbs_deb_scan("SCAN_RESP: BSSID = %s\n",
+                             print_mac(mac, new.bssid));
 
                 /* Copy the locally created newbssentry to the scan table */
                 memcpy(found, &new, offsetof(struct bss_descriptor, list));
diff --git a/drivers/net/wireless/libertas/wext.c b/drivers/net/wireless/libertas/wext.c
index f8036efd7294..0b2103e0af57 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -1160,7 +1160,7 @@ static int wlan_get_encode(struct net_device *dev,
 
         dwrq->flags |= IW_ENCODE_NOKEY;
 
-        lbs_deb_wext("key: " MAC_FMT ", keylen %d\n",
+        lbs_deb_wext("key: %02x:%02x:%02x:%02x:%02x:%02x, keylen %d\n",
                extra[0], extra[1], extra[2],
                extra[3], extra[4], extra[5], dwrq->length);
 
@@ -1980,13 +1980,14 @@ static int wlan_set_wap(struct net_device *dev, struct iw_request_info *info,
         wlan_adapter *adapter = priv->adapter;
         struct assoc_request * assoc_req;
         int ret = 0;
+        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_WEXT);
 
         if (awrq->sa_family != ARPHRD_ETHER)
                 return -EINVAL;
 
-        lbs_deb_wext("ASSOC: WAP: sa_data " MAC_FMT "\n", MAC_ARG(awrq->sa_data));
+        lbs_deb_wext("ASSOC: WAP: sa_data %s\n", print_mac(mac, awrq->sa_data));
 
         mutex_lock(&adapter->lock);