[NET]: Introduce and use print_mac() and DECLARE_MAC_BUF()

This is nicer than the MAC_FMT stuff.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 15 insertions, 35 deletions

diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 77ea13bf0c02..6d80ca421cf0 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2029,12 +2029,12 @@ static void
 format_event(islpci_private *priv, char *dest, const char *str,
              const struct obj_mlme *mlme, u16 *length, int error)
 {
-        const u8 *a = mlme->address;
+        DECLARE_MAC_BUF(mac);
         int n = snprintf(dest, IW_CUSTOM_MAX,
-                         "%s %s %2.2X:%2.2X:%2.2X:%2.2X:%2.2X:%2.2X %s (%2.2X)",
+                         "%s %s %s %s (%2.2X)",
                          str,
                          ((priv->iw_mode == IW_MODE_MASTER) ? "from" : "to"),
-                         a[0], a[1], a[2], a[3], a[4], a[5],
+                         print_mac(mac, mlme->address),
                          (error ? (mlme->code ? " : REJECTED " : " : ACCEPTED ")
                           : ""), mlme->code);
         BUG_ON(n > IW_CUSTOM_MAX);
@@ -2105,15 +2105,13 @@ struct ieee80211_beacon_phdr {
 #define WLAN_EID_GENERIC 0xdd
 static u8 wpa_oid[4] = { 0x00, 0x50, 0xf2, 1 };
 
-#define MAC2STR(a) (a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5]
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
-
 static void
 prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
                        u8 *wpa_ie, size_t wpa_ie_len)
 {
         struct list_head *ptr;
         struct islpci_bss_wpa_ie *bss = NULL;
+        DECLARE_MAC_BUF(mac);
 
         if (wpa_ie_len > MAX_WPA_IE_LEN)
                 wpa_ie_len = MAX_WPA_IE_LEN;
@@ -2154,8 +2152,8 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
                 bss->wpa_ie_len = wpa_ie_len;
                 bss->last_update = jiffies;
         } else {
-                printk(KERN_DEBUG "Failed to add BSS WPA entry for " MACSTR
-                       "\n", MAC2STR(bssid));
+                printk(KERN_DEBUG "Failed to add BSS WPA entry for "
+                       "%s\n", print_mac(mac, bssid));
         }
 
         /* expire old entries from WPA list */
@@ -2221,6 +2219,7 @@ prism54_process_bss_data(islpci_private *priv, u32 oid, u8 *addr,
 {
         struct ieee80211_beacon_phdr *hdr;
         u8 *pos, *end;
+        DECLARE_MAC_BUF(mac);
 
         if (!priv->wpa)
                 return;
@@ -2231,7 +2230,7 @@ prism54_process_bss_data(islpci_private *priv, u32 oid, u8 *addr,
         while (pos < end) {
                 if (pos + 2 + pos[1] > end) {
                         printk(KERN_DEBUG "Parsing Beacon/ProbeResp failed "
-                               "for " MACSTR "\n", MAC2STR(addr));
+                               "for %s\n", print_mac(mac, addr));
                         return;
                 }
                 if (pos[0] == WLAN_EID_GENERIC && pos[1] >= 4 &&
@@ -2270,6 +2269,7 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
         size_t len = 0; /* u16, better? */
         u8 *payload = NULL, *pos = NULL;
         int ret;
+        DECLARE_MAC_BUF(mac);
 
         /* I think all trapable objects are listed here.
          * Some oids have a EX version. The difference is that they are emitted
@@ -2358,14 +2358,8 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
                         break;
 
                 memcpy(&confirm->address, mlmeex->address, ETH_ALEN);
-                printk(KERN_DEBUG "Authenticate from: address:\t%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                mlmeex->address[0],
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
+                printk(KERN_DEBUG "Authenticate from: address:\t%s\n",
+                       print_mac(mac, mlmeex->address));
                 confirm->id = -1; /* or mlmeex->id ? */
                 confirm->state = 0; /* not used */
                 confirm->code = 0;
@@ -2410,15 +2404,8 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
                 wpa_ie_len = prism54_wpa_bss_ie_get(priv, mlmeex->address, wpa_ie);
 
                 if (!wpa_ie_len) {
-                        printk(KERN_DEBUG "No WPA IE found from "
-                                        "address:\t%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                mlmeex->address[0],
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
+                        printk(KERN_DEBUG "No WPA IE found from address:\t%s\n",
+                               print_mac(mac, mlmeex->address));
                         kfree(confirm);
                         break;
                 }
@@ -2454,15 +2441,8 @@ prism54_process_trap_helper(islpci_private *priv, enum oid_num_t oid,
                 wpa_ie_len = prism54_wpa_bss_ie_get(priv, mlmeex->address, wpa_ie);
 
                 if (!wpa_ie_len) {
-                        printk(KERN_DEBUG "No WPA IE found from "
-                                        "address:\t%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                mlmeex->address[0],
-                                mlmeex->address[1],
-                                mlmeex->address[2],
-                                mlmeex->address[3],
-                                mlmeex->address[4],
-                                mlmeex->address[5]
-                                );
+                        printk(KERN_DEBUG "No WPA IE found from address:\t%s\n",
+                               print_mac(mac, mlmeex->address));
                         kfree(confirm);
                         break;
                 }