6 files changed, 26 insertions, 40 deletions

diff --git a/drivers/net/wireless/libertas/assoc.c b/drivers/net/wireless/libertas/assoc.c
index 92be60415d04..8b88e9544418 100644
--- a/drivers/net/wireless/libertas/assoc.c
+++ b/drivers/net/wireless/libertas/assoc.c
@@ -151,7 +151,6 @@ static int lbs_adhoc_join(struct lbs_private *priv,
         struct cmd_ds_802_11_ad_hoc_join cmd;
         struct bss_descriptor *bss = &assoc_req->bss;
         u8 preamble = RADIO_PREAMBLE_LONG;
-        DECLARE_MAC_BUF(mac);
         u16 ratesize = 0;
         int ret = 0;
 
@@ -226,8 +225,8 @@ static int lbs_adhoc_join(struct lbs_private *priv,
                bss->capability, CAPINFO_MASK);
 
         /* information on BSSID descriptor passed to FW */
-        lbs_deb_join("ADHOC_J_CMD: BSSID = %s, SSID = '%s'\n",
-                        print_mac(mac, cmd.bss.bssid), cmd.bss.ssid);
+        lbs_deb_join("ADHOC_J_CMD: BSSID = %pM, SSID = '%s'\n",
+                        cmd.bss.bssid, cmd.bss.ssid);
 
         /* Only v8 and below support setting these */
         if (priv->fwrelease < 0x09000000) {
@@ -752,17 +751,15 @@ static int assoc_helper_bssid(struct lbs_private *priv,
 {
         int ret = 0;
         struct bss_descriptor * bss;
-        DECLARE_MAC_BUF(mac);
 
-        lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID %s",
-                print_mac(mac, assoc_req->bssid));
+        lbs_deb_enter_args(LBS_DEB_ASSOC, "BSSID %pM", assoc_req->bssid);
 
         /* Search for index position in list for requested MAC */
         bss = lbs_find_bssid_in_list(priv, assoc_req->bssid,
                             assoc_req->mode);
         if (bss == NULL) {
-                lbs_deb_assoc("ASSOC: WAP: BSSID %s not found, "
-                        "cannot associate.\n", print_mac(mac, assoc_req->bssid));
+                lbs_deb_assoc("ASSOC: WAP: BSSID %pM not found, "
+                        "cannot associate.\n", assoc_req->bssid);
                 goto out;
         }
 
@@ -1208,7 +1205,6 @@ void lbs_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);
 
@@ -1228,13 +1224,13 @@ void lbs_association_worker(struct work_struct *work)
                 "    chann:     %d\n"
                 "    band:      %d\n"
                 "    mode:      %d\n"
-                "    BSSID:     %s\n"
+                "    BSSID:     %pM\n"
                 "    secinfo:  %s%s%s\n"
                 "    auth_mode: %d\n",
                 assoc_req->flags,
                 escape_essid(assoc_req->ssid, assoc_req->ssid_len),
                 assoc_req->channel, assoc_req->band, assoc_req->mode,
-                print_mac(mac, assoc_req->bssid),
+                assoc_req->bssid,
                 assoc_req->secinfo.WPAenabled ? " WPA" : "",
                 assoc_req->secinfo.WPA2enabled ? " WPA2" : "",
                 assoc_req->secinfo.wep_enabled ? " WEP" : "",
@@ -1357,8 +1353,8 @@ void lbs_association_worker(struct work_struct *work)
                 }
 
                 if (success) {
-                        lbs_deb_assoc("associated to %s\n",
-                                print_mac(mac, priv->curbssparams.bssid));
+                        lbs_deb_assoc("associated to %pM\n",
+                                priv->curbssparams.bssid);
                         lbs_prepare_and_send_command(priv,
                                 CMD_802_11_RSSI,
                                 0, CMD_OPTION_WAITFORRSP, 0, NULL);
@@ -1478,7 +1474,6 @@ int lbs_cmd_80211_authenticate(struct lbs_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);
 
@@ -1505,8 +1500,8 @@ int lbs_cmd_80211_authenticate(struct lbs_private *priv,
 
         memcpy(pauthenticate->macaddr, bssid, ETH_ALEN);
 
-        lbs_deb_join("AUTH_CMD: BSSID %s, auth 0x%x\n",
-                print_mac(mac, bssid), pauthenticate->authtype);
+        lbs_deb_join("AUTH_CMD: BSSID %pM, auth 0x%x\n",
+                bssid, pauthenticate->authtype);
         ret = 0;
 
 out:
@@ -1770,7 +1765,6 @@ static int lbs_adhoc_post(struct lbs_private *priv, struct cmd_header *resp)
         struct cmd_ds_802_11_ad_hoc_result *adhoc_resp;
         union iwreq_data wrqu;
         struct bss_descriptor *bss;
-        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_JOIN);
 
@@ -1819,9 +1813,9 @@ static int lbs_adhoc_post(struct lbs_private *priv, struct cmd_header *resp)
         wrqu.ap_addr.sa_family = ARPHRD_ETHER;
         wireless_send_event(priv->dev, SIOCGIWAP, &wrqu, NULL);
 
-        lbs_deb_join("ADHOC_RESP: Joined/started '%s', BSSID %s, channel %d\n",
+        lbs_deb_join("ADHOC_RESP: Joined/started '%s', BSSID %pM, channel %d\n",
                      escape_essid(bss->ssid, bss->ssid_len),
-                     print_mac(mac, priv->curbssparams.bssid),
+                     priv->curbssparams.bssid,
                      priv->curbssparams.channel);
 
 done:
diff --git a/drivers/net/wireless/libertas/cmd.c b/drivers/net/wireless/libertas/cmd.c
index 297696de2da0..8542d85f36af 100644
--- a/drivers/net/wireless/libertas/cmd.c
+++ b/drivers/net/wireless/libertas/cmd.c
@@ -87,7 +87,6 @@ int lbs_update_hw_spec(struct lbs_private *priv)
         struct cmd_ds_get_hw_spec cmd;
         int ret = -1;
         u32 i;
-        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_CMD);
 
@@ -110,8 +109,8 @@ int lbs_update_hw_spec(struct lbs_private *priv)
          * CF card    firmware 5.0.16p0:   cap 0x00000303
          * USB dongle firmware 5.110.17p2: cap 0x00000303
          */
-        lbs_pr_info("%s, fw %u.%u.%up%u, cap 0x%08x\n",
-                print_mac(mac, cmd.permanentaddr),
+        lbs_pr_info("%pM, fw %u.%u.%up%u, cap 0x%08x\n",
+                cmd.permanentaddr,
                 priv->fwrelease >> 24 & 0xff,
                 priv->fwrelease >> 16 & 0xff,
                 priv->fwrelease >>  8 & 0xff,
diff --git a/drivers/net/wireless/libertas/debugfs.c b/drivers/net/wireless/libertas/debugfs.c
index 0aa0ce3b2c42..5f6bee493f23 100644
--- a/drivers/net/wireless/libertas/debugfs.c
+++ b/drivers/net/wireless/libertas/debugfs.c
@@ -65,7 +65,6 @@ static ssize_t lbs_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,
@@ -77,10 +76,9 @@ static ssize_t lbs_getscantable(struct file *file, char __user *userbuf,
                 u16 privacy = (iter_bss->capability & WLAN_CAPABILITY_PRIVACY);
                 u16 spectrum_mgmt = (iter_bss->capability & WLAN_CAPABILITY_SPECTRUM_MGMT);
 
-                pos += snprintf(buf+pos, len-pos,
-                        "%02u| %03d | %04d | %s |",
+                pos += snprintf(buf+pos, len-pos, "%02u| %03d | %04d | %pM |",
                         numscansdone, iter_bss->channel, iter_bss->rssi,
-                        print_mac(mac, iter_bss->bssid));
+                        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/main.c b/drivers/net/wireless/libertas/main.c
index 73dc8c72402a..34a47f692bd6 100644
--- a/drivers/net/wireless/libertas/main.c
+++ b/drivers/net/wireless/libertas/main.c
@@ -588,7 +588,6 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
 {
         int i = nr_addrs;
         struct dev_mc_list *mc_list;
-        DECLARE_MAC_BUF(mac);
 
         if ((dev->flags & (IFF_UP|IFF_MULTICAST)) != (IFF_UP|IFF_MULTICAST))
                 return nr_addrs;
@@ -596,16 +595,16 @@ static int lbs_add_mcast_addrs(struct cmd_ds_mac_multicast_adr *cmd,
         netif_addr_lock_bh(dev);
         for (mc_list = dev->mc_list; mc_list; mc_list = mc_list->next) {
                 if (mac_in_list(cmd->maclist, nr_addrs, mc_list->dmi_addr)) {
-                        lbs_deb_net("mcast address %s:%s skipped\n", dev->name,
-                                    print_mac(mac, mc_list->dmi_addr));
+                        lbs_deb_net("mcast address %s:%pM skipped\n", dev->name,
+                                    mc_list->dmi_addr);
                         continue;
                 }
 
                 if (i == MRVDRV_MAX_MULTICAST_LIST_SIZE)
                         break;
                 memcpy(&cmd->maclist[6*i], mc_list->dmi_addr, ETH_ALEN);
-                lbs_deb_net("mcast address %s:%s added to filter\n", dev->name,
-                            print_mac(mac, mc_list->dmi_addr));
+                lbs_deb_net("mcast address %s:%pM added to filter\n", dev->name,
+                            mc_list->dmi_addr);
                 i++;
         }
         netif_addr_unlock_bh(dev);
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 8f66903641b9..fcaef38d5df9 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -359,7 +359,6 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
 #ifdef CONFIG_LIBERTAS_DEBUG
         struct bss_descriptor *iter;
         int i = 0;
-        DECLARE_MAC_BUF(mac);
 #endif
 
         lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d", full_scan);
@@ -451,8 +450,8 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
         mutex_lock(&priv->lock);
         lbs_deb_scan("scan table:\n");
         list_for_each_entry(iter, &priv->network_list, list)
-                lbs_deb_scan("%02d: BSSID %s, RSSI %d, SSID '%s'\n",
-                             i++, print_mac(mac, iter->bssid), iter->rssi,
+                lbs_deb_scan("%02d: BSSID %pM, RSSI %d, SSID '%s'\n",
+                             i++, iter->bssid, iter->rssi,
                              escape_essid(iter->ssid, iter->ssid_len));
         mutex_unlock(&priv->lock);
 #endif
@@ -512,7 +511,6 @@ static int lbs_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;
         uint8_t *pos, *end, *p;
         uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
@@ -544,7 +542,7 @@ static int lbs_process_bss(struct bss_descriptor *bss,
         *bytesleft -= beaconsize;
 
         memcpy(bss->bssid, pos, ETH_ALEN);
-        lbs_deb_scan("process_bss: BSSID %s\n", print_mac(mac, bss->bssid));
+        lbs_deb_scan("process_bss: BSSID %pM\n", bss->bssid);
         pos += ETH_ALEN;
 
         if ((end - pos) < 12) {
@@ -1151,7 +1149,6 @@ static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
                 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));
@@ -1190,7 +1187,7 @@ static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
                         continue;
                 }
 
-                lbs_deb_scan("SCAN_RESP: BSSID %s\n", print_mac(mac, new.bssid));
+                lbs_deb_scan("SCAN_RESP: BSSID %pM\n", 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 82c3e5a50ea6..04f0bf2ef0a8 100644
--- a/drivers/net/wireless/libertas/wext.c
+++ b/drivers/net/wireless/libertas/wext.c
@@ -2104,7 +2104,6 @@ static int lbs_set_wap(struct net_device *dev, struct iw_request_info *info,
         struct lbs_private *priv = dev->priv;
         struct assoc_request * assoc_req;
         int ret = 0;
-        DECLARE_MAC_BUF(mac);
 
         lbs_deb_enter(LBS_DEB_WEXT);
 
@@ -2114,7 +2113,7 @@ static int lbs_set_wap(struct net_device *dev, struct iw_request_info *info,
         if (awrq->sa_family != ARPHRD_ETHER)
                 return -EINVAL;
 
-        lbs_deb_wext("ASSOC: WAP: sa_data %s\n", print_mac(mac, awrq->sa_data));
+        lbs_deb_wext("ASSOC: WAP: sa_data %pM\n", awrq->sa_data);
 
         mutex_lock(&priv->lock);