1 files changed, 24 insertions, 24 deletions

diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index b3c07b93afce..2d46a16c0945 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1922,6 +1922,7 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
         u32 chan;
         char *txratename;
         u8 bssid[ETH_ALEN];
+        DECLARE_MAC_BUF(mac);
 
         /*
          * TBD: BSSID is usually 00:00:00:00:00:00 here and not
@@ -1983,9 +1984,9 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
         }
 
         IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID="
-                       MAC_FMT ")\n",
+                       "%s)\n",
                        priv->net_dev->name, escape_essid(essid, essid_len),
-                       txratename, chan, MAC_ARG(bssid));
+                       txratename, chan, print_mac(mac, bssid));
 
         /* now we copy read ssid into dev */
         if (!(priv->config & CFG_STATIC_ESSID)) {
@@ -2053,10 +2054,12 @@ static int ipw2100_set_essid(struct ipw2100_priv *priv, char *essid,
 
 static void isr_indicate_association_lost(struct ipw2100_priv *priv, u32 status)
 {
+        DECLARE_MAC_BUF(mac);
+
         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE | IPW_DL_ASSOC,
-                  "disassociated: '%s' " MAC_FMT " \n",
+                  "disassociated: '%s' %s \n",
                   escape_essid(priv->essid, priv->essid_len),
-                  MAC_ARG(priv->bssid));
+                  print_mac(mac, priv->bssid));
 
         priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
 
@@ -4049,6 +4052,7 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
         char *out = buf;
         int length;
         int ret;
+        DECLARE_MAC_BUF(mac);
 
         if (priv->status & STATUS_RF_KILL_MASK)
                 return 0;
@@ -4076,9 +4080,7 @@ static ssize_t show_bssinfo(struct device *d, struct device_attribute *attr,
                                __LINE__);
 
         out += sprintf(out, "ESSID: %s\n", essid);
-        out += sprintf(out, "BSSID:   %02x:%02x:%02x:%02x:%02x:%02x\n",
-                       bssid[0], bssid[1], bssid[2],
-                       bssid[3], bssid[4], bssid[5]);
+        out += sprintf(out, "BSSID:   %s\n", print_mac(mac, bssid));
         out += sprintf(out, "Channel: %d\n", chan);
 
         return out - buf;
@@ -4652,19 +4654,20 @@ static void ipw2100_rx_free(struct ipw2100_priv *priv)
 static int ipw2100_read_mac_address(struct ipw2100_priv *priv)
 {
         u32 length = ETH_ALEN;
-        u8 mac[ETH_ALEN];
+        u8 addr[ETH_ALEN];
+        DECLARE_MAC_BUF(mac);
 
         int err;
 
-        err = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ADAPTER_MAC, mac, &length);
+        err = ipw2100_get_ordinal(priv, IPW_ORD_STAT_ADAPTER_MAC, addr, &length);
         if (err) {
                 IPW_DEBUG_INFO("MAC address read failed\n");
                 return -EIO;
         }
-        IPW_DEBUG_INFO("card MAC is %02X:%02X:%02X:%02X:%02X:%02X\n",
-                       mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
 
-        memcpy(priv->net_dev->dev_addr, mac, ETH_ALEN);
+        memcpy(priv->net_dev->dev_addr, addr, ETH_ALEN);
+        IPW_DEBUG_INFO("card MAC is %s\n",
+                       print_mac(mac, priv->net_dev->dev_addr));
 
         return 0;
 }
@@ -5043,10 +5046,10 @@ static int ipw2100_set_mandatory_bssid(struct ipw2100_priv *priv, u8 * bssid,
         int err;
 
 #ifdef CONFIG_IPW2100_DEBUG
+        DECLARE_MAC_BUF(mac);
         if (bssid != NULL)
-                IPW_DEBUG_HC("MANDATORY_BSSID: %02X:%02X:%02X:%02X:%02X:%02X\n",
-                             bssid[0], bssid[1], bssid[2], bssid[3], bssid[4],
-                             bssid[5]);
+                IPW_DEBUG_HC("MANDATORY_BSSID: %s\n",
+                             print_mac(mac, bssid));
         else
                 IPW_DEBUG_HC("MANDATORY_BSSID: <clear>\n");
 #endif
@@ -6892,6 +6895,7 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
         static const unsigned char off[] = {
                 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
         };
+        DECLARE_MAC_BUF(mac);
 
         // sanity checks
         if (wrqu->ap_addr.sa_family != ARPHRD_ETHER)
@@ -6917,13 +6921,8 @@ static int ipw2100_wx_set_wap(struct net_device *dev,
 
         err = ipw2100_set_mandatory_bssid(priv, wrqu->ap_addr.sa_data, 0);
 
-        IPW_DEBUG_WX("SET BSSID -> %02X:%02X:%02X:%02X:%02X:%02X\n",
-                     wrqu->ap_addr.sa_data[0] & 0xff,
-                     wrqu->ap_addr.sa_data[1] & 0xff,
-                     wrqu->ap_addr.sa_data[2] & 0xff,
-                     wrqu->ap_addr.sa_data[3] & 0xff,
-                     wrqu->ap_addr.sa_data[4] & 0xff,
-                     wrqu->ap_addr.sa_data[5] & 0xff);
+        IPW_DEBUG_WX("SET BSSID -> %s\n",
+                     print_mac(mac, wrqu->ap_addr.sa_data));
 
       done:
         mutex_unlock(&priv->action_mutex);
@@ -6939,6 +6938,7 @@ static int ipw2100_wx_get_wap(struct net_device *dev,
          */
 
         struct ipw2100_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 */
@@ -6948,8 +6948,8 @@ static int ipw2100_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));
         return 0;
 }