[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, 114 insertions, 93 deletions

diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index afad8bb7e334..2119a79dcc86 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -2247,8 +2247,8 @@ static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)
                 return -1;
         }
 
-        IPW_DEBUG_INFO("%s: Setting MAC to " MAC_FMT "\n",
-                       priv->net_dev->name, MAC_ARG(mac));
+        IPW_DEBUG_INFO("%s: Setting MAC to %s\n",
+                       priv->net_dev->name, print_mac(mac, mac));
 
         return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN, mac);
 }
@@ -3796,6 +3796,7 @@ static u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid)
 {
         struct ipw_station_entry entry;
         int i;
+        DECLARE_MAC_BUF(mac);
 
         for (i = 0; i < priv->num_stations; i++) {
                 if (!memcmp(priv->stations[i], bssid, ETH_ALEN)) {
@@ -3812,7 +3813,7 @@ static u8 ipw_add_station(struct ipw_priv *priv, u8 * bssid)
         if (i == MAX_STATIONS)
                 return IPW_INVALID_STATION;
 
-        IPW_DEBUG_SCAN("Adding AdHoc station: " MAC_FMT "\n", MAC_ARG(bssid));
+        IPW_DEBUG_SCAN("Adding AdHoc station: %s\n", print_mac(mac, bssid));
 
         entry.reserved = 0;
         entry.support_mode = 0;
@@ -3839,6 +3840,7 @@ static u8 ipw_find_station(struct ipw_priv *priv, u8 * bssid)
 static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
 {
         int err;
+        DECLARE_MAC_BUF(mac);
 
         if (priv->status & STATUS_ASSOCIATING) {
                 IPW_DEBUG_ASSOC("Disassociating while associating.\n");
@@ -3851,9 +3853,9 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
                 return;
         }
 
-        IPW_DEBUG_ASSOC("Disassocation attempt from " MAC_FMT " "
+        IPW_DEBUG_ASSOC("Disassocation attempt from %s "
                         "on channel %d.\n",
-                        MAC_ARG(priv->assoc_request.bssid),
+                        print_mac(mac, priv->assoc_request.bssid),
                         priv->assoc_request.channel);
 
         priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
@@ -4348,6 +4350,7 @@ static void ipw_handle_missed_beacon(struct ipw_priv *priv,
 static void ipw_rx_notification(struct ipw_priv *priv,
                                        struct ipw_rx_notification *notif)
 {
+        DECLARE_MAC_BUF(mac);
         notif->size = le16_to_cpu(notif->size);
 
         IPW_DEBUG_NOTIF("type = %i (%d bytes)\n", notif->subtype, notif->size);
@@ -4360,11 +4363,11 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                         case CMAS_ASSOCIATED:{
                                         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                   IPW_DL_ASSOC,
-                                                  "associated: '%s' " MAC_FMT
+                                                  "associated: '%s' %s"
                                                   " \n",
                                                   escape_essid(priv->essid,
                                                                priv->essid_len),
-                                                  MAC_ARG(priv->bssid));
+                                                  print_mac(mac, priv->bssid));
 
                                         switch (priv->ieee->iw_mode) {
                                         case IW_MODE_INFRA:
@@ -4444,13 +4447,13 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                                           IPW_DL_STATE |
                                                           IPW_DL_ASSOC,
                                                           "deauthenticated: '%s' "
-                                                          MAC_FMT
+                                                          "%s"
                                                           ": (0x%04X) - %s \n",
                                                           escape_essid(priv->
                                                                        essid,
                                                                        priv->
                                                                        essid_len),
-                                                          MAC_ARG(priv->bssid),
+                                                          print_mac(mac, priv->bssid),
                                                           ntohs(auth->status),
                                                           ipw_get_status_code
                                                           (ntohs
@@ -4467,11 +4470,11 @@ static void ipw_rx_notification(struct ipw_priv *priv,
 
                                         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                   IPW_DL_ASSOC,
-                                                  "authenticated: '%s' " MAC_FMT
+                                                  "authenticated: '%s' %s"
                                                   "\n",
                                                   escape_essid(priv->essid,
                                                                priv->essid_len),
-                                                  MAC_ARG(priv->bssid));
+                                                  print_mac(mac, priv->bssid));
                                         break;
                                 }
 
@@ -4496,11 +4499,11 @@ static void ipw_rx_notification(struct ipw_priv *priv,
 
                                         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                   IPW_DL_ASSOC,
-                                                  "disassociated: '%s' " MAC_FMT
+                                                  "disassociated: '%s' %s"
                                                   " \n",
                                                   escape_essid(priv->essid,
                                                                priv->essid_len),
-                                                  MAC_ARG(priv->bssid));
+                                                  print_mac(mac, priv->bssid));
 
                                         priv->status &=
                                             ~(STATUS_DISASSOCIATING |
@@ -4535,10 +4538,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                         switch (auth->state) {
                         case CMAS_AUTHENTICATED:
                                 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE,
-                                          "authenticated: '%s' " MAC_FMT " \n",
+                                          "authenticated: '%s' %s \n",
                                           escape_essid(priv->essid,
                                                        priv->essid_len),
-                                          MAC_ARG(priv->bssid));
+                                          print_mac(mac, priv->bssid));
                                 priv->status |= STATUS_AUTH;
                                 break;
 
@@ -4554,10 +4557,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                 }
                                 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                           IPW_DL_ASSOC,
-                                          "deauthenticated: '%s' " MAC_FMT "\n",
+                                          "deauthenticated: '%s' %s\n",
                                           escape_essid(priv->essid,
                                                        priv->essid_len),
-                                          MAC_ARG(priv->bssid));
+                                          print_mac(mac, priv->bssid));
 
                                 priv->status &= ~(STATUS_ASSOCIATING |
                                                   STATUS_AUTH |
@@ -5383,25 +5386,27 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
                                   int roaming)
 {
         struct ipw_supported_rates rates;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
 
         /* Verify that this network's capability is compatible with the
          * current mode (AdHoc or Infrastructure) */
         if ((priv->ieee->iw_mode == IW_MODE_ADHOC &&
              !(network->capability & WLAN_CAPABILITY_IBSS))) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded due to "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded due to "
                                 "capability mismatch.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
         /* If we do not have an ESSID for this AP, we can not associate with
          * it */
         if (network->flags & NETWORK_EMPTY_ESSID) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                 "because of hidden ESSID.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
@@ -5411,11 +5416,11 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
                 if ((network->ssid_len != match->network->ssid_len) ||
                     memcmp(network->ssid, match->network->ssid,
                            network->ssid_len)) {
-                        IPW_DEBUG_MERGE("Netowrk '%s (" MAC_FMT ")' excluded "
+                        IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                         "because of non-network ESSID.\n",
                                         escape_essid(network->ssid,
                                                      network->ssid_len),
-                                        MAC_ARG(network->bssid));
+                                        print_mac(mac, network->bssid));
                         return 0;
                 }
         } else {
@@ -5430,9 +5435,9 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
                         strncpy(escaped,
                                 escape_essid(network->ssid, network->ssid_len),
                                 sizeof(escaped));
-                        IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                        IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                         "because of ESSID mismatch: '%s'.\n",
-                                        escaped, MAC_ARG(network->bssid),
+                                        escaped, print_mac(mac, network->bssid),
                                         escape_essid(priv->essid,
                                                      priv->essid_len));
                         return 0;
@@ -5459,10 +5464,10 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
         /* Now go through and see if the requested network is valid... */
         if (priv->ieee->scan_age != 0 &&
             time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                 "because of age: %ums.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                 jiffies_to_msecs(jiffies -
                                                  network->last_scanned));
                 return 0;
@@ -5470,10 +5475,10 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
 
         if ((priv->config & CFG_STATIC_CHANNEL) &&
             (network->channel != priv->channel)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                 "because of channel mismatch: %d != %d.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                 network->channel, priv->channel);
                 return 0;
         }
@@ -5481,10 +5486,10 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
         /* Verify privacy compatability */
         if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
             ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                 "because of privacy mismatch: %s != %s.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                 priv->
                                 capability & CAP_PRIVACY_ON ? "on" : "off",
                                 network->
@@ -5494,40 +5499,41 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
         }
 
         if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
-                                "because of the same BSSID match: " MAC_FMT
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
+                                "because of the same BSSID match: %s"
                                 ".\n", escape_essid(network->ssid,
                                                     network->ssid_len),
-                                MAC_ARG(network->bssid), MAC_ARG(priv->bssid));
+                                print_mac(mac, network->bssid),
+                                print_mac(mac2, priv->bssid));
                 return 0;
         }
 
         /* Filter out any incompatible freq / mode combinations */
         if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                 "because of invalid frequency/mode "
                                 "combination.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
         /* Ensure that the rates supported by the driver are compatible with
          * this AP, including verification of basic rates (mandatory) */
         if (!ipw_compatible_rates(priv, network, &rates)) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                 "because configured rate mask excludes "
                                 "AP mandatory rate.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
         if (rates.num_rates == 0) {
-                IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
                                 "because of no compatible rates.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
@@ -5538,9 +5544,9 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
         /* Set up 'new' AP to this network */
         ipw_copy_rates(&match->rates, &rates);
         match->network = network;
-        IPW_DEBUG_MERGE("Network '%s (" MAC_FMT ")' is a viable match.\n",
+        IPW_DEBUG_MERGE("Network '%s (%s)' is a viable match.\n",
                         escape_essid(network->ssid, network->ssid_len),
-                        MAC_ARG(network->bssid));
+                        print_mac(mac, network->bssid));
 
         return 1;
 }
@@ -5594,6 +5600,7 @@ static int ipw_best_network(struct ipw_priv *priv,
                             struct ieee80211_network *network, int roaming)
 {
         struct ipw_supported_rates rates;
+        DECLARE_MAC_BUF(mac);
 
         /* Verify that this network's capability is compatible with the
          * current mode (AdHoc or Infrastructure) */
@@ -5601,20 +5608,20 @@ static int ipw_best_network(struct ipw_priv *priv,
              !(network->capability & WLAN_CAPABILITY_ESS)) ||
             (priv->ieee->iw_mode == IW_MODE_ADHOC &&
              !(network->capability & WLAN_CAPABILITY_IBSS))) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded due to "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded due to "
                                 "capability mismatch.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
         /* If we do not have an ESSID for this AP, we can not associate with
          * it */
         if (network->flags & NETWORK_EMPTY_ESSID) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because of hidden ESSID.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
@@ -5624,11 +5631,11 @@ static int ipw_best_network(struct ipw_priv *priv,
                 if ((network->ssid_len != match->network->ssid_len) ||
                     memcmp(network->ssid, match->network->ssid,
                            network->ssid_len)) {
-                        IPW_DEBUG_ASSOC("Netowrk '%s (" MAC_FMT ")' excluded "
+                        IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                         "because of non-network ESSID.\n",
                                         escape_essid(network->ssid,
                                                      network->ssid_len),
-                                        MAC_ARG(network->bssid));
+                                        print_mac(mac, network->bssid));
                         return 0;
                 }
         } else {
@@ -5642,9 +5649,9 @@ static int ipw_best_network(struct ipw_priv *priv,
                         strncpy(escaped,
                                 escape_essid(network->ssid, network->ssid_len),
                                 sizeof(escaped));
-                        IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                        IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                         "because of ESSID mismatch: '%s'.\n",
-                                        escaped, MAC_ARG(network->bssid),
+                                        escaped, print_mac(mac, network->bssid),
                                         escape_essid(priv->essid,
                                                      priv->essid_len));
                         return 0;
@@ -5658,12 +5665,12 @@ static int ipw_best_network(struct ipw_priv *priv,
                 strncpy(escaped,
                         escape_essid(network->ssid, network->ssid_len),
                         sizeof(escaped));
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded because "
-                                "'%s (" MAC_FMT ")' has a stronger signal.\n",
-                                escaped, MAC_ARG(network->bssid),
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded because "
+                                "'%s (%s)' has a stronger signal.\n",
+                                escaped, print_mac(mac, network->bssid),
                                 escape_essid(match->network->ssid,
                                              match->network->ssid_len),
-                                MAC_ARG(match->network->bssid));
+                                print_mac(mac, match->network->bssid));
                 return 0;
         }
 
@@ -5671,11 +5678,11 @@ static int ipw_best_network(struct ipw_priv *priv,
          * last 3 seconds, do not try and associate again... */
         if (network->last_associate &&
             time_after(network->last_associate + (HZ * 3UL), jiffies)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because of storming (%ums since last "
                                 "assoc attempt).\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                 jiffies_to_msecs(jiffies -
                                                  network->last_associate));
                 return 0;
@@ -5684,10 +5691,10 @@ static int ipw_best_network(struct ipw_priv *priv,
         /* Now go through and see if the requested network is valid... */
         if (priv->ieee->scan_age != 0 &&
             time_after(jiffies, network->last_scanned + priv->ieee->scan_age)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because of age: %ums.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                 jiffies_to_msecs(jiffies -
                                                  network->last_scanned));
                 return 0;
@@ -5695,10 +5702,10 @@ static int ipw_best_network(struct ipw_priv *priv,
 
         if ((priv->config & CFG_STATIC_CHANNEL) &&
             (network->channel != priv->channel)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because of channel mismatch: %d != %d.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                 network->channel, priv->channel);
                 return 0;
         }
@@ -5706,10 +5713,10 @@ static int ipw_best_network(struct ipw_priv *priv,
         /* Verify privacy compatability */
         if (((priv->capability & CAP_PRIVACY_ON) ? 1 : 0) !=
             ((network->capability & WLAN_CAPABILITY_PRIVACY) ? 1 : 0)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because of privacy mismatch: %s != %s.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid),
+                                print_mac(mac, network->bssid),
                                 priv->capability & CAP_PRIVACY_ON ? "on" :
                                 "off",
                                 network->capability &
@@ -5719,48 +5726,48 @@ static int ipw_best_network(struct ipw_priv *priv,
 
         if ((priv->config & CFG_STATIC_BSSID) &&
             memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
-                                "because of BSSID mismatch: " MAC_FMT ".\n",
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
+                                "because of BSSID mismatch: %s.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid), MAC_ARG(priv->bssid));
+                                print_mac(mac, network->bssid), print_mac(mac, priv->bssid));
                 return 0;
         }
 
         /* Filter out any incompatible freq / mode combinations */
         if (!ieee80211_is_valid_mode(priv->ieee, network->mode)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because of invalid frequency/mode "
                                 "combination.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
         /* Filter out invalid channel in current GEO */
         if (!ieee80211_is_valid_channel(priv->ieee, network->channel)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because of invalid channel in current GEO\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
         /* Ensure that the rates supported by the driver are compatible with
          * this AP, including verification of basic rates (mandatory) */
         if (!ipw_compatible_rates(priv, network, &rates)) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because configured rate mask excludes "
                                 "AP mandatory rate.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
         if (rates.num_rates == 0) {
-                IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
                                 "because of no compatible rates.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                MAC_ARG(network->bssid));
+                                print_mac(mac, network->bssid));
                 return 0;
         }
 
@@ -5772,9 +5779,9 @@ static int ipw_best_network(struct ipw_priv *priv,
         ipw_copy_rates(&match->rates, &rates);
         match->network = network;
 
-        IPW_DEBUG_ASSOC("Network '%s (" MAC_FMT ")' is a viable match.\n",
+        IPW_DEBUG_ASSOC("Network '%s (%s)' is a viable match.\n",
                         escape_essid(network->ssid, network->ssid_len),
-                        MAC_ARG(network->bssid));
+                        print_mac(mac, network->bssid));
 
         return 1;
 }
@@ -6016,6 +6023,7 @@ static void ipw_bg_adhoc_check(struct work_struct *work)
 
 static void ipw_debug_config(struct ipw_priv *priv)
 {
+        DECLARE_MAC_BUF(mac);
         IPW_DEBUG_INFO("Scan completed, no valid APs matched "
                        "[CFG 0x%08X]\n", priv->config);
         if (priv->config & CFG_STATIC_CHANNEL)
@@ -6028,8 +6036,8 @@ static void ipw_debug_config(struct ipw_priv *priv)
         else
                 IPW_DEBUG_INFO("ESSID unlocked.\n");
         if (priv->config & CFG_STATIC_BSSID)
-                IPW_DEBUG_INFO("BSSID locked to " MAC_FMT "\n",
-                               MAC_ARG(priv->bssid));
+                IPW_DEBUG_INFO("BSSID locked to %s\n",
+                               print_mac(mac, priv->bssid));
         else
                 IPW_DEBUG_INFO("BSSID unlocked.\n");
         if (priv->capability & CAP_PRIVACY_ON)
@@ -7221,6 +7229,7 @@ static int ipw_associate_network(struct ipw_priv *priv,
                                  struct ipw_supported_rates *rates, int roaming)
 {
         int err;
+        DECLARE_MAC_BUF(mac);
 
         if (priv->config & CFG_FIXED_RATE)
                 ipw_set_fixed_rate(priv, network->mode);
@@ -7388,9 +7397,9 @@ static int ipw_associate_network(struct ipw_priv *priv,
                 return err;
         }
 
-        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' " MAC_FMT " \n",
+        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %s \n",
                   escape_essid(priv->essid, priv->essid_len),
-                  MAC_ARG(priv->bssid));
+                  print_mac(mac, priv->bssid));
 
         return 0;
 }
@@ -8202,6 +8211,9 @@ static void ipw_rx(struct ipw_priv *priv)
         struct ieee80211_hdr_4addr *header;
         u32 r, w, i;
         u8 network_packet;
+        DECLARE_MAC_BUF(mac);
+        DECLARE_MAC_BUF(mac2);
+        DECLARE_MAC_BUF(mac3);
 
         r = ipw_read32(priv, IPW_RX_READ_INDEX);
         w = ipw_read32(priv, IPW_RX_WRITE_INDEX);
@@ -8328,14 +8340,17 @@ static void ipw_rx(struct ipw_priv *priv)
                                                                          header)))
                                         {
                                                 IPW_DEBUG_DROP("Dropping: "
-                                                               MAC_FMT ", "
-                                                               MAC_FMT ", "
-                                                               MAC_FMT "\n",
-                                                               MAC_ARG(header->
+                                                               "%s, "
+                                                               "%s, "
+                                                               "%s\n",
+                                                               print_mac(mac,
+                                                                         header->
                                                                        addr1),
-                                                               MAC_ARG(header->
+                                                               print_mac(mac2,
+                                                                         header->
                                                                        addr2),
-                                                               MAC_ARG(header->
+                                                               print_mac(mac3,
+                                                                         header->
                                                                        addr3));
                                                 break;
                                         }
@@ -8867,6 +8882,7 @@ static int ipw_wx_set_wap(struct net_device *dev,
                           union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
+        DECLARE_MAC_BUF(mac);
 
         static const unsigned char any[] = {
                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
@@ -8897,8 +8913,8 @@ static int ipw_wx_set_wap(struct net_device *dev,
                 return 0;
         }
 
-        IPW_DEBUG_WX("Setting mandatory BSSID to " MAC_FMT "\n",
-                     MAC_ARG(wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("Setting mandatory BSSID to %s\n",
+                     print_mac(mac, wrqu->ap_addr.sa_data));
 
         memcpy(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
 
@@ -8916,6 +8932,8 @@ static int ipw_wx_get_wap(struct net_device *dev,
                           union iwreq_data *wrqu, char *extra)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
+        DECLARE_MAC_BUF(mac);
+
         /* If we are associated, trying to associate, or have a statically
          * configured BSSID then return that; otherwise return ANY */
         mutex_lock(&priv->mutex);
@@ -8926,8 +8944,8 @@ static int ipw_wx_get_wap(struct net_device *dev,
         } else
                 memset(wrqu->ap_addr.sa_data, 0, ETH_ALEN);
 
-        IPW_DEBUG_WX("Getting WAP BSSID: " MAC_FMT "\n",
-                     MAC_ARG(wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("Getting WAP BSSID: %s\n",
+                     print_mac(mac, wrqu->ap_addr.sa_data));
         mutex_unlock(&priv->mutex);
         return 0;
 }
@@ -10133,6 +10151,7 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
         u8 id, hdr_len, unicast;
         u16 remaining_bytes;
         int fc;
+        DECLARE_MAC_BUF(mac);
 
         hdr_len = ieee80211_get_hdrlen(le16_to_cpu(hdr->frame_ctl));
         switch (priv->ieee->iw_mode) {
@@ -10143,8 +10162,8 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct ieee80211_txb *txb,
                         id = ipw_add_station(priv, hdr->addr1);
                         if (id == IPW_INVALID_STATION) {
                                 IPW_WARNING("Attempt to send data to "
-                                            "invalid cell: " MAC_FMT "\n",
-                                            MAC_ARG(hdr->addr1));
+                                            "invalid cell: %s\n",
+                                            print_mac(mac, hdr->addr1));
                                 goto drop;
                         }
                 }
@@ -10460,13 +10479,15 @@ static int ipw_net_set_mac_address(struct net_device *dev, void *p)
 {
         struct ipw_priv *priv = ieee80211_priv(dev);
         struct sockaddr *addr = p;
+        DECLARE_MAC_BUF(mac);
+
         if (!is_valid_ether_addr(addr->sa_data))
                 return -EADDRNOTAVAIL;
         mutex_lock(&priv->mutex);
         priv->config |= CFG_CUSTOM_MAC;
         memcpy(priv->mac_addr, addr->sa_data, ETH_ALEN);
-        printk(KERN_INFO "%s: Setting MAC to " MAC_FMT "\n",
-               priv->net_dev->name, MAC_ARG(priv->mac_addr));
+        printk(KERN_INFO "%s: Setting MAC to %s\n",
+               priv->net_dev->name, print_mac(mac, priv->mac_addr));
         queue_work(priv->workqueue, &priv->adapter_restart);
         mutex_unlock(&priv->mutex);
         return 0;