260 files changed, 1063 insertions, 4279 deletions

diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index 4353414a0b77..acb82aff8808 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -290,9 +290,7 @@ static ssize_t sprintf_ipaddr(char *buf, u8 *ip)
                 /*
                  * IPv6
                  */
-                str += sprintf(str, NIP6_FMT, ntohs(ip[0]), ntohs(ip[1]),
-                               ntohs(ip[2]), ntohs(ip[3]), ntohs(ip[4]),
-                               ntohs(ip[5]), ntohs(ip[6]), ntohs(ip[7]));
+                str += sprintf(str, "%pI6", ip);
         }
         str += sprintf(str, "\n");
         return str - buf;
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c
index 4d1042115598..4f4d1bb9f069 100644
--- a/drivers/infiniband/core/sysfs.c
+++ b/drivers/infiniband/core/sysfs.c
@@ -262,15 +262,7 @@ static ssize_t show_port_gid(struct ib_port *p, struct port_attribute *attr,
         if (ret)
                 return ret;
 
-        return sprintf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-                       be16_to_cpu(((__be16 *) gid.raw)[0]),
-                       be16_to_cpu(((__be16 *) gid.raw)[1]),
-                       be16_to_cpu(((__be16 *) gid.raw)[2]),
-                       be16_to_cpu(((__be16 *) gid.raw)[3]),
-                       be16_to_cpu(((__be16 *) gid.raw)[4]),
-                       be16_to_cpu(((__be16 *) gid.raw)[5]),
-                       be16_to_cpu(((__be16 *) gid.raw)[6]),
-                       be16_to_cpu(((__be16 *) gid.raw)[7]));
+        return sprintf(buf, "%pI6\n", gid.raw);
 }
 
 static ssize_t show_port_pkey(struct ib_port *p, struct port_attribute *attr,
diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
index 3f5f94879208..d4c81053e439 100644
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -87,17 +87,7 @@ static int find_mgm(struct mthca_dev *dev,
         }
 
         if (0)
-                mthca_dbg(dev, "Hash for %04x:%04x:%04x:%04x:"
-                          "%04x:%04x:%04x:%04x is %04x\n",
-                          be16_to_cpu(((__be16 *) gid)[0]),
-                          be16_to_cpu(((__be16 *) gid)[1]),
-                          be16_to_cpu(((__be16 *) gid)[2]),
-                          be16_to_cpu(((__be16 *) gid)[3]),
-                          be16_to_cpu(((__be16 *) gid)[4]),
-                          be16_to_cpu(((__be16 *) gid)[5]),
-                          be16_to_cpu(((__be16 *) gid)[6]),
-                          be16_to_cpu(((__be16 *) gid)[7]),
-                          *hash);
+                mthca_dbg(dev, "Hash for %pI6 is %04x\n", gid, *hash);
 
         *index = *hash;
         *prev  = -1;
@@ -264,16 +254,7 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
                 goto out;
 
         if (index == -1) {
-                mthca_err(dev, "MGID %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
-                          "not found\n",
-                          be16_to_cpu(((__be16 *) gid->raw)[0]),
-                          be16_to_cpu(((__be16 *) gid->raw)[1]),
-                          be16_to_cpu(((__be16 *) gid->raw)[2]),
-                          be16_to_cpu(((__be16 *) gid->raw)[3]),
-                          be16_to_cpu(((__be16 *) gid->raw)[4]),
-                          be16_to_cpu(((__be16 *) gid->raw)[5]),
-                          be16_to_cpu(((__be16 *) gid->raw)[6]),
-                          be16_to_cpu(((__be16 *) gid->raw)[7]));
+                mthca_err(dev, "MGID %pI6 not found\n", gid->raw);
                 err = -EINVAL;
                 goto out;
         }
diff --git a/drivers/infiniband/hw/nes/nes.c b/drivers/infiniband/hw/nes/nes.c
index a2b04d62b1a4..fb7d243b1a23 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -138,14 +138,9 @@ static int nes_inetaddr_event(struct notifier_block *notifier,
         struct nes_device *nesdev;
         struct net_device *netdev;
         struct nes_vnic *nesvnic;
-        unsigned int addr;
-        unsigned int mask;
-
-        addr = ntohl(ifa->ifa_address);
-        mask = ntohl(ifa->ifa_mask);
-        nes_debug(NES_DBG_NETDEV, "nes_inetaddr_event: ip address " NIPQUAD_FMT
-                  ", netmask " NIPQUAD_FMT ".\n",
-                  HIPQUAD(addr), HIPQUAD(mask));
+
+        nes_debug(NES_DBG_NETDEV, "nes_inetaddr_event: ip address %pI4, netmask %pI4.\n",
+                  &ifa->ifa_address, &ifa->ifa_mask);
         list_for_each_entry(nesdev, &nes_dev_list, list) {
                 nes_debug(NES_DBG_NETDEV, "Nesdev list entry = 0x%p. (%s)\n",
                                 nesdev, nesdev->netdev[0]->name);
@@ -356,10 +351,8 @@ struct ib_qp *nes_get_qp(struct ib_device *device, int qpn)
  */
 static void nes_print_macaddr(struct net_device *netdev)
 {
-        DECLARE_MAC_BUF(mac);
-
-        nes_debug(NES_DBG_INIT, "%s: %s, IRQ %u\n",
-                  netdev->name, print_mac(mac, netdev->dev_addr), netdev->irq);
+        nes_debug(NES_DBG_INIT, "%s: %pM, IRQ %u\n",
+                  netdev->name, netdev->dev_addr, netdev->irq);
 }
 
 /**
diff --git a/drivers/infiniband/hw/nes/nes_cm.c b/drivers/infiniband/hw/nes/nes_cm.c
index 2caf9da81ad5..6058d05e975d 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -1027,7 +1027,6 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip)
         struct flowi fl;
         struct neighbour *neigh;
         int rc = -1;
-        DECLARE_MAC_BUF(mac);
 
         memset(&fl, 0, sizeof fl);
         fl.nl_u.ip4_u.daddr = htonl(dst_ip);
@@ -1041,8 +1040,8 @@ static int nes_addr_resolve_neigh(struct nes_vnic *nesvnic, u32 dst_ip)
         if (neigh) {
                 if (neigh->nud_state & NUD_VALID) {
                         nes_debug(NES_DBG_CM, "Neighbor MAC address for 0x%08X"
-                                  " is %s, Gateway is 0x%08X \n", dst_ip,
-                                  print_mac(mac, neigh->ha), ntohl(rt->rt_gateway));
+                                  " is %pM, Gateway is 0x%08X \n", dst_ip,
+                                  neigh->ha, ntohl(rt->rt_gateway));
                         nes_manage_arp_cache(nesvnic->netdev, neigh->ha,
                                              dst_ip, NES_ARP_ADD);
                         rc = nes_arp_table(nesvnic->nesdev, dst_ip, NULL,
@@ -1071,7 +1070,6 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
         int arpindex = 0;
         struct nes_device *nesdev;
         struct nes_adapter *nesadapter;
-        DECLARE_MAC_BUF(mac);
 
         /* create an hte and cm_node for this instance */
         cm_node = kzalloc(sizeof(*cm_node), GFP_ATOMIC);
@@ -1137,8 +1135,8 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
 
         /* copy the mac addr to node context */
         memcpy(cm_node->rem_mac, nesadapter->arp_table[arpindex].mac_addr, ETH_ALEN);
-        nes_debug(NES_DBG_CM, "Remote mac addr from arp table: %s\n",
-                  print_mac(mac, cm_node->rem_mac));
+        nes_debug(NES_DBG_CM, "Remote mac addr from arp table: %pM\n",
+                  cm_node->rem_mac);
 
         add_hte_node(cm_core, cm_node);
         atomic_inc(&cm_nodes_created);
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 730358637bb6..3c96203e0d91 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -797,14 +797,13 @@ static int nes_netdev_set_mac_address(struct net_device *netdev, void *p)
         int i;
         u32 macaddr_low;
         u16 macaddr_high;
-        DECLARE_MAC_BUF(mac);
 
         if (!is_valid_ether_addr(mac_addr->sa_data))
                 return -EADDRNOTAVAIL;
 
         memcpy(netdev->dev_addr, mac_addr->sa_data, netdev->addr_len);
-        printk(PFX "%s: Address length = %d, Address = %s\n",
-               __func__, netdev->addr_len, print_mac(mac, mac_addr->sa_data));
+        printk(PFX "%s: Address length = %d, Address = %pM\n",
+               __func__, netdev->addr_len, mac_addr->sa_data);
         macaddr_high  = ((u16)netdev->dev_addr[0]) << 8;
         macaddr_high += (u16)netdev->dev_addr[1];
         macaddr_low   = ((u32)netdev->dev_addr[2]) << 24;
@@ -909,9 +908,8 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev)
                         if (mc_index >= max_pft_entries_avaiable)
                                 break;
                         if (multicast_addr) {
-                                DECLARE_MAC_BUF(mac);
-                                nes_debug(NES_DBG_NIC_RX, "Assigning MC Address %s to register 0x%04X nic_idx=%d\n",
-                                          print_mac(mac, multicast_addr->dmi_addr),
+                                nes_debug(NES_DBG_NIC_RX, "Assigning MC Address %pM to register 0x%04X nic_idx=%d\n",
+                                          multicast_addr->dmi_addr,
                                           perfect_filter_register_address+(mc_index * 8),
                                           mc_nic_index);
                                 macaddr_high  = ((u16)multicast_addr->dmi_addr[0]) << 8;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index e0c7dfabf2b4..753a983a5fdc 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -732,29 +732,6 @@ extern int ipoib_debug_level;
         do { (void) (priv); } while (0)
 #endif /* CONFIG_INFINIBAND_IPOIB_DEBUG_DATA */
 
-
-#define IPOIB_GID_FMT           "%2.2x%2.2x:%2.2x%2.2x:%2.2x%2.2x:%2.2x%2.2x:" \
-                                "%2.2x%2.2x:%2.2x%2.2x:%2.2x%2.2x:%2.2x%2.2x"
-
-#define IPOIB_GID_RAW_ARG(gid)  ((u8 *)(gid))[0], \
-                                ((u8 *)(gid))[1], \
-                                ((u8 *)(gid))[2], \
-                                ((u8 *)(gid))[3], \
-                                ((u8 *)(gid))[4], \
-                                ((u8 *)(gid))[5], \
-                                ((u8 *)(gid))[6], \
-                                ((u8 *)(gid))[7], \
-                                ((u8 *)(gid))[8], \
-                                ((u8 *)(gid))[9], \
-                                ((u8 *)(gid))[10],\
-                                ((u8 *)(gid))[11],\
-                                ((u8 *)(gid))[12],\
-                                ((u8 *)(gid))[13],\
-                                ((u8 *)(gid))[14],\
-                                ((u8 *)(gid))[15]
-
-#define IPOIB_GID_ARG(gid)      IPOIB_GID_RAW_ARG((gid).raw)
-
 #define IPOIB_QPN(ha) (be32_to_cpup((__be32 *) ha) & 0xffffff)
 
 #endif /* _IPOIB_H */
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_cm.c b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
index 7b14c2c39500..47d588ba2a7f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_cm.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_cm.c
@@ -1128,8 +1128,8 @@ static int ipoib_cm_tx_init(struct ipoib_cm_tx *p, u32 qpn,
                 goto err_send_cm;
         }
 
-        ipoib_dbg(priv, "Request connection 0x%x for gid " IPOIB_GID_FMT " qpn 0x%x\n",
-                  p->qp->qp_num, IPOIB_GID_ARG(pathrec->dgid), qpn);
+        ipoib_dbg(priv, "Request connection 0x%x for gid %pI6 qpn 0x%x\n",
+                  p->qp->qp_num, pathrec->dgid.raw, qpn);
 
         return 0;
 
@@ -1276,8 +1276,8 @@ void ipoib_cm_destroy_tx(struct ipoib_cm_tx *tx)
         if (test_and_clear_bit(IPOIB_FLAG_INITIALIZED, &tx->flags)) {
                 list_move(&tx->list, &priv->cm.reap_list);
                 queue_work(ipoib_workqueue, &priv->cm.reap_task);
-                ipoib_dbg(priv, "Reap connection for gid " IPOIB_GID_FMT "\n",
-                          IPOIB_GID_ARG(tx->neigh->dgid));
+                ipoib_dbg(priv, "Reap connection for gid %pI6\n",
+                          tx->neigh->dgid.raw);
                 tx->neigh = NULL;
         }
 }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index fddded7900d1..b3a671895bdc 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -359,9 +359,9 @@ void ipoib_mark_paths_invalid(struct net_device *dev)
         spin_lock_irq(&priv->lock);
 
         list_for_each_entry_safe(path, tp, &priv->path_list, list) {
-                ipoib_dbg(priv, "mark path LID 0x%04x GID " IPOIB_GID_FMT " invalid\n",
+                ipoib_dbg(priv, "mark path LID 0x%04x GID %pI6 invalid\n",
                         be16_to_cpu(path->pathrec.dlid),
-                        IPOIB_GID_ARG(path->pathrec.dgid));
+                        path->pathrec.dgid.raw);
                 path->valid =  0;
         }
 
@@ -413,11 +413,11 @@ static void path_rec_completion(int status,
         unsigned long flags;
 
         if (!status)
-                ipoib_dbg(priv, "PathRec LID 0x%04x for GID " IPOIB_GID_FMT "\n",
-                          be16_to_cpu(pathrec->dlid), IPOIB_GID_ARG(pathrec->dgid));
+                ipoib_dbg(priv, "PathRec LID 0x%04x for GID %pI6\n",
+                          be16_to_cpu(pathrec->dlid), pathrec->dgid.raw);
         else
-                ipoib_dbg(priv, "PathRec status %d for GID " IPOIB_GID_FMT "\n",
-                          status, IPOIB_GID_ARG(path->pathrec.dgid));
+                ipoib_dbg(priv, "PathRec status %d for GID %pI6\n",
+                          status, path->pathrec.dgid.raw);
 
         skb_queue_head_init(&skqueue);
 
@@ -527,8 +527,8 @@ static int path_rec_start(struct net_device *dev,
 {
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-        ipoib_dbg(priv, "Start path record lookup for " IPOIB_GID_FMT "\n",
-                  IPOIB_GID_ARG(path->pathrec.dgid));
+        ipoib_dbg(priv, "Start path record lookup for %pI6\n",
+                  path->pathrec.dgid.raw);
 
         init_completion(&path->done);
 
@@ -764,12 +764,11 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
                         if ((be16_to_cpup((__be16 *) skb->data) != ETH_P_ARP) &&
                             (be16_to_cpup((__be16 *) skb->data) != ETH_P_RARP)) {
-                                ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x "
-                                           IPOIB_GID_FMT "\n",
+                                ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x %pI6\n",
                                            skb->dst ? "neigh" : "dst",
                                            be16_to_cpup((__be16 *) skb->data),
                                            IPOIB_QPN(phdr->hwaddr),
-                                           IPOIB_GID_RAW_ARG(phdr->hwaddr + 4));
+                                           phdr->hwaddr + 4);
                                 dev_kfree_skb_any(skb);
                                 ++dev->stats.tx_dropped;
                                 return NETDEV_TX_OK;
@@ -845,9 +844,9 @@ static void ipoib_neigh_cleanup(struct neighbour *n)
         else
                 return;
         ipoib_dbg(priv,
-                  "neigh_cleanup for %06x " IPOIB_GID_FMT "\n",
+                  "neigh_cleanup for %06x %pI6\n",
                   IPOIB_QPN(n->ha),
-                  IPOIB_GID_RAW_ARG(n->ha + 4));
+                  n->ha + 4);
 
         spin_lock_irqsave(&priv->lock, flags);
 
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index d9d1223c3fd5..a2eb3b9789eb 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -71,9 +71,8 @@ static void ipoib_mcast_free(struct ipoib_mcast *mcast)
         struct ipoib_neigh *neigh, *tmp;
         int tx_dropped = 0;
 
-        ipoib_dbg_mcast(netdev_priv(dev),
-                        "deleting multicast group " IPOIB_GID_FMT "\n",
-                        IPOIB_GID_ARG(mcast->mcmember.mgid));
+        ipoib_dbg_mcast(netdev_priv(dev), "deleting multicast group %pI6\n",
+                        mcast->mcmember.mgid.raw);
 
         spin_lock_irq(&priv->lock);
 
@@ -205,9 +204,8 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
 
         if (!test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
                 if (test_and_set_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags)) {
-                        ipoib_warn(priv, "multicast group " IPOIB_GID_FMT
-                                   " already attached\n",
-                                   IPOIB_GID_ARG(mcast->mcmember.mgid));
+                        ipoib_warn(priv, "multicast group %pI6 already attached\n",
+                                   mcast->mcmember.mgid.raw);
 
                         return 0;
                 }
@@ -215,9 +213,8 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
                 ret = ipoib_mcast_attach(dev, be16_to_cpu(mcast->mcmember.mlid),
                                          &mcast->mcmember.mgid, set_qkey);
                 if (ret < 0) {
-                        ipoib_warn(priv, "couldn't attach QP to multicast group "
-                                   IPOIB_GID_FMT "\n",
-                                   IPOIB_GID_ARG(mcast->mcmember.mgid));
+                        ipoib_warn(priv, "couldn't attach QP to multicast group %pI6\n",
+                                   mcast->mcmember.mgid.raw);
 
                         clear_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags);
                         return ret;
@@ -248,9 +245,8 @@ static int ipoib_mcast_join_finish(struct ipoib_mcast *mcast,
                         mcast->ah = ah;
                         spin_unlock_irq(&priv->lock);
 
-                        ipoib_dbg_mcast(priv, "MGID " IPOIB_GID_FMT
-                                        " AV %p, LID 0x%04x, SL %d\n",
-                                        IPOIB_GID_ARG(mcast->mcmember.mgid),
+                        ipoib_dbg_mcast(priv, "MGID %pI6 AV %p, LID 0x%04x, SL %d\n",
+                                        mcast->mcmember.mgid.raw,
                                         mcast->ah->ah,
                                         be16_to_cpu(mcast->mcmember.mlid),
                                         mcast->mcmember.sl);
@@ -295,9 +291,8 @@ ipoib_mcast_sendonly_join_complete(int status,
 
         if (status) {
                 if (mcast->logcount++ < 20)
-                        ipoib_dbg_mcast(netdev_priv(dev), "multicast join failed for "
-                                        IPOIB_GID_FMT ", status %d\n",
-                                        IPOIB_GID_ARG(mcast->mcmember.mgid), status);
+                        ipoib_dbg_mcast(netdev_priv(dev), "multicast join failed for %pI6, status %d\n",
+                                        mcast->mcmember.mgid.raw, status);
 
                 /* Flush out any queued packets */
                 netif_tx_lock_bh(dev);
@@ -356,9 +351,8 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast)
                 ipoib_warn(priv, "ib_sa_join_multicast failed (ret = %d)\n",
                            ret);
         } else {
-                ipoib_dbg_mcast(priv, "no multicast record for " IPOIB_GID_FMT
-                                ", starting join\n",
-                                IPOIB_GID_ARG(mcast->mcmember.mgid));
+                ipoib_dbg_mcast(priv, "no multicast record for %pI6, starting join\n",
+                                mcast->mcmember.mgid.raw);
         }
 
         return ret;
@@ -386,9 +380,8 @@ static int ipoib_mcast_join_complete(int status,
         struct net_device *dev = mcast->dev;
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-        ipoib_dbg_mcast(priv, "join completion for " IPOIB_GID_FMT
-                        " (status %d)\n",
-                        IPOIB_GID_ARG(mcast->mcmember.mgid), status);
+        ipoib_dbg_mcast(priv, "join completion for %pI6 (status %d)\n",
+                        mcast->mcmember.mgid.raw, status);
 
         /* We trap for port events ourselves. */
         if (status == -ENETRESET)
@@ -417,15 +410,11 @@ static int ipoib_mcast_join_complete(int status,
 
         if (mcast->logcount++ < 20) {
                 if (status == -ETIMEDOUT) {
-                        ipoib_dbg_mcast(priv, "multicast join failed for " IPOIB_GID_FMT
-                                        ", status %d\n",
-                                        IPOIB_GID_ARG(mcast->mcmember.mgid),
-                                        status);
+                        ipoib_dbg_mcast(priv, "multicast join failed for %pI6, status %d\n",
+                                        mcast->mcmember.mgid.raw, status);
                 } else {
-                        ipoib_warn(priv, "multicast join failed for "
-                                   IPOIB_GID_FMT ", status %d\n",
-                                   IPOIB_GID_ARG(mcast->mcmember.mgid),
-                                   status);
+                        ipoib_warn(priv, "multicast join failed for %pI6, status %d\n",
+                                   mcast->mcmember.mgid.raw, status);
                 }
         }
 
@@ -457,8 +446,7 @@ static void ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast,
         ib_sa_comp_mask comp_mask;
         int ret = 0;
 
-        ipoib_dbg_mcast(priv, "joining MGID " IPOIB_GID_FMT "\n",
-                        IPOIB_GID_ARG(mcast->mcmember.mgid));
+        ipoib_dbg_mcast(priv, "joining MGID %pI6\n", mcast->mcmember.mgid.raw);
 
         rec.mgid     = mcast->mcmember.mgid;
         rec.port_gid = priv->local_gid;
@@ -643,8 +631,8 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)
                 ib_sa_free_multicast(mcast->mc);
 
         if (test_and_clear_bit(IPOIB_MCAST_FLAG_ATTACHED, &mcast->flags)) {
-                ipoib_dbg_mcast(priv, "leaving MGID " IPOIB_GID_FMT "\n",
-                                IPOIB_GID_ARG(mcast->mcmember.mgid));
+                ipoib_dbg_mcast(priv, "leaving MGID %pI6\n",
+                                mcast->mcmember.mgid.raw);
 
                 /* Remove ourselves from the multicast group */
                 ret = ib_detach_mcast(priv->qp, &mcast->mcmember.mgid,
@@ -675,8 +663,8 @@ void ipoib_mcast_send(struct net_device *dev, void *mgid, struct sk_buff *skb)
         mcast = __ipoib_mcast_find(dev, mgid);
         if (!mcast) {
                 /* Let's create a new send only group now */
-                ipoib_dbg_mcast(priv, "setting up send only multicast group for "
-                                IPOIB_GID_FMT "\n", IPOIB_GID_RAW_ARG(mgid));
+                ipoib_dbg_mcast(priv, "setting up send only multicast group for %pI6\n",
+                                mgid);
 
                 mcast = ipoib_mcast_alloc(dev, 0);
                 if (!mcast) {
@@ -809,14 +797,14 @@ void ipoib_mcast_restart_task(struct work_struct *work)
                         /* ignore group which is directly joined by userspace */
                         if (test_bit(IPOIB_FLAG_UMCAST, &priv->flags) &&
                             !ib_sa_get_mcmember_rec(priv->ca, priv->port, &mgid, &rec)) {
-                                ipoib_dbg_mcast(priv, "ignoring multicast entry for mgid "
-                                                IPOIB_GID_FMT "\n", IPOIB_GID_ARG(mgid));
+                                ipoib_dbg_mcast(priv, "ignoring multicast entry for mgid %pI6\n",
+                                                mgid.raw);
                                 continue;
                         }
 
                         /* Not found or send-only group, let's add a new entry */
-                        ipoib_dbg_mcast(priv, "adding multicast entry for mgid "
-                                        IPOIB_GID_FMT "\n", IPOIB_GID_ARG(mgid));
+                        ipoib_dbg_mcast(priv, "adding multicast entry for mgid %pI6\n",
+                                        mgid.raw);
 
                         nmcast = ipoib_mcast_alloc(dev, 0);
                         if (!nmcast) {
@@ -849,8 +837,8 @@ void ipoib_mcast_restart_task(struct work_struct *work)
         list_for_each_entry_safe(mcast, tmcast, &priv->multicast_list, list) {
                 if (!test_bit(IPOIB_MCAST_FLAG_FOUND, &mcast->flags) &&
                     !test_bit(IPOIB_MCAST_FLAG_SENDONLY, &mcast->flags)) {
-                        ipoib_dbg_mcast(priv, "deleting multicast group " IPOIB_GID_FMT "\n",
-                                        IPOIB_GID_ARG(mcast->mcmember.mgid));
+                        ipoib_dbg_mcast(priv, "deleting multicast group %pI6\n",
+                                        mcast->mcmember.mgid.raw);
 
                         rb_erase(&mcast->rb_node, &priv->multicast_tree);
 
diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 5b8b533f2908..7c13db885bf6 100644
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -1514,15 +1514,7 @@ static ssize_t show_dgid(struct device *dev, struct device_attribute *attr,
             target->state == SRP_TARGET_REMOVED)
                 return -ENODEV;
 
-        return sprintf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-                       be16_to_cpu(((__be16 *) target->path.dgid.raw)[0]),
-                       be16_to_cpu(((__be16 *) target->path.dgid.raw)[1]),
-                       be16_to_cpu(((__be16 *) target->path.dgid.raw)[2]),
-                       be16_to_cpu(((__be16 *) target->path.dgid.raw)[3]),
-                       be16_to_cpu(((__be16 *) target->path.dgid.raw)[4]),
-                       be16_to_cpu(((__be16 *) target->path.dgid.raw)[5]),
-                       be16_to_cpu(((__be16 *) target->path.dgid.raw)[6]),
-                       be16_to_cpu(((__be16 *) target->path.dgid.raw)[7]));
+        return sprintf(buf, "%pI6\n", target->path.dgid.raw);
 }
 
 static ssize_t show_orig_dgid(struct device *dev,
@@ -1534,15 +1526,7 @@ static ssize_t show_orig_dgid(struct device *dev,
             target->state == SRP_TARGET_REMOVED)
                 return -ENODEV;
 
-        return sprintf(buf, "%04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
-                       be16_to_cpu(target->orig_dgid[0]),
-                       be16_to_cpu(target->orig_dgid[1]),
-                       be16_to_cpu(target->orig_dgid[2]),
-                       be16_to_cpu(target->orig_dgid[3]),
-                       be16_to_cpu(target->orig_dgid[4]),
-                       be16_to_cpu(target->orig_dgid[5]),
-                       be16_to_cpu(target->orig_dgid[6]),
-                       be16_to_cpu(target->orig_dgid[7]));
+        return sprintf(buf, "%pI6\n", target->orig_dgid);
 }
 
 static ssize_t show_zero_req_lim(struct device *dev,
@@ -1883,19 +1867,12 @@ static ssize_t srp_create_target(struct device *dev,
 
         shost_printk(KERN_DEBUG, target->scsi_host, PFX
                      "new target: id_ext %016llx ioc_guid %016llx pkey %04x "
-                     "service_id %016llx dgid %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x\n",
+                     "service_id %016llx dgid %pI6\n",
                (unsigned long long) be64_to_cpu(target->id_ext),
                (unsigned long long) be64_to_cpu(target->ioc_guid),
                be16_to_cpu(target->path.pkey),
                (unsigned long long) be64_to_cpu(target->service_id),
-               (int) be16_to_cpu(*(__be16 *) &target->path.dgid.raw[0]),
-               (int) be16_to_cpu(*(__be16 *) &target->path.dgid.raw[2]),
-               (int) be16_to_cpu(*(__be16 *) &target->path.dgid.raw[4]),
-               (int) be16_to_cpu(*(__be16 *) &target->path.dgid.raw[6]),
-               (int) be16_to_cpu(*(__be16 *) &target->path.dgid.raw[8]),
-               (int) be16_to_cpu(*(__be16 *) &target->path.dgid.raw[10]),
-               (int) be16_to_cpu(*(__be16 *) &target->path.dgid.raw[12]),
-               (int) be16_to_cpu(*(__be16 *) &target->path.dgid.raw[14]));
+               target->path.dgid.raw);
 
         ret = srp_create_target_ib(target);
         if (ret)
diff --git a/drivers/isdn/i4l/isdn_net.c b/drivers/isdn/i4l/isdn_net.c
index bb904a0a98bd..60c82d7b12a8 100644
--- a/drivers/isdn/i4l/isdn_net.c
+++ b/drivers/isdn/i4l/isdn_net.c
@@ -1654,9 +1654,10 @@ isdn_net_ciscohdlck_slarp_in(isdn_net_local *lp, struct sk_buff *skb)
         unsigned char *p;
         int period;
         u32 code;
-        u32 my_seq, addr;
-        u32 your_seq, mask;
-        u32 local;
+        u32 my_seq;
+        u32 your_seq;
+        __be32 local;
+        __be32 *addr, *mask;
         u16 unused;
 
         if (skb->len < 14)
@@ -1671,27 +1672,20 @@ isdn_net_ciscohdlck_slarp_in(isdn_net_local *lp, struct sk_buff *skb)
                 isdn_net_ciscohdlck_slarp_send_reply(lp);
                 break;
         case CISCO_SLARP_REPLY:
-                addr = ntohl(*(u32 *)p);
-                mask = ntohl(*(u32 *)(p+4));
-                if (mask != 0xfffffffc)
+                addr = (__be32 *)p;
+                mask = (__be32 *)(p + 4);
+                if (*mask != cpu_to_be32(0xfffffffc))
                         goto slarp_reply_out;
-                if ((addr & 3) == 0 || (addr & 3) == 3)
+                if ((*addr & cpu_to_be32(3)) == cpu_to_be32(0) ||
+                    (*addr & cpu_to_be32(3)) == cpu_to_be32(3))
                         goto slarp_reply_out;
-                local = addr ^ 3;
-                printk(KERN_INFO "%s: got slarp reply: "
-                        "remote ip: %d.%d.%d.%d, "
-                        "local ip: %d.%d.%d.%d "
-                        "mask: %d.%d.%d.%d\n",
-                       lp->netdev->dev->name,
-                       HIPQUAD(addr),
-                       HIPQUAD(local),
-                       HIPQUAD(mask));
+                local = *addr ^ cpu_to_be32(3);
+                printk(KERN_INFO "%s: got slarp reply: remote ip: %pI4, local ip: %pI4 mask: %pI4\n",
+                       lp->netdev->dev->name, addr, &local, mask);
                 break;
   slarp_reply_out:
-                 printk(KERN_INFO "%s: got invalid slarp "
-                                 "reply (%d.%d.%d.%d/%d.%d.%d.%d) "
-                                 "- ignored\n", lp->netdev->dev->name,
-                                 HIPQUAD(addr), HIPQUAD(mask));
+                printk(KERN_INFO "%s: got invalid slarp reply (%pI4/%pI4) - ignored\n",
+                       lp->netdev->dev->name, addr, mask);
                 break;
         case CISCO_SLARP_KEEPALIVE:
                 period = (int)((jiffies - lp->cisco_last_slarp_in
diff --git a/drivers/media/dvb/b2c2/flexcop.c b/drivers/media/dvb/b2c2/flexcop.c
index 5f79c8dc3836..676413a915b4 100644
--- a/drivers/media/dvb/b2c2/flexcop.c
+++ b/drivers/media/dvb/b2c2/flexcop.c
@@ -270,7 +270,7 @@ int flexcop_device_initialize(struct flexcop_device *fc)
         /* do the MAC address reading after initializing the dvb_adapter */
         if (fc->get_mac_addr(fc, 0) == 0) {
                 u8 *b = fc->dvb_adapter.proposed_mac;
-                info("MAC address = %02x:%02x:%02x:%02x:%02x:%02x", b[0],b[1],b[2],b[3],b[4],b[5]);
+                info("MAC address = %pM", b);
                 flexcop_set_mac_filter(fc,b);
                 flexcop_mac_filter_ctrl(fc,1);
         } else
diff --git a/drivers/media/dvb/bt8xx/dst.c b/drivers/media/dvb/bt8xx/dst.c
index aa3db57d32d9..29e8f1546ab6 100644
--- a/drivers/media/dvb/bt8xx/dst.c
+++ b/drivers/media/dvb/bt8xx/dst.c
@@ -917,9 +917,7 @@ static int dst_get_mac(struct dst_state *state)
         }
         memset(&state->mac_address, '\0', 8);
         memcpy(&state->mac_address, &state->rxbuffer, 6);
-        dprintk(verbose, DST_ERROR, 1, "MAC Address=[%02x:%02x:%02x:%02x:%02x:%02x]",
-                state->mac_address[0], state->mac_address[1], state->mac_address[2],
-                state->mac_address[4], state->mac_address[5], state->mac_address[6]);
+        dprintk(verbose, DST_ERROR, 1, "MAC Address=[%pM]", state->mac_address);
 
         return 0;
 }
diff --git a/drivers/media/dvb/dm1105/dm1105.c b/drivers/media/dvb/dm1105/dm1105.c
index 14e627ef6465..d15984e599bc 100644
--- a/drivers/media/dvb/dm1105/dm1105.c
+++ b/drivers/media/dvb/dm1105/dm1105.c
@@ -697,8 +697,7 @@ static void __devinit dm1105dvb_read_mac(struct dm1105dvb *dm1105dvb, u8 *mac)
         };
 
         dm1105_i2c_xfer(&dm1105dvb->i2c_adap, msg , 2);
-        dev_info(&dm1105dvb->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
-                        mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+        dev_info(&dm1105dvb->pdev->dev, "MAC %pM\n", mac);
 }
 
 static int __devinit dm1105_probe(struct pci_dev *pdev,
diff --git a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
index ce8cd0c5d831..8a7d87bcd1d9 100644
--- a/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
+++ b/drivers/media/dvb/dvb-usb/dvb-usb-dvb.c
@@ -91,10 +91,7 @@ int dvb_usb_adapter_dvb_init(struct dvb_usb_adapter *adap, short *adapter_nums)
 
         if (adap->dev->props.read_mac_address) {
                 if (adap->dev->props.read_mac_address(adap->dev,adap->dvb_adap.proposed_mac) == 0)
-                        info("MAC address: %02x:%02x:%02x:%02x:%02x:%02x",adap->dvb_adap.proposed_mac[0],
-                                        adap->dvb_adap.proposed_mac[1], adap->dvb_adap.proposed_mac[2],
-                                        adap->dvb_adap.proposed_mac[3], adap->dvb_adap.proposed_mac[4],
-                                        adap->dvb_adap.proposed_mac[5]);
+                        info("MAC address: %pM",adap->dvb_adap.proposed_mac);
                 else
                         err("MAC address reading failed.");
         }
diff --git a/drivers/media/dvb/pluto2/pluto2.c b/drivers/media/dvb/pluto2/pluto2.c
index a9653c63f4db..d101b304e9b0 100644
--- a/drivers/media/dvb/pluto2/pluto2.c
+++ b/drivers/media/dvb/pluto2/pluto2.c
@@ -560,8 +560,7 @@ static void __devinit pluto_read_mac(struct pluto *pluto, u8 *mac)
         mac[4] = (val >> 8) & 0xff;
         mac[5] = (val >> 0) & 0xff;
 
-        dev_info(&pluto->pdev->dev, "MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
-                        mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+        dev_info(&pluto->pdev->dev, "MAC %pM\n", mac);
 }
 
 static int __devinit pluto_read_serial(struct pluto *pluto)
diff --git a/drivers/message/fusion/mptlan.c b/drivers/message/fusion/mptlan.c
index a1abf95cf751..582a921c7aab 100644
--- a/drivers/message/fusion/mptlan.c
+++ b/drivers/message/fusion/mptlan.c
@@ -1462,11 +1462,9 @@ mptlan_probe(struct pci_dev *pdev, const struct pci_device_id *id)
                 printk(KERN_INFO MYNAM ": %s: Fusion MPT LAN device "
                        "registered as '%s'\n", ioc->name, dev->name);
                 printk(KERN_INFO MYNAM ": %s/%s: "
-                       "LanAddr = %02X:%02X:%02X:%02X:%02X:%02X\n",
+                       "LanAddr = %pM\n",
                        IOC_AND_NETDEV_NAMES_s_s(dev),
-                       dev->dev_addr[0], dev->dev_addr[1],
-                       dev->dev_addr[2], dev->dev_addr[3],
-                       dev->dev_addr[4], dev->dev_addr[5]);
+                       dev->dev_addr);
         
                 ioc->netdev = dev;
 
@@ -1551,9 +1549,8 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
 
                 printk (KERN_WARNING MYNAM ": %s: WARNING - Broadcast swap F/W bug detected!\n",
                                 NETDEV_PTR_TO_IOC_NAME_s(dev));
-                printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %02x:%02x:%02x:%02x:%02x:%02x\n",
-                                fch->saddr[0], fch->saddr[1], fch->saddr[2],
-                                fch->saddr[3], fch->saddr[4], fch->saddr[5]);
+                printk (KERN_WARNING MYNAM ": Please update sender @ MAC_addr = %pM\n",
+                                fch->saddr);
         }
 
         if (*fch->daddr & 1) {
@@ -1628,10 +1625,9 @@ mpt_lan_type_trans(struct sk_buff *skb, struct net_device *dev)
                                 nh->NAA = source_naa; /* Set the S_NAA value. */
                                 for (i = 0; i < FC_ALEN; i++)
                                         nh->ieee[i] = fch->saddr[i];
-                                dlprintk ((KERN_INFO "Got ARP from %02x:%02x:%02x:%02x:"
-                                          "%02x:%02x with non-compliant S_NAA value.\n",
-                                          fch->saddr[0], fch->saddr[1], fch->saddr[2],
-                                          fch->saddr[3], fch->saddr[4],fch->saddr[5]));
+                                dlprintk ((KERN_INFO "Got ARP from %pM with"
+                                          " non-compliant S_NAA value.\n",
+                                          fch->saddr));
                         } else {
                                 printk (KERN_ERR "mptlan/type_trans: Unable to"
                                         " kmalloc a NAA_Hosed struct.\n");
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index 900b0ffdcc68..95bd95f1f99e 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -177,7 +177,6 @@ el2_probe1(struct net_device *dev, int ioaddr)
     int i, iobase_reg, membase_reg, saved_406, wordlength, retval;
     static unsigned version_printed;
     unsigned long vendor_id;
-    DECLARE_MAC_BUF(mac);
 
     if (!request_region(ioaddr, EL2_IO_EXTENT, DRV_NAME))
         return -EBUSY;
@@ -228,7 +227,7 @@ el2_probe1(struct net_device *dev, int ioaddr)
     /* Retrieve and print the ethernet address. */
     for (i = 0; i < 6; i++)
         dev->dev_addr[i] = inb(ioaddr + i);
-    printk("%s", print_mac(mac, dev->dev_addr));
+    printk("%pM", dev->dev_addr);
 
     /* Map the 8390 back into the window. */
     outb(ECNTRL_THIN, ioaddr + 0x406);
diff --git a/drivers/net/3c505.c b/drivers/net/3c505.c
index a424869707a5..6ecb4188b451 100644
--- a/drivers/net/3c505.c
+++ b/drivers/net/3c505.c
@@ -1385,7 +1385,6 @@ static int __init elplus_setup(struct net_device *dev)
         unsigned long timeout;
         unsigned long cookie = 0;
         int err = -ENODEV;
-        DECLARE_MAC_BUF(mac);
 
         /*
          *  setup adapter structure
@@ -1522,9 +1521,9 @@ static int __init elplus_setup(struct net_device *dev)
          * print remainder of startup message
          */
         printk(KERN_INFO "%s: 3c505 at %#lx, irq %d, dma %d, "
-               "addr %s, ",
+               "addr %pM, ",
                dev->name, dev->base_addr, dev->irq, dev->dma,
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
 
         /*
          * read more information from the adapter
diff --git a/drivers/net/3c507.c b/drivers/net/3c507.c
index 030c147211ba..66fd505788f4 100644
--- a/drivers/net/3c507.c
+++ b/drivers/net/3c507.c
@@ -357,7 +357,6 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
         static unsigned char init_ID_done, version_printed;
         int i, irq, irqval, retval;
         struct net_local *lp;
-        DECLARE_MAC_BUF(mac);
 
         if (init_ID_done == 0) {
                 ushort lrs_state = 0xff;
@@ -405,7 +404,7 @@ static int __init el16_probe1(struct net_device *dev, int ioaddr)
         outb(0x01, ioaddr + MISC_CTRL);
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + i);
-        printk(" %s", print_mac(mac, dev->dev_addr));
+        printk(" %pM", dev->dev_addr);
 
         if (mem_start)
                 net_debug = mem_start & 7;
diff --git a/drivers/net/3c509.c b/drivers/net/3c509.c
index 3a7bc524af33..cc970c49fb34 100644
--- a/drivers/net/3c509.c
+++ b/drivers/net/3c509.c
@@ -541,7 +541,6 @@ static int __init el3_common_init(struct net_device *dev)
 {
         struct el3_private *lp = netdev_priv(dev);
         int err;
-        DECLARE_MAC_BUF(mac);
         const char *if_names[] = {"10baseT", "AUI", "undefined", "BNC"};
 
         spin_lock_init(&lp->lock);
@@ -575,9 +574,9 @@ static int __init el3_common_init(struct net_device *dev)
         }
 
         printk(KERN_INFO "%s: 3c5x9 found at %#3.3lx, %s port, "
-               "address %s, IRQ %d.\n",
+               "address %pM, IRQ %d.\n",
                dev->name, dev->base_addr, if_names[(dev->if_port & 0x03)],
-               print_mac(mac, dev->dev_addr), dev->irq);
+               dev->dev_addr, dev->irq);
 
         if (el3_debug > 0)
                 printk(KERN_INFO "%s", version);
diff --git a/drivers/net/3c515.c b/drivers/net/3c515.c
index a0f8b6e2d0af..a2c24684a44a 100644
--- a/drivers/net/3c515.c
+++ b/drivers/net/3c515.c
@@ -570,7 +570,6 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
         unsigned int eeprom[0x40], checksum = 0;        /* EEPROM contents */
         int i;
         int irq;
-        DECLARE_MAC_BUF(mac);
 
 #ifdef __ISAPNP__
         if (idev) {
@@ -636,7 +635,7 @@ static int corkscrew_setup(struct net_device *dev, int ioaddr,
         checksum = (checksum ^ (checksum >> 8)) & 0xff;
         if (checksum != 0x00)
                 printk(" ***INVALID CHECKSUM %4.4x*** ", checksum);
-        printk(" %s", print_mac(mac, dev->dev_addr));
+        printk(" %pM", dev->dev_addr);
         if (eeprom[16] == 0x11c7) {     /* Corkscrew */
                 if (request_dma(dev->dma, "3c515")) {
                         printk(", DMA %d allocation failed", dev->dma);
diff --git a/drivers/net/3c523.c b/drivers/net/3c523.c
index e2ce41d3828e..23a31232326c 100644
--- a/drivers/net/3c523.c
+++ b/drivers/net/3c523.c
@@ -383,7 +383,6 @@ static int elmc_getinfo(char *buf, int slot, void *d)
 {
         int len = 0;
         struct net_device *dev = d;
-        DECLARE_MAC_BUF(mac);
 
         if (dev == NULL)
                 return len;
@@ -398,8 +397,8 @@ static int elmc_getinfo(char *buf, int slot, void *d)
         len += sprintf(buf + len, "Transceiver: %s\n", dev->if_port ?
                        "External" : "Internal");
         len += sprintf(buf + len, "Device: %s\n", dev->name);
-        len += sprintf(buf + len, "Hardware Address: %s\n",
-                       print_mac(mac, dev->dev_addr));
+        len += sprintf(buf + len, "Hardware Address: %pM\n",
+                       dev->dev_addr);
 
         return len;
 }                               /* elmc_getinfo() */
@@ -417,7 +416,6 @@ static int __init do_elmc_probe(struct net_device *dev)
         unsigned int size = 0;
         int retval;
         struct priv *pr = dev->priv;
-        DECLARE_MAC_BUF(mac);
 
         if (MCA_bus == 0) {
                 return -ENODEV;
@@ -543,8 +541,8 @@ static int __init do_elmc_probe(struct net_device *dev)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(dev->base_addr + i);
 
-        printk(KERN_INFO "%s: hardware address %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: hardware address %pM\n",
+               dev->name, dev->dev_addr);
 
         dev->open = &elmc_open;
         dev->stop = &elmc_close;
diff --git a/drivers/net/3c527.c b/drivers/net/3c527.c
index abc84f765973..0f4cabb4cc29 100644
--- a/drivers/net/3c527.c
+++ b/drivers/net/3c527.c
@@ -335,7 +335,6 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
                 "82586 initialisation failure",
                 "Adapter list configuration error"
         };
-        DECLARE_MAC_BUF(mac);
 
         /* Time to play MCA games */
 
@@ -405,7 +404,7 @@ static int __init mc32_probe1(struct net_device *dev, int slot)
                 dev->dev_addr[i] = mca_read_pos(slot,3);
         }
 
-        printk("%s: Address %s", dev->name, print_mac(mac, dev->dev_addr));
+        printk("%s: Address %pM", dev->name, dev->dev_addr);
 
         mca_write_pos(slot, 6, 0);
         mca_write_pos(slot, 7, 0);
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 9ba295d9dd97..38d58fd9c18d 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -1013,7 +1013,6 @@ static int __devinit vortex_probe1(struct device *gendev,
         const char *print_name = "3c59x";
         struct pci_dev *pdev = NULL;
         struct eisa_device *edev = NULL;
-        DECLARE_MAC_BUF(mac);
 
         if (!printed_version) {
                 printk (version);
@@ -1206,7 +1205,7 @@ static int __devinit vortex_probe1(struct device *gendev,
                 ((__be16 *)dev->dev_addr)[i] = htons(eeprom[i + 10]);
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
         if (print_info)
-                printk(" %s", print_mac(mac, dev->dev_addr));
+                printk(" %pM", dev->dev_addr);
         /* Unfortunately an all zero eeprom passes the checksum and this
            gets found in the wild in failure cases. Crypto is hard 8) */
         if (!is_valid_ether_addr(dev->dev_addr)) {
diff --git a/drivers/net/8139cp.c b/drivers/net/8139cp.c
index 9ba1f0b46429..9e90d411e0ad 100644
--- a/drivers/net/8139cp.c
+++ b/drivers/net/8139cp.c
@@ -1826,7 +1826,6 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
         void __iomem *regs;
         resource_size_t pciaddr;
         unsigned int addr_len, i, pci_using_dac;
-        DECLARE_MAC_BUF(mac);
 
 #ifndef MODULE
         static int version_printed;
@@ -1967,10 +1966,10 @@ static int cp_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
                 goto err_out_iomap;
 
         printk (KERN_INFO "%s: RTL-8139C+ at 0x%lx, "
-                "%s, IRQ %d\n",
+                "%pM, IRQ %d\n",
                 dev->name,
                 dev->base_addr,
-                print_mac(mac, dev->dev_addr),
+                dev->dev_addr,
                 dev->irq);
 
         pci_set_drvdata(pdev, dev);
diff --git a/drivers/net/8139too.c b/drivers/net/8139too.c
index 63f906b04899..96841e40bd46 100644
--- a/drivers/net/8139too.c
+++ b/drivers/net/8139too.c
@@ -925,7 +925,6 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
         int i, addr_len, option;
         void __iomem *ioaddr;
         static int board_idx = -1;
-        DECLARE_MAC_BUF(mac);
 
         assert (pdev != NULL);
         assert (ent != NULL);
@@ -1024,11 +1023,11 @@ static int __devinit rtl8139_init_one (struct pci_dev *pdev,
         pci_set_drvdata (pdev, dev);
 
         printk (KERN_INFO "%s: %s at 0x%lx, "
-                "%s, IRQ %d\n",
+                "%pM, IRQ %d\n",
                 dev->name,
                 board_info[ent->driver_data].name,
                 dev->base_addr,
-                print_mac(mac, dev->dev_addr),
+                dev->dev_addr,
                 dev->irq);
 
         printk (KERN_DEBUG "%s:  Identified 8139 chip type '%s'\n",
diff --git a/drivers/net/82596.c b/drivers/net/82596.c
index da292e647eb1..1d97bb5377a8 100644
--- a/drivers/net/82596.c
+++ b/drivers/net/82596.c
@@ -1116,12 +1116,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static void print_eth(unsigned char *add, char *str)
 {
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
-
-        printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
-               add, print_mac(mac, add + 6), print_mac(mac2, add),
-               add[12], add[13], str);
+        printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n",
+               add, add + 6, add, add[12], add[13], str);
 }
 
 static int io = 0x300;
@@ -1544,7 +1540,6 @@ static void set_multicast_list(struct net_device *dev)
                 struct dev_mc_list *dmi;
                 unsigned char *cp;
                 struct mc_cmd *cmd;
-                DECLARE_MAC_BUF(mac);
 
                 if (wait_cfg(dev, &lp->mc_cmd.cmd, 1000, "multicast list change request timed out"))
                         return;
@@ -1555,8 +1550,8 @@ static void set_multicast_list(struct net_device *dev)
                 for (dmi = dev->mc_list; cnt && dmi != NULL; dmi = dmi->next, cnt--, cp += 6) {
                         memcpy(cp, dmi->dmi_addr, 6);
                         if (i596_debug > 1)
-                                DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %s\n",
-                                                dev->name, print_mac(mac, cp)));
+                                DEB(DEB_MULTI,printk(KERN_INFO "%s: Adding address %pM\n",
+                                                dev->name, cp));
                 }
                 i596_add_cmd(dev, &cmd->cmd);
         }
diff --git a/drivers/net/Kconfig b/drivers/net/Kconfig
index f749b40f954e..0f3e6b2d2808 100644
--- a/drivers/net/Kconfig
+++ b/drivers/net/Kconfig
@@ -1414,19 +1414,6 @@ config TC35815
         depends on NET_PCI && PCI && MIPS
         select PHYLIB
 
-config EEPRO100
-        tristate "EtherExpressPro/100 support (eepro100, original Becker driver)"
-        depends on NET_PCI && PCI
-        select MII
-        help
-          If you have an Intel EtherExpress PRO/100 PCI network (Ethernet)
-          card, say Y and read the Ethernet-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          To compile this driver as a module, choose M here. The module
-          will be called eepro100.
-
-
 config E100
         tristate "Intel(R) PRO/100+ support"
         depends on NET_PCI && PCI
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index f19acf8b9220..657c47b1a6b6 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -53,7 +53,6 @@ obj-$(CONFIG_VORTEX) += 3c59x.o
 obj-$(CONFIG_TYPHOON) += typhoon.o
 obj-$(CONFIG_NE2K_PCI) += ne2k-pci.o 8390.o
 obj-$(CONFIG_PCNET32) += pcnet32.o
-obj-$(CONFIG_EEPRO100) += eepro100.o
 obj-$(CONFIG_E100) += e100.o
 obj-$(CONFIG_TLAN) += tlan.o
 obj-$(CONFIG_EPIC100) += epic100.o
diff --git a/drivers/net/a2065.c b/drivers/net/a2065.c
index 9c0837435b68..48965de794bb 100644
--- a/drivers/net/a2065.c
+++ b/drivers/net/a2065.c
@@ -710,7 +710,6 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
         unsigned long board, base_addr, mem_start;
         struct resource *r1, *r2;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         board = z->resource.start;
         base_addr = board+A2065_LANCE;
@@ -787,8 +786,7 @@ static int __devinit a2065_init_one(struct zorro_dev *z,
         zorro_set_drvdata(z, dev);
 
         printk(KERN_INFO "%s: A2065 at 0x%08lx, Ethernet Address "
-               "%s\n", dev->name, board,
-               print_mac(mac, dev->dev_addr));
+               "%pM\n", dev->name, board, dev->dev_addr);
 
         return 0;
 }
diff --git a/drivers/net/ac3200.c b/drivers/net/ac3200.c
index b1448637107f..071a851a2ea1 100644
--- a/drivers/net/ac3200.c
+++ b/drivers/net/ac3200.c
@@ -146,7 +146,6 @@ out:
 static int __init ac_probe1(int ioaddr, struct net_device *dev)
 {
         int i, retval;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, AC_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -171,8 +170,8 @@ static int __init ac_probe1(int ioaddr, struct net_device *dev)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + AC_SA_PROM + i);
 
-        printk(KERN_DEBUG "AC3200 in EISA slot %d, node %s",
-               ioaddr/0x1000, print_mac(mac, dev->dev_addr));
+        printk(KERN_DEBUG "AC3200 in EISA slot %d, node %pM",
+               ioaddr/0x1000, dev->dev_addr);
 #if 0
         /* Check the vendor ID/prefix. Redundant after checking the EISA ID */
         if (inb(ioaddr + AC_SA_PROM + 0) != AC_ADDR0
diff --git a/drivers/net/acenic.c b/drivers/net/acenic.c
index 66de80b64b92..6eefd93a08f3 100644
--- a/drivers/net/acenic.c
+++ b/drivers/net/acenic.c
@@ -892,7 +892,6 @@ static int __devinit ace_init(struct net_device *dev)
         int board_idx, ecode = 0;
         short i;
         unsigned char cache_size;
-        DECLARE_MAC_BUF(mac);
 
         ap = netdev_priv(dev);
         regs = ap->regs;
@@ -1019,7 +1018,7 @@ static int __devinit ace_init(struct net_device *dev)
         dev->dev_addr[4] = (mac2 >> 8) & 0xff;
         dev->dev_addr[5] = mac2 & 0xff;
 
-        printk("MAC: %s\n", print_mac(mac, dev->dev_addr));
+        printk("MAC: %pM\n", dev->dev_addr);
 
         /*
          * Looks like this is necessary to deal with on all architectures,
diff --git a/drivers/net/amd8111e.c b/drivers/net/amd8111e.c
index 07a6697e3635..4a2ef838fed6 100644
--- a/drivers/net/amd8111e.c
+++ b/drivers/net/amd8111e.c
@@ -1821,7 +1821,6 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
         unsigned long reg_addr,reg_len;
         struct amd8111e_priv* lp;
         struct net_device* dev;
-        DECLARE_MAC_BUF(mac);
 
         err = pci_enable_device(pdev);
         if(err){
@@ -1963,8 +1962,8 @@ static int __devinit amd8111e_probe_one(struct pci_dev *pdev,
         chip_version = (readl(lp->mmio + CHIPID) & 0xf0000000)>>28;
         printk(KERN_INFO "%s: AMD-8111e Driver Version: %s\n",
                dev->name,MODULE_VERS);
-        printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet %s\n",
-               dev->name, chip_version, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: [ Rev %x ] PCI 10/100BaseT Ethernet %pM\n",
+               dev->name, chip_version, dev->dev_addr);
         if (lp->ext_phy_id)
                 printk(KERN_INFO "%s: Found MII PHY ID 0x%08x at address 0x%02x\n",
                        dev->name, lp->ext_phy_id, lp->ext_phy_addr);
diff --git a/drivers/net/apne.c b/drivers/net/apne.c
index 867f6fff543c..7426f6940630 100644
--- a/drivers/net/apne.c
+++ b/drivers/net/apne.c
@@ -207,7 +207,6 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
     int neX000, ctron;
 #endif
     static unsigned version_printed;
-    DECLARE_MAC_BUF(mac);
 
     if (ei_debug  &&  version_printed++ == 0)
         printk(version);
@@ -323,7 +322,7 @@ static int __init apne_probe1(struct net_device *dev, int ioaddr)
     for(i = 0; i < ETHER_ADDR_LEN; i++)
         dev->dev_addr[i] = SA_prom[i];
 
-    printk(" %s\n", print_mac(mac, dev->dev_addr));
+    printk(" %pM\n", dev->dev_addr);
 
     printk("%s: %s found.\n", dev->name, name);
 
diff --git a/drivers/net/ariadne.c b/drivers/net/ariadne.c
index 29e53eb71c74..2903191f4b7a 100644
--- a/drivers/net/ariadne.c
+++ b/drivers/net/ariadne.c
@@ -165,7 +165,6 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
     struct net_device *dev;
     struct ariadne_private *priv;
     int err;
-    DECLARE_MAC_BUF(mac);
 
     r1 = request_mem_region(base_addr, sizeof(struct Am79C960), "Am79C960");
     if (!r1)
@@ -215,9 +214,8 @@ static int __devinit ariadne_init_one(struct zorro_dev *z,
     }
     zorro_set_drvdata(z, dev);
 
-    printk(KERN_INFO "%s: Ariadne at 0x%08lx, Ethernet Address "
-           "%s\n", dev->name, board,
-           print_mac(mac, dev->dev_addr));
+    printk(KERN_INFO "%s: Ariadne at 0x%08lx, Ethernet Address %pM\n",
+           dev->name, board, dev->dev_addr);
 
     return 0;
 }
@@ -613,14 +611,10 @@ static int ariadne_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 #if 0
 {
-    DECLARE_MAC_BUF(mac);
-    DECLARE_MAC_BUF(mac2);
-
-    printk(KERN_DEBUG "TX pkt type 0x%04x from %s to %s "
+    printk(KERN_DEBUG "TX pkt type 0x%04x from %pM to %pM "
            " data 0x%08x len %d\n",
            ((u_short *)skb->data)[6],
-           print_mac(mac, ((const u8 *)skb->data)+6),
-           print_mac(mac, (const u8 *)skb->data),
+           skb->data + 6, skb->data,
            (int)skb->data, (int)skb->len);
 }
 #endif
@@ -743,18 +737,16 @@ static int ariadne_rx(struct net_device *dev)
             skb->protocol=eth_type_trans(skb,dev);
 #if 0
 {
-            DECLARE_MAC_BUF(mac);
-
             printk(KERN_DEBUG "RX pkt type 0x%04x from ",
                    ((u_short *)skb->data)[6]);
             {
                 u_char *ptr = &((u_char *)skb->data)[6];
-                printk("%s", print_mac(mac, ptr));
+                printk("%pM", ptr);
             }
             printk(" to ");
             {
                 u_char *ptr = (u_char *)skb->data;
-                printk("%s", print_mac(mac, ptr));
+                printk("%pM", ptr);
             }
             printk(" data 0x%08x len %d\n", (int)skb->data, (int)skb->len);
 }
diff --git a/drivers/net/arm/am79c961a.c b/drivers/net/arm/am79c961a.c
index aa4a5246be53..645915553182 100644
--- a/drivers/net/arm/am79c961a.c
+++ b/drivers/net/arm/am79c961a.c
@@ -745,10 +745,8 @@ static int __init am79c961_probe(struct platform_device *pdev)
 
         ret = register_netdev(dev);
         if (ret == 0) {
-                DECLARE_MAC_BUF(mac);
-
-                printk(KERN_INFO "%s: ether address %s\n",
-                       dev->name, print_mac(mac, dev->dev_addr));
+                printk(KERN_INFO "%s: ether address %pM\n",
+                       dev->name, dev->dev_addr);
                 return 0;
         }
 
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 6f431a887e7e..e21dc2075ed8 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/drivers/net/arm/at91_ether.c
@@ -485,7 +485,6 @@ static void update_mac_address(struct net_device *dev)
 static int set_mac_address(struct net_device *dev, void* addr)
 {
         struct sockaddr *address = addr;
-        DECLARE_MAC_BUF(mac);
 
         if (!is_valid_ether_addr(address->sa_data))
                 return -EADDRNOTAVAIL;
@@ -493,8 +492,8 @@ static int set_mac_address(struct net_device *dev, void* addr)
         memcpy(dev->dev_addr, address->sa_data, dev->addr_len);
         update_mac_address(dev);
 
-        printk("%s: Setting MAC address to %s\n", dev->name,
-               print_mac(mac, dev->dev_addr));
+        printk("%s: Setting MAC address to %pM\n", dev->name,
+               dev->dev_addr);
 
         return 0;
 }
@@ -978,7 +977,6 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
         struct at91_private *lp;
         unsigned int val;
         int res;
-        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(struct at91_private));
         if (!dev)
@@ -1084,11 +1082,11 @@ static int __init at91ether_setup(unsigned long phy_type, unsigned short phy_add
                 gpio_request(lp->board_data.phy_irq_pin, "ethernet_phy");
 
         /* Display ethernet banner */
-        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%s)\n",
+        printk(KERN_INFO "%s: AT91 ethernet at 0x%08x int=%d %s%s (%pM)\n",
                dev->name, (uint) dev->base_addr, dev->irq,
                at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_SPD ? "100-" : "10-",
                at91_emac_read(AT91_EMAC_CFG) & AT91_EMAC_FD ? "FullDuplex" : "HalfDuplex",
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
         if ((phy_type == MII_DM9161_ID) || (lp->phy_type == MII_DM9161A_ID))
                 printk(KERN_INFO "%s: Davicom 9161 PHY %s\n", dev->name, (lp->phy_media == PORT_FIBRE) ? "(Fiber)" : "(Copper)");
         else if (phy_type == MII_LXT971A_ID)
diff --git a/drivers/net/arm/ether1.c b/drivers/net/arm/ether1.c
index 3bb9e293e2ef..e380de454463 100644
--- a/drivers/net/arm/ether1.c
+++ b/drivers/net/arm/ether1.c
@@ -996,7 +996,6 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
 {
         struct net_device *dev;
         int i, ret = 0;
-        DECLARE_MAC_BUF(mac);
 
         ether1_banner();
 
@@ -1044,8 +1043,8 @@ ether1_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk(KERN_INFO "%s: ether1 in slot %d, %s\n",
-                dev->name, ec->slot_no, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: ether1 in slot %d, %pM\n",
+                dev->name, ec->slot_no, dev->dev_addr);
     
         ecard_set_drvdata(ec, dev);
         return 0;
diff --git a/drivers/net/arm/ether3.c b/drivers/net/arm/ether3.c
index 67e96ae85035..21a7bef12d3b 100644
--- a/drivers/net/arm/ether3.c
+++ b/drivers/net/arm/ether3.c
@@ -776,7 +776,6 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
         const struct ether3_data *data = id->data;
         struct net_device *dev;
         int bus_type, ret;
-        DECLARE_MAC_BUF(mac);
 
         ether3_banner();
 
@@ -859,8 +858,8 @@ ether3_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk("%s: %s in slot %d, %s\n",
-               dev->name, data->name, ec->slot_no, print_mac(mac, dev->dev_addr));
+        printk("%s: %s in slot %d, %pM\n",
+               dev->name, data->name, ec->slot_no, dev->dev_addr);
 
         ecard_set_drvdata(ec, dev);
         return 0;
diff --git a/drivers/net/arm/etherh.c b/drivers/net/arm/etherh.c
index 5c5f1e470d3c..9eb9d1bedc85 100644
--- a/drivers/net/arm/etherh.c
+++ b/drivers/net/arm/etherh.c
@@ -648,7 +648,6 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         struct net_device *dev;
         struct etherh_priv *eh;
         int ret;
-        DECLARE_MAC_BUF(mac);
 
         etherh_banner();
 
@@ -746,8 +745,8 @@ etherh_probe(struct expansion_card *ec, const struct ecard_id *id)
         if (ret)
                 goto free;
 
-        printk(KERN_INFO "%s: %s in slot %d, %s\n",
-                dev->name, data->name, ec->slot_no, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: %s in slot %d, %pM\n",
+                dev->name, data->name, ec->slot_no, dev->dev_addr);
 
         ecard_set_drvdata(ec, dev);
 
diff --git a/drivers/net/at1700.c b/drivers/net/at1700.c
index 7e874d485d24..18f724581841 100644
--- a/drivers/net/at1700.c
+++ b/drivers/net/at1700.c
@@ -265,7 +265,6 @@ static int __init at1700_probe1(struct net_device *dev, int ioaddr)
         unsigned int i, irq, is_fmv18x = 0, is_at1700 = 0;
         int slot, ret = -ENODEV;
         struct net_local *lp = netdev_priv(dev);
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, AT1700_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -397,7 +396,7 @@ found:
                         dev->dev_addr[i] = val;
                 }
         }
-        printk("%s", print_mac(mac, dev->dev_addr));
+        printk("%pM", dev->dev_addr);
 
         /* The EEPROM word 12 bit 0x0400 means use regular 100 ohm 10baseT signals,
            rather than 150 ohm shielded twisted pair compensation.
diff --git a/drivers/net/atarilance.c b/drivers/net/atarilance.c
index 0860cc280b01..5a94c49b4c45 100644
--- a/drivers/net/atarilance.c
+++ b/drivers/net/atarilance.c
@@ -466,7 +466,6 @@ static unsigned long __init lance_probe1( struct net_device *dev,
         int                                     i;
         static int                              did_version;
         unsigned short                  save1, save2;
-        DECLARE_MAC_BUF(mac);
 
         PROBE_PRINT(( "Probing for Lance card at mem %#lx io %#lx\n",
                                   (long)memaddr, (long)ioaddr ));
@@ -595,7 +594,7 @@ static unsigned long __init lance_probe1( struct net_device *dev,
                 i = IO->mem;
                 break;
         }
-        printk("%s\n", print_mac(mac, dev->dev_addr));
+        printk("%pM\n", dev->dev_addr);
         if (lp->cardtype == OLD_RIEBL) {
                 printk( "%s: Warning: This is a default ethernet address!\n",
                                 dev->name );
@@ -778,8 +777,6 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
         int entry, len;
         struct lance_tx_head *head;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
 
         DPRINTK( 2, ( "%s: lance_start_xmit() called, csr0 %4.4x.\n",
                                   dev->name, DREG ));
@@ -802,12 +799,10 @@ static int lance_start_xmit( struct sk_buff *skb, struct net_device *dev )
 
         /* Fill in a Tx ring entry */
         if (lance_debug >= 3) {
-                printk( "%s: TX pkt type 0x%04x from "
-                                "%s to %s"
+                printk( "%s: TX pkt type 0x%04x from %pM to %pM"
                                 " data at 0x%08x len %d\n",
                                 dev->name, ((u_short *)skb->data)[6],
-                                print_mac(mac, &skb->data[6]),
-                                print_mac(mac2, skb->data),
+                                &skb->data[6], skb->data,
                                 (int)skb->data, (int)skb->len );
         }
 
@@ -1019,14 +1014,12 @@ static int lance_rx( struct net_device *dev )
 
                                 if (lance_debug >= 3) {
                                         u_char *data = PKTBUF_ADDR(head);
-                                        DECLARE_MAC_BUF(mac);
-                                        DECLARE_MAC_BUF(mac2);
 
-                                        printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %s to %s "
+                                        printk(KERN_DEBUG "%s: RX pkt type 0x%04x from %pM to %pM "
                                                    "data %02x %02x %02x %02x %02x %02x %02x %02x "
                                                    "len %d\n",
                                                    dev->name, ((u_short *)data)[6],
-                                                   print_mac(mac, &data[6]), print_mac(mac2, data),
+                                                   &data[6], data,
                                                    data[15], data[16], data[17], data[18],
                                                    data[19], data[20], data[21], data[22],
                                                    pkt_len);
diff --git a/drivers/net/atp.c b/drivers/net/atp.c
index c10cd8058e23..405c2dc5f3e4 100644
--- a/drivers/net/atp.c
+++ b/drivers/net/atp.c
@@ -248,7 +248,6 @@ static int __init atp_probe1(long ioaddr)
         struct net_local *lp;
         int saved_ctrl_reg, status, i;
         int res;
-        DECLARE_MAC_BUF(mac);
 
         outb(0xff, ioaddr + PAR_DATA);
         /* Save the original value of the Control register, in case we guessed
@@ -324,8 +323,8 @@ static int __init atp_probe1(long ioaddr)
 #endif
 
         printk(KERN_NOTICE "%s: Pocket adapter found at %#3lx, IRQ %d, "
-               "SAPROM %s.\n",
-               dev->name, dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr));
+               "SAPROM %pM.\n",
+               dev->name, dev->base_addr, dev->irq, dev->dev_addr);
 
         /* Reset the ethernet hardware and activate the printer pass-through. */
         write_reg_high(ioaddr, CMR1, CMR1h_RESET | CMR1h_MUX);
diff --git a/drivers/net/ax88796.c b/drivers/net/ax88796.c
index 9a314d88e7b6..337488ec707c 100644
--- a/drivers/net/ax88796.c
+++ b/drivers/net/ax88796.c
@@ -758,13 +758,10 @@ static int ax_init_dev(struct net_device *dev, int first_init)
 #endif
         ax_NS8390_init(dev, 0);
 
-        if (first_init) {
-                DECLARE_MAC_BUF(mac);
-
-                dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %s\n",
+        if (first_init)
+                dev_info(&ax->dev->dev, "%dbit, irq %d, %lx, MAC: %pM\n",
                          ei_status.word16 ? 16:8, dev->irq, dev->base_addr,
-                         print_mac(mac, dev->dev_addr));
-        }
+                         dev->dev_addr);
 
         ret = register_netdev(dev);
         if (ret)
diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index c3bda5ce67c4..1978d25920d9 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -2117,7 +2117,6 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
         struct net_device *dev;
         struct b44 *bp;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         instance++;
 
@@ -2213,8 +2212,8 @@ static int __devinit b44_init_one(struct ssb_device *sdev,
          */
         b44_chip_reset(bp, B44_CHIP_RESET_FULL);
 
-        printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: Broadcom 44xx/47xx 10/100BaseT Ethernet %pM\n",
+               dev->name, dev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/bmac.c b/drivers/net/bmac.c
index a42bd19646d3..b141d0234e21 100644
--- a/drivers/net/bmac.c
+++ b/drivers/net/bmac.c
@@ -1258,7 +1258,6 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
         unsigned char addr[6];
         struct net_device *dev;
         int is_bmac_plus = ((int)match->data) != 0;
-        DECLARE_MAC_BUF(mac);
 
         if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
                 printk(KERN_ERR "BMAC: can't use, need 3 addrs and 3 intrs\n");
@@ -1368,8 +1367,8 @@ static int __devinit bmac_probe(struct macio_dev *mdev, const struct of_device_i
                 goto err_out_irq2;
         }
 
-        printk(KERN_INFO "%s: BMAC%s at %s",
-               dev->name, (is_bmac_plus ? "+" : ""), print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: BMAC%s at %pM",
+               dev->name, (is_bmac_plus ? "+" : ""), dev->dev_addr);
         XXDEBUG((", base_addr=%#0lx", dev->base_addr));
         printk("\n");
 
diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 430d430bce29..f2e8c3b3ee04 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -7700,7 +7700,6 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct bnx2 *bp;
         int rc;
         char str[40];
-        DECLARE_MAC_BUF(mac);
 
         if (version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -7767,14 +7766,14 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         }
 
         printk(KERN_INFO "%s: %s (%c%d) %s found at mem %lx, "
-                "IRQ %d, node addr %s\n",
+                "IRQ %d, node addr %pM\n",
                 dev->name,
                 board_info[ent->driver_data].name,
                 ((CHIP_ID(bp) & 0xf000) >> 12) + 'A',
                 ((CHIP_ID(bp) & 0x0ff0) >> 4),
                 bnx2_bus_string(bp, str),
                 dev->base_addr,
-                bp->pdev->irq, print_mac(mac, dev->dev_addr));
+                bp->pdev->irq, dev->dev_addr);
 
         return 0;
 }
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index fce745148ff9..42965ad54f08 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -9851,11 +9851,8 @@ static void bnx2x_set_rx_mode(struct net_device *dev)
                              mclist && (i < dev->mc_count);
                              i++, mclist = mclist->next) {
 
-                                DP(NETIF_MSG_IFUP, "Adding mcast MAC: "
-                                   "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                   mclist->dmi_addr[0], mclist->dmi_addr[1],
-                                   mclist->dmi_addr[2], mclist->dmi_addr[3],
-                                   mclist->dmi_addr[4], mclist->dmi_addr[5]);
+                                DP(NETIF_MSG_IFUP, "Adding mcast MAC: %pM\n",
+                                   mclist->dmi_addr);
 
                                 crc = crc32c_le(0, mclist->dmi_addr, ETH_ALEN);
                                 bit = (crc >> 24) & 0xff;
@@ -10090,8 +10087,7 @@ static int __devinit bnx2x_init_dev(struct pci_dev *pdev,
 
         dev->irq = pdev->irq;
 
-        bp->regview = ioremap_nocache(dev->base_addr,
-                                      pci_resource_len(pdev, 0));
+        bp->regview = pci_ioremap_bar(pdev, 0);
         if (!bp->regview) {
                 printk(KERN_ERR PFX "Cannot map register space, aborting\n");
                 rc = -ENOMEM;
@@ -10192,7 +10188,6 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
         struct net_device *dev = NULL;
         struct bnx2x *bp;
         int rc;
-        DECLARE_MAC_BUF(mac);
 
         if (version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -10236,7 +10231,7 @@ static int __devinit bnx2x_init_one(struct pci_dev *pdev,
                bnx2x_get_pcie_width(bp),
                (bnx2x_get_pcie_speed(bp) == 2) ? "5GHz (Gen2)" : "2.5GHz",
                dev->base_addr, bp->pdev->irq);
-        printk(KERN_CONT "node addr %s\n", print_mac(mac, dev->dev_addr));
+        printk(KERN_CONT "node addr %pM\n", dev->dev_addr);
         return 0;
 
 init_one_exit:
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index a3efba59eee9..fd9028d7c06e 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -1791,7 +1791,6 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
         struct slave *slave, *oldcurrent;
         struct sockaddr addr;
         int mac_addr_differ;
-        DECLARE_MAC_BUF(mac);
 
         /* slave is not a slave or master is not master of this slave */
         if (!(slave_dev->flags & IFF_SLAVE) ||
@@ -1820,11 +1819,11 @@ int bond_release(struct net_device *bond_dev, struct net_device *slave_dev)
                 if (!mac_addr_differ && (bond->slave_cnt > 1))
                         printk(KERN_WARNING DRV_NAME
                                ": %s: Warning: the permanent HWaddr of %s - "
-                               "%s - is still in use by %s. "
+                               "%pM - is still in use by %s. "
                                "Set the HWaddr of %s to a different address "
                                "to avoid conflicts.\n",
                                bond_dev->name, slave_dev->name,
-                               print_mac(mac, slave->perm_hwaddr),
+                               slave->perm_hwaddr,
                                bond_dev->name, slave_dev->name);
         }
 
@@ -3239,7 +3238,6 @@ static void bond_info_show_master(struct seq_file *seq)
         struct bonding *bond = seq->private;
         struct slave *curr;
         int i;
-        u32 target;
 
         read_lock(&bond->curr_slave_lock);
         curr = bond->curr_active_slave;
@@ -3293,8 +3291,7 @@ static void bond_info_show_master(struct seq_file *seq)
                                 continue;
                         if (printed)
                                 seq_printf(seq, ",");
-                        target = ntohl(bond->params.arp_targets[i]);
-                        seq_printf(seq, " %d.%d.%d.%d", HIPQUAD(target));
+                        seq_printf(seq, " %pI4", &bond->params.arp_targets[i]);
                         printed = 1;
                 }
                 seq_printf(seq, "\n");
@@ -3302,7 +3299,6 @@ static void bond_info_show_master(struct seq_file *seq)
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
-                DECLARE_MAC_BUF(mac);
 
                 seq_puts(seq, "\n802.3ad info\n");
                 seq_printf(seq, "LACP rate: %s\n",
@@ -3322,8 +3318,8 @@ static void bond_info_show_master(struct seq_file *seq)
                                    ad_info.actor_key);
                         seq_printf(seq, "\tPartner Key: %d\n",
                                    ad_info.partner_key);
-                        seq_printf(seq, "\tPartner Mac Address: %s\n",
-                                   print_mac(mac, ad_info.partner_system));
+                        seq_printf(seq, "\tPartner Mac Address: %pM\n",
+                                   ad_info.partner_system);
                 }
         }
 }
@@ -3331,7 +3327,6 @@ static void bond_info_show_master(struct seq_file *seq)
 static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave)
 {
         struct bonding *bond = seq->private;
-        DECLARE_MAC_BUF(mac);
 
         seq_printf(seq, "\nSlave Interface: %s\n", slave->dev->name);
         seq_printf(seq, "MII Status: %s\n",
@@ -3339,9 +3334,7 @@ static void bond_info_show_slave(struct seq_file *seq, const struct slave *slave
         seq_printf(seq, "Link Failure Count: %u\n",
                    slave->link_failure_count);
 
-        seq_printf(seq,
-                   "Permanent HW addr: %s\n",
-                   print_mac(mac, slave->perm_hwaddr));
+        seq_printf(seq, "Permanent HW addr: %pM\n", slave->perm_hwaddr);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 const struct aggregator *agg
diff --git a/drivers/net/bonding/bond_sysfs.c b/drivers/net/bonding/bond_sysfs.c
index 3bdb47382521..99c79a4e0806 100644
--- a/drivers/net/bonding/bond_sysfs.c
+++ b/drivers/net/bonding/bond_sysfs.c
@@ -1391,13 +1391,11 @@ static ssize_t bonding_show_ad_partner_mac(struct device *d,
 {
         int count = 0;
         struct bonding *bond = to_bond(d);
-        DECLARE_MAC_BUF(mac);
 
         if (bond->params.mode == BOND_MODE_8023AD) {
                 struct ad_info ad_info;
                 if (!bond_3ad_get_active_agg_info(bond, &ad_info)) {
-                        count = sprintf(buf,"%s\n",
-                                        print_mac(mac, ad_info.partner_system));
+                        count = sprintf(buf, "%pM\n", ad_info.partner_system);
                 }
         }
 
diff --git a/drivers/net/cassini.c b/drivers/net/cassini.c
index 86909cfb14de..a06931d76f94 100644
--- a/drivers/net/cassini.c
+++ b/drivers/net/cassini.c
@@ -4988,7 +4988,6 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
         int i, err, pci_using_dac;
         u16 pci_cmd;
         u8 orig_cacheline_size = 0, cas_cacheline_size = 0;
-        DECLARE_MAC_BUF(mac);
 
         if (cas_version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -5201,12 +5200,12 @@ static int __devinit cas_init_one(struct pci_dev *pdev,
 
         i = readl(cp->regs + REG_BIM_CFG);
         printk(KERN_INFO "%s: Sun Cassini%s (%sbit/%sMHz PCI/%s) "
-               "Ethernet[%d] %s\n",  dev->name,
+               "Ethernet[%d] %pM\n",  dev->name,
                (cp->cas_flags & CAS_FLAG_REG_PLUS) ? "+" : "",
                (i & BIM_CFG_32BIT) ? "32" : "64",
                (i & BIM_CFG_66MHZ) ? "66" : "33",
                (cp->phy_type == CAS_PHY_SERDES) ? "Fi" : "Cu", pdev->irq,
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
 
         pci_set_drvdata(pdev, dev);
         cp->hw_running = 1;
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c
index 017a5361b980..d39a77cba1af 100644
--- a/drivers/net/cpmac.c
+++ b/drivers/net/cpmac.c
@@ -1103,7 +1103,6 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
         struct cpmac_priv *priv;
         struct net_device *dev;
         struct plat_cpmac_data *pdata;
-        DECLARE_MAC_BUF(mac);
 
         pdata = pdev->dev.platform_data;
 
@@ -1180,8 +1179,8 @@ static int __devinit cpmac_probe(struct platform_device *pdev)
         if (netif_msg_probe(priv)) {
                 printk(KERN_INFO
                        "cpmac: device %s (regs: %p, irq: %d, phy: %s, "
-                       "mac: %s)\n", dev->name, (void *)mem->start, dev->irq,
-                       priv->phy_name, print_mac(mac, dev->dev_addr));
+                       "mac: %pM)\n", dev->name, (void *)mem->start, dev->irq,
+                       priv->phy_name, dev->dev_addr);
         }
         return 0;
 
diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c
index 65d0a9103297..486fa215d3ad 100644
--- a/drivers/net/cris/eth_v10.c
+++ b/drivers/net/cris/eth_v10.c
@@ -419,7 +419,6 @@ e100_set_mac_address(struct net_device *dev, void *p)
 {
         struct net_local *np = netdev_priv(dev);
         struct sockaddr *addr = p;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock(&np->lock); /* preemption protection */
 
@@ -440,8 +439,7 @@ e100_set_mac_address(struct net_device *dev, void *p)
 
         /* show it in the log as well */
 
-        printk(KERN_INFO "%s: changed MAC to %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: changed MAC to %pM\n", dev->name, dev->dev_addr);
 
         spin_unlock(&np->lock);
 
diff --git a/drivers/net/cs89x0.c b/drivers/net/cs89x0.c
index 7107620f615d..65174d3b9026 100644
--- a/drivers/net/cs89x0.c
+++ b/drivers/net/cs89x0.c
@@ -521,7 +521,6 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
         unsigned rev_type = 0;
         int eeprom_buff[CHKSUM_LEN];
         int retval;
-        DECLARE_MAC_BUF(mac);
 
         /* Initialize the device structure. */
         if (!modular) {
@@ -846,7 +845,7 @@ cs89x0_probe1(struct net_device *dev, int ioaddr, int modular)
         }
 
         /* print the ethernet address. */
-        printk(", MAC %s", print_mac(mac, dev->dev_addr));
+        printk(", MAC %pM", dev->dev_addr);
 
         dev->open               = net_open;
         dev->stop               = net_close;
@@ -1817,11 +1816,10 @@ static int set_mac_address(struct net_device *dev, void *p)
 
         memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
 
-        if (net_debug) {
-                DECLARE_MAC_BUF(mac);
-                printk("%s: Setting MAC address to %s.\n",
-                       dev->name, print_mac(mac, dev->dev_addr));
-        }
+        if (net_debug)
+                printk("%s: Setting MAC address to %pM.\n",
+                       dev->name, dev->dev_addr);
+
         /* set the Ethernet address */
         for (i=0; i < ETH_ALEN/2; i++)
                 writereg(dev, PP_IA+i*2, dev->dev_addr[i*2] | (dev->dev_addr[i*2+1] << 8));
diff --git a/drivers/net/cxgb3/cxgb3_main.c b/drivers/net/cxgb3/cxgb3_main.c
index 1ace41a13ac3..e1746eeb34a4 100644
--- a/drivers/net/cxgb3/cxgb3_main.c
+++ b/drivers/net/cxgb3/cxgb3_main.c
@@ -494,6 +494,36 @@ static void enable_all_napi(struct adapter *adap)
 }
 
 /**
+ *      set_qset_lro - Turn a queue set's LRO capability on and off
+ *      @dev: the device the qset is attached to
+ *      @qset_idx: the queue set index
+ *      @val: the LRO switch
+ *
+ *      Sets LRO on or off for a particular queue set.
+ *      the device's features flag is updated to reflect the LRO
+ *      capability when all queues belonging to the device are
+ *      in the same state.
+ */
+static void set_qset_lro(struct net_device *dev, int qset_idx, int val)
+{
+        struct port_info *pi = netdev_priv(dev);
+        struct adapter *adapter = pi->adapter;
+        int i, lro_on = 1;
+
+        adapter->params.sge.qset[qset_idx].lro = !!val;
+        adapter->sge.qs[qset_idx].lro_enabled = !!val;
+
+        /* let ethtool report LRO on only if all queues are LRO enabled */
+        for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; ++i)
+                lro_on &= adapter->params.sge.qset[i].lro;
+
+        if (lro_on)
+                dev->features |= NETIF_F_LRO;
+        else
+                dev->features &= ~NETIF_F_LRO;
+}
+
+/**
  *      setup_sge_qsets - configure SGE Tx/Rx/response queues
  *      @adap: the adapter
  *
@@ -516,8 +546,7 @@ static int setup_sge_qsets(struct adapter *adap)
                 pi->qs = &adap->sge.qs[pi->first_qset];
                 for (j = pi->first_qset; j < pi->first_qset + pi->nqsets;
                      ++j, ++qset_idx) {
-                        if (!pi->rx_csum_offload)
-                                adap->params.sge.qset[qset_idx].lro = 0;
+                        set_qset_lro(dev, qset_idx, pi->rx_csum_offload);
                         err = t3_sge_alloc_qset(adap, qset_idx, 1,
                                 (adap->flags & USING_MSIX) ? qset_idx + 1 :
                                                              irq_idx,
@@ -1632,13 +1661,10 @@ static int set_rx_csum(struct net_device *dev, u32 data)
 
         p->rx_csum_offload = data;
         if (!data) {
-                struct adapter *adap = p->adapter;
                 int i;
 
-                for (i = p->first_qset; i < p->first_qset + p->nqsets; i++) {
-                        adap->params.sge.qset[i].lro = 0;
-                        adap->sge.qs[i].lro_enabled = 0;
-                }
+                for (i = p->first_qset; i < p->first_qset + p->nqsets; i++)
+                        set_qset_lro(dev, i, 0);
         }
         return 0;
 }
@@ -1793,6 +1819,25 @@ static void get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         memset(&wol->sopass, 0, sizeof(wol->sopass));
 }
 
+static int cxgb3_set_flags(struct net_device *dev, u32 data)
+{
+        struct port_info *pi = netdev_priv(dev);
+        int i;
+
+        if (data & ETH_FLAG_LRO) {
+                if (!pi->rx_csum_offload)
+                        return -EINVAL;
+
+                for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++)
+                        set_qset_lro(dev, i, 1);
+
+        } else
+                for (i = pi->first_qset; i < pi->first_qset + pi->nqsets; i++)
+                        set_qset_lro(dev, i, 0);
+
+        return 0;
+}
+
 static const struct ethtool_ops cxgb_ethtool_ops = {
         .get_settings = get_settings,
         .set_settings = set_settings,
@@ -1822,6 +1867,8 @@ static const struct ethtool_ops cxgb_ethtool_ops = {
         .get_regs = get_regs,
         .get_wol = get_wol,
         .set_tso = ethtool_op_set_tso,
+        .get_flags = ethtool_op_get_flags,
+        .set_flags = cxgb3_set_flags,
 };
 
 static int in_range(int val, int lo, int hi)
@@ -1938,11 +1985,9 @@ static int cxgb_extension_ioctl(struct net_device *dev, void __user *useraddr)
                                 }
                         }
                 }
-                if (t.lro >= 0) {
-                        struct sge_qset *qs = &adapter->sge.qs[t.qset_idx];
-                        q->lro = t.lro;
-                        qs->lro_enabled = t.lro;
-                }
+                if (t.lro >= 0)
+                        set_qset_lro(dev, t.qset_idx, t.lro);
+
                 break;
         }
         case CHELSIO_GET_QSET_PARAMS:{
diff --git a/drivers/net/de600.c b/drivers/net/de600.c
index cb849b091f98..2826c7473e5e 100644
--- a/drivers/net/de600.c
+++ b/drivers/net/de600.c
@@ -384,7 +384,6 @@ static struct net_device * __init de600_probe(void)
         int     i;
         struct net_device *dev;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(0);
         if (!dev)
@@ -439,7 +438,7 @@ static struct net_device * __init de600_probe(void)
                 goto out1;
         }
 
-        printk(", Ethernet Address: %s\n", print_mac(mac, dev->dev_addr));
+        printk(", Ethernet Address: %pM\n", dev->dev_addr);
 
         dev->open = de600_open;
         dev->stop = de600_close;
diff --git a/drivers/net/de620.c b/drivers/net/de620.c
index d454e143483e..643b1ea08414 100644
--- a/drivers/net/de620.c
+++ b/drivers/net/de620.c
@@ -800,7 +800,6 @@ struct net_device * __init de620_probe(int unit)
         struct net_device *dev;
         int err = -ENOMEM;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(0);
         if (!dev)
@@ -853,7 +852,7 @@ struct net_device * __init de620_probe(int unit)
                 dev->broadcast[i] = 0xff;
         }
 
-        printk(", Ethernet Address: %s", print_mac(mac, dev->dev_addr));
+        printk(", Ethernet Address: %pM", dev->dev_addr);
 
         printk(" (%dk RAM,",
                 (nic_data.RAM_Size) ? (nic_data.RAM_Size >> 2) : 64);
@@ -876,10 +875,7 @@ struct net_device * __init de620_probe(int unit)
         if (de620_debug) {
                 printk("\nEEPROM contents:\n");
                 printk("RAM_Size = 0x%02X\n", nic_data.RAM_Size);
-                printk("NodeID = %02X:%02X:%02X:%02X:%02X:%02X\n",
-                        nic_data.NodeID[0], nic_data.NodeID[1],
-                        nic_data.NodeID[2], nic_data.NodeID[3],
-                        nic_data.NodeID[4], nic_data.NodeID[5]);
+                printk("NodeID = %pM\n", nic_data.NodeID);
                 printk("Model = %d\n", nic_data.Model);
                 printk("Media = %d\n", nic_data.Media);
                 printk("SCR = 0x%02x\n", nic_data.SCR);
diff --git a/drivers/net/declance.c b/drivers/net/declance.c
index 3e3506411ac0..df01ad3e7984 100644
--- a/drivers/net/declance.c
+++ b/drivers/net/declance.c
@@ -1023,7 +1023,6 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
         int i, ret;
         unsigned long esar_base;
         unsigned char *esar;
-        DECLARE_MAC_BUF(mac);
 
         if (dec_lance_debug && version_printed++ == 0)
                 printk(version);
@@ -1223,8 +1222,7 @@ static int __init dec_lance_probe(struct device *bdev, const int type)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = esar[i * 4];
 
-        printk(", addr = %s, irq = %d\n",
-               print_mac(mac, dev->dev_addr), dev->irq);
+        printk(", addr = %pM, irq = %d\n", dev->dev_addr, dev->irq);
 
         dev->open = &lance_open;
         dev->stop = &lance_close;
diff --git a/drivers/net/depca.c b/drivers/net/depca.c
index ace39ec0a367..bf6401f8d144 100644
--- a/drivers/net/depca.c
+++ b/drivers/net/depca.c
@@ -573,7 +573,6 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
         s16 nicsr;
         u_long ioaddr;
         u_long mem_start;
-        DECLARE_MAC_BUF(mac);
 
         /*
          * We are now supposed to enter this function with the
@@ -633,7 +632,7 @@ static int __init depca_hw_init (struct net_device *dev, struct device *device)
 
         printk(", h/w address ");
         status = get_hw_addr(dev);
-        printk("%s", print_mac(mac, dev->dev_addr));
+        printk("%pM", dev->dev_addr);
         if (status != 0) {
                 printk("      which has an Ethernet PROM CRC error.\n");
                 return -ENXIO;
@@ -1841,7 +1840,6 @@ static void depca_dbg_open(struct net_device *dev)
         u_long ioaddr = dev->base_addr;
         struct depca_init *p = &lp->init_block;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         if (depca_debug > 1) {
                 /* Do not copy the shadow init block into shared memory */
@@ -1880,7 +1878,7 @@ static void depca_dbg_open(struct net_device *dev)
                 printk("...0x%8.8x\n", readl(&lp->tx_ring[i].base));
                 printk("Initialisation block at 0x%8.8lx(Phys)\n", lp->mem_start);
                 printk("        mode: 0x%4.4x\n", p->mode);
-                printk("        physical address: %s\n", print_mac(mac, p->phys_addr));
+                printk("        physical address: %pM\n", p->phys_addr);
                 printk("        multicast hash table: ");
                 for (i = 0; i < (HASH_TABLE_LEN >> 3) - 1; i++) {
                         printk("%2.2x:", p->mcast_table[i]);
diff --git a/drivers/net/dl2k.c b/drivers/net/dl2k.c
index f8037110a522..f9e405a8a844 100644
--- a/drivers/net/dl2k.c
+++ b/drivers/net/dl2k.c
@@ -97,7 +97,6 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
         static int version_printed;
         void *ring_space;
         dma_addr_t ring_dma;
-        DECLARE_MAC_BUF(mac);
 
         if (!version_printed++)
                 printk ("%s", version);
@@ -257,8 +256,8 @@ rio_probe1 (struct pci_dev *pdev, const struct pci_device_id *ent)
 
         card_idx++;
 
-        printk (KERN_INFO "%s: %s, %s, IRQ %d\n",
-                dev->name, np->name, print_mac(mac, dev->dev_addr), irq);
+        printk (KERN_INFO "%s: %s, %pM, IRQ %d\n",
+                dev->name, np->name, dev->dev_addr, irq);
         if (tx_coalesce > 1)
                 printk(KERN_INFO "tx_coalesce:\t%d packets\n",
                                 tx_coalesce);
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c
index 5a9083e3f443..22dd3081339d 100644
--- a/drivers/net/dm9000.c
+++ b/drivers/net/dm9000.c
@@ -1385,13 +1385,11 @@ dm9000_probe(struct platform_device *pdev)
         platform_set_drvdata(pdev, ndev);
         ret = register_netdev(ndev);
 
-        if (ret == 0) {
-                DECLARE_MAC_BUF(mac);
-                printk(KERN_INFO "%s: dm9000%c at %p,%p IRQ %d MAC: %s (%s)\n",
+        if (ret == 0)
+                printk(KERN_INFO "%s: dm9000%c at %p,%p IRQ %d MAC: %pM (%s)\n",
                        ndev->name, dm9000_type_to_char(db->type),
                        db->io_addr, db->io_data, ndev->irq,
-                       print_mac(mac, ndev->dev_addr), mac_src);
-        }
+                       ndev->dev_addr, mac_src);
         return 0;
 
 out:
diff --git a/drivers/net/e100.c b/drivers/net/e100.c
index 3d69fae781cf..084127fe0813 100644
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@ -2322,7 +2322,8 @@ static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
 {
         struct nic *nic = netdev_priv(netdev);
 
-        if(wol->wolopts != WAKE_MAGIC && wol->wolopts != 0)
+        if ((wol->wolopts && wol->wolopts != WAKE_MAGIC) ||
+            !device_can_wakeup(&nic->pdev->dev))
                 return -EOPNOTSUPP;
 
         if(wol->wolopts)
@@ -2330,6 +2331,8 @@ static int e100_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
         else
                 nic->flags &= ~wol_magic;
 
+        device_set_wakeup_enable(&nic->pdev->dev, wol->wolopts);
+
         e100_exec_cb(nic, NULL, e100_configure);
 
         return 0;
@@ -2616,7 +2619,6 @@ static int __devinit e100_probe(struct pci_dev *pdev,
         struct net_device *netdev;
         struct nic *nic;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         if(!(netdev = alloc_etherdev(sizeof(struct nic)))) {
                 if(((1 << debug) - 1) & NETIF_MSG_PROBE)
@@ -2734,8 +2736,10 @@ static int __devinit e100_probe(struct pci_dev *pdev,
 
         /* Wol magic packet can be enabled from eeprom */
         if((nic->mac >= mac_82558_D101_A4) &&
-           (nic->eeprom[eeprom_id] & eeprom_id_wol))
+           (nic->eeprom[eeprom_id] & eeprom_id_wol)) {
                 nic->flags |= wol_magic;
+                device_set_wakeup_enable(&pdev->dev, true);
+        }
 
         /* ack any pending wake events, disable PME */
         pci_pme_active(pdev, false);
@@ -2746,9 +2750,9 @@ static int __devinit e100_probe(struct pci_dev *pdev,
                 goto err_out_free;
         }
 
-        DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %s\n",
+        DPRINTK(PROBE, INFO, "addr 0x%llx, irq %d, MAC addr %pM\n",
                 (unsigned long long)pci_resource_start(pdev, use_io ? 1 : 0),
-                pdev->irq, print_mac(mac, netdev->dev_addr));
+                pdev->irq, netdev->dev_addr);
 
         return 0;
 
@@ -2794,11 +2798,10 @@ static int e100_suspend(struct pci_dev *pdev, pm_message_t state)
         pci_save_state(pdev);
 
         if ((nic->flags & wol_magic) | e100_asf(nic)) {
-                pci_enable_wake(pdev, PCI_D3hot, 1);
-                pci_enable_wake(pdev, PCI_D3cold, 1);
+                if (pci_enable_wake(pdev, PCI_D3cold, true))
+                        pci_enable_wake(pdev, PCI_D3hot, true);
         } else {
-                pci_enable_wake(pdev, PCI_D3hot, 0);
-                pci_enable_wake(pdev, PCI_D3cold, 0);
+                pci_enable_wake(pdev, PCI_D3hot, false);
         }
 
         pci_disable_device(pdev);
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index fac82152e4c8..07b38fbe4e03 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -912,7 +912,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         u16 eeprom_data = 0;
         u16 eeprom_apme_mask = E1000_EEPROM_APME;
         int bars, need_ioport;
-        DECLARE_MAC_BUF(mac);
 
         /* do not allocate ioport bars when not needed */
         need_ioport = e1000_is_need_ioport(pdev);
@@ -967,8 +966,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         hw->back = adapter;
 
         err = -EIO;
-        hw->hw_addr = ioremap(pci_resource_start(pdev, BAR_0),
-                              pci_resource_len(pdev, BAR_0));
+        hw->hw_addr = pci_ioremap_bar(pdev, BAR_0);
         if (!hw->hw_addr)
                 goto err_ioremap;
 
@@ -1016,9 +1014,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
          * because it depends on mac_type */
         if ((hw->mac_type == e1000_ich8lan) &&
            (pci_resource_flags(pdev, 1) & IORESOURCE_MEM)) {
-                hw->flash_address =
-                        ioremap(pci_resource_start(pdev, 1),
-                                pci_resource_len(pdev, 1));
+                hw->flash_address = pci_ioremap_bar(pdev, 1);
                 if (!hw->flash_address)
                         goto err_flashmap;
         }
@@ -1194,7 +1190,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
                  (hw->bus_width == e1000_bus_width_pciex_1) ? "Width x1" :
                  "32-bit"));
 
-        printk("%s\n", print_mac(mac, netdev->dev_addr));
+        printk("%pM\n", netdev->dev_addr);
 
         if (hw->bus_type == e1000_bus_type_pci_express) {
                 DPRINTK(PROBE, WARNING, "This device (id %04x:%04x) will no "
diff --git a/drivers/net/e1000e/netdev.c b/drivers/net/e1000e/netdev.c
index abd492b7336d..a5c9266cd7ce 100644
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@ -4652,14 +4652,12 @@ static void e1000_print_device_info(struct e1000_adapter *adapter)
         u32 pba_num;
 
         /* print bus type/speed/width info */
-        e_info("(PCI Express:2.5GB/s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
+        e_info("(PCI Express:2.5GB/s:%s) %pM\n",
                /* bus width */
                ((hw->bus.width == e1000_bus_width_pcie_x4) ? "Width x4" :
                 "Width x1"),
                /* MAC address */
-               netdev->dev_addr[0], netdev->dev_addr[1],
-               netdev->dev_addr[2], netdev->dev_addr[3],
-               netdev->dev_addr[4], netdev->dev_addr[5]);
+               netdev->dev_addr);
         e_info("Intel(R) PRO/%s Network Connection\n",
                (hw->phy.type == e1000_phy_ife) ? "10/100" : "1000");
         e1000e_read_pba_num(hw, &pba_num);
@@ -4906,10 +4904,7 @@ static int __devinit e1000_probe(struct pci_dev *pdev,
         memcpy(netdev->perm_addr, adapter->hw.mac.addr, netdev->addr_len);
 
         if (!is_valid_ether_addr(netdev->perm_addr)) {
-                e_err("Invalid MAC Address: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                      netdev->perm_addr[0], netdev->perm_addr[1],
-                      netdev->perm_addr[2], netdev->perm_addr[3],
-                      netdev->perm_addr[4], netdev->perm_addr[5]);
+                e_err("Invalid MAC Address: %pM\n", netdev->perm_addr);
                 err = -EIO;
                 goto err_eeprom;
         }
diff --git a/drivers/net/eepro.c b/drivers/net/eepro.c
index 1f11350e16cf..5f72362b782d 100644
--- a/drivers/net/eepro.c
+++ b/drivers/net/eepro.c
@@ -690,7 +690,6 @@ static void __init eepro_print_info (struct net_device *dev)
         struct eepro_local *    lp = netdev_priv(dev);
         int                     i;
         const char *            ifmap[] = {"AUI", "10Base2", "10BaseT"};
-        DECLARE_MAC_BUF(mac);
 
         i = inb(dev->base_addr + ID_REG);
         printk(KERN_DEBUG " id: %#x ",i);
@@ -715,7 +714,7 @@ static void __init eepro_print_info (struct net_device *dev)
                         break;
         }
 
-        printk(" %s", print_mac(mac, dev->dev_addr));
+        printk(" %pM", dev->dev_addr);
 
         if (net_debug > 3)
                 printk(KERN_DEBUG ", %dK RCV buffer",
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
deleted file mode 100644
index e3e26c595fa3..000000000000
--- a/drivers/net/eepro100.c
+++ /dev/null
@@ -1,2401 +0,0 @@
-/* drivers/net/eepro100.c: An Intel i82557-559 Ethernet driver for Linux. */
-/*
-        Written 1996-1999 by Donald Becker.
-
-        The driver also contains updates by different kernel developers
-        (see incomplete list below).
-        Current maintainer is Andrey V. Savochkin <saw@saw.sw.com.sg>.
-        Please use this email address and linux-kernel mailing list for bug reports.
-
-        This software may be used and distributed according to the terms
-        of the GNU General Public License, incorporated herein by reference.
-
-        This driver is for the Intel EtherExpress Pro100 (Speedo3) design.
-        It should work with all i82557/558/559 boards.
-
-        Version history:
-        1998 Apr - 2000 Feb  Andrey V. Savochkin <saw@saw.sw.com.sg>
-                Serious fixes for multicast filter list setting, TX timeout routine;
-                RX ring refilling logic;  other stuff
-        2000 Feb  Jeff Garzik <jgarzik@pobox.com>
-                Convert to new PCI driver interface
-        2000 Mar 24  Dragan Stancevic <visitor@valinux.com>
-                Disabled FC and ER, to avoid lockups when when we get FCP interrupts.
-        2000 Jul 17 Goutham Rao <goutham.rao@intel.com>
-                PCI DMA API fixes, adding pci_dma_sync_single calls where neccesary
-        2000 Aug 31 David Mosberger <davidm@hpl.hp.com>
-                rx_align support: enables rx DMA without causing unaligned accesses.
-*/
-
-static const char * const version =
-"eepro100.c:v1.09j-t 9/29/99 Donald Becker\n"
-"eepro100.c: $Revision: 1.36 $ 2000/11/17 Modified by Andrey V. Savochkin <saw@saw.sw.com.sg> and others\n";
-
-/* A few user-configurable values that apply to all boards.
-   First set is undocumented and spelled per Intel recommendations. */
-
-static int congenb /* = 0 */; /* Enable congestion control in the DP83840. */
-static int txfifo = 8;          /* Tx FIFO threshold in 4 byte units, 0-15 */
-static int rxfifo = 8;          /* Rx FIFO threshold, default 32 bytes. */
-/* Tx/Rx DMA burst length, 0-127, 0 == no preemption, tx==128 -> disabled. */
-static int txdmacount = 128;
-static int rxdmacount /* = 0 */;
-
-#if defined(__ia64__) || defined(__alpha__) || defined(__sparc__) || defined(__mips__) || \
-        defined(__arm__)
-  /* align rx buffers to 2 bytes so that IP header is aligned */
-# define rx_align(skb)          skb_reserve((skb), 2)
-# define RxFD_ALIGNMENT         __attribute__ ((aligned (2), packed))
-#else
-# define rx_align(skb)
-# define RxFD_ALIGNMENT
-#endif
-
-/* Set the copy breakpoint for the copy-only-tiny-buffer Rx method.
-   Lower values use more memory, but are faster. */
-static int rx_copybreak = 200;
-
-/* Maximum events (Rx packets, etc.) to handle at each interrupt. */
-static int max_interrupt_work = 20;
-
-/* Maximum number of multicast addresses to filter (vs. rx-all-multicast) */
-static int multicast_filter_limit = 64;
-
-/* 'options' is used to pass a transceiver override or full-duplex flag
-   e.g. "options=16" for FD, "options=32" for 100mbps-only. */
-static int full_duplex[] = {-1, -1, -1, -1, -1, -1, -1, -1};
-static int options[] = {-1, -1, -1, -1, -1, -1, -1, -1};
-
-/* A few values that may be tweaked. */
-/* The ring sizes should be a power of two for efficiency. */
-#define TX_RING_SIZE    64
-#define RX_RING_SIZE    64
-/* How much slots multicast filter setup may take.
-   Do not descrease without changing set_rx_mode() implementaion. */
-#define TX_MULTICAST_SIZE   2
-#define TX_MULTICAST_RESERV (TX_MULTICAST_SIZE*2)
-/* Actual number of TX packets queued, must be
-   <= TX_RING_SIZE-TX_MULTICAST_RESERV. */
-#define TX_QUEUE_LIMIT  (TX_RING_SIZE-TX_MULTICAST_RESERV)
-/* Hysteresis marking queue as no longer full. */
-#define TX_QUEUE_UNFULL (TX_QUEUE_LIMIT-4)
-
-/* Operational parameters that usually are not changed. */
-
-/* Time in jiffies before concluding the transmitter is hung. */
-#define TX_TIMEOUT              (2*HZ)
-/* Size of an pre-allocated Rx buffer: <Ethernet MTU> + slack.*/
-#define PKT_BUF_SZ              1536
-
-#include <linux/module.h>
-
-#include <linux/kernel.h>
-#include <linux/string.h>
-#include <linux/errno.h>
-#include <linux/ioport.h>
-#include <linux/slab.h>
-#include <linux/interrupt.h>
-#include <linux/timer.h>
-#include <linux/pci.h>
-#include <linux/spinlock.h>
-#include <linux/init.h>
-#include <linux/mii.h>
-#include <linux/delay.h>
-#include <linux/bitops.h>
-
-#include <asm/io.h>
-#include <asm/uaccess.h>
-#include <asm/irq.h>
-
-#include <linux/netdevice.h>
-#include <linux/etherdevice.h>
-#include <linux/rtnetlink.h>
-#include <linux/skbuff.h>
-#include <linux/ethtool.h>
-
-static int use_io;
-static int debug = -1;
-#define DEBUG_DEFAULT           (NETIF_MSG_DRV          | \
-                                 NETIF_MSG_HW           | \
-                                 NETIF_MSG_RX_ERR       | \
-                                 NETIF_MSG_TX_ERR)
-#define DEBUG                   ((debug >= 0) ? (1<<debug)-1 : DEBUG_DEFAULT)
-
-
-MODULE_AUTHOR("Maintainer: Andrey V. Savochkin <saw@saw.sw.com.sg>");
-MODULE_DESCRIPTION("Intel i82557/i82558/i82559 PCI EtherExpressPro driver");
-MODULE_LICENSE("GPL");
-module_param(use_io, int, 0);
-module_param(debug, int, 0);
-module_param_array(options, int, NULL, 0);
-module_param_array(full_duplex, int, NULL, 0);
-module_param(congenb, int, 0);
-module_param(txfifo, int, 0);
-module_param(rxfifo, int, 0);
-module_param(txdmacount, int, 0);
-module_param(rxdmacount, int, 0);
-module_param(rx_copybreak, int, 0);
-module_param(max_interrupt_work, int, 0);
-module_param(multicast_filter_limit, int, 0);
-MODULE_PARM_DESC(debug, "debug level (0-6)");
-MODULE_PARM_DESC(options, "Bits 0-3: transceiver type, bit 4: full duplex, bit 5: 100Mbps");
-MODULE_PARM_DESC(full_duplex, "full duplex setting(s) (1)");
-MODULE_PARM_DESC(congenb, "Enable congestion control (1)");
-MODULE_PARM_DESC(txfifo, "Tx FIFO threshold in 4 byte units, (0-15)");
-MODULE_PARM_DESC(rxfifo, "Rx FIFO threshold in 4 byte units, (0-15)");
-MODULE_PARM_DESC(txdmacount, "Tx DMA burst length; 128 - disable (0-128)");
-MODULE_PARM_DESC(rxdmacount, "Rx DMA burst length; 128 - disable (0-128)");
-MODULE_PARM_DESC(rx_copybreak, "copy breakpoint for copy-only-tiny-frames");
-MODULE_PARM_DESC(max_interrupt_work, "maximum events handled per interrupt");
-MODULE_PARM_DESC(multicast_filter_limit, "maximum number of filtered multicast addresses");
-
-#define RUN_AT(x) (jiffies + (x))
-
-#define netdevice_start(dev)
-#define netdevice_stop(dev)
-#define netif_set_tx_timeout(dev, tf, tm) \
-                                                                do { \
-                                                                        (dev)->tx_timeout = (tf); \
-                                                                        (dev)->watchdog_timeo = (tm); \
-                                                                } while(0)
-
-
-
-/*
-                                Theory of Operation
-
-I. Board Compatibility
-
-This device driver is designed for the Intel i82557 "Speedo3" chip, Intel's
-single-chip fast Ethernet controller for PCI, as used on the Intel
-EtherExpress Pro 100 adapter.
-
-II. Board-specific settings
-
-PCI bus devices are configured by the system at boot time, so no jumpers
-need to be set on the board.  The system BIOS should be set to assign the
-PCI INTA signal to an otherwise unused system IRQ line.  While it's
-possible to share PCI interrupt lines, it negatively impacts performance and
-only recent kernels support it.
-
-III. Driver operation
-
-IIIA. General
-The Speedo3 is very similar to other Intel network chips, that is to say
-"apparently designed on a different planet".  This chips retains the complex
-Rx and Tx descriptors and multiple buffers pointers as previous chips, but
-also has simplified Tx and Rx buffer modes.  This driver uses the "flexible"
-Tx mode, but in a simplified lower-overhead manner: it associates only a
-single buffer descriptor with each frame descriptor.
-
-Despite the extra space overhead in each receive skbuff, the driver must use
-the simplified Rx buffer mode to assure that only a single data buffer is
-associated with each RxFD. The driver implements this by reserving space
-for the Rx descriptor at the head of each Rx skbuff.
-
-The Speedo-3 has receive and command unit base addresses that are added to
-almost all descriptor pointers.  The driver sets these to zero, so that all
-pointer fields are absolute addresses.
-
-The System Control Block (SCB) of some previous Intel chips exists on the
-chip in both PCI I/O and memory space.  This driver uses the I/O space
-registers, but might switch to memory mapped mode to better support non-x86
-processors.
-
-IIIB. Transmit structure
-
-The driver must use the complex Tx command+descriptor mode in order to
-have a indirect pointer to the skbuff data section.  Each Tx command block
-(TxCB) is associated with two immediately appended Tx Buffer Descriptor
-(TxBD).  A fixed ring of these TxCB+TxBD pairs are kept as part of the
-speedo_private data structure for each adapter instance.
-
-The newer i82558 explicitly supports this structure, and can read the two
-TxBDs in the same PCI burst as the TxCB.
-
-This ring structure is used for all normal transmit packets, but the
-transmit packet descriptors aren't long enough for most non-Tx commands such
-as CmdConfigure.  This is complicated by the possibility that the chip has
-already loaded the link address in the previous descriptor.  So for these
-commands we convert the next free descriptor on the ring to a NoOp, and point
-that descriptor's link to the complex command.
-
-An additional complexity of these non-transmit commands are that they may be
-added asynchronous to the normal transmit queue, so we disable interrupts
-whenever the Tx descriptor ring is manipulated.
-
-A notable aspect of these special configure commands is that they do
-work with the normal Tx ring entry scavenge method.  The Tx ring scavenge
-is done at interrupt time using the 'dirty_tx' index, and checking for the
-command-complete bit.  While the setup frames may have the NoOp command on the
-Tx ring marked as complete, but not have completed the setup command, this
-is not a problem.  The tx_ring entry can be still safely reused, as the
-tx_skbuff[] entry is always empty for config_cmd and mc_setup frames.
-
-Commands may have bits set e.g. CmdSuspend in the command word to either
-suspend or stop the transmit/command unit.  This driver always flags the last
-command with CmdSuspend, erases the CmdSuspend in the previous command, and
-then issues a CU_RESUME.
-Note: Watch out for the potential race condition here: imagine
-        erasing the previous suspend
-                the chip processes the previous command
-                the chip processes the final command, and suspends
-        doing the CU_RESUME
-                the chip processes the next-yet-valid post-final-command.
-So blindly sending a CU_RESUME is only safe if we do it immediately after
-after erasing the previous CmdSuspend, without the possibility of an
-intervening delay.  Thus the resume command is always within the
-interrupts-disabled region.  This is a timing dependence, but handling this
-condition in a timing-independent way would considerably complicate the code.
-
-Note: In previous generation Intel chips, restarting the command unit was a
-notoriously slow process.  This is presumably no longer true.
-
-IIIC. Receive structure
-
-Because of the bus-master support on the Speedo3 this driver uses the new
-SKBUFF_RX_COPYBREAK scheme, rather than a fixed intermediate receive buffer.
-This scheme allocates full-sized skbuffs as receive buffers.  The value
-SKBUFF_RX_COPYBREAK is used as the copying breakpoint: it is chosen to
-trade-off the memory wasted by passing the full-sized skbuff to the queue
-layer for all frames vs. the copying cost of copying a frame to a
-correctly-sized skbuff.
-
-For small frames the copying cost is negligible (esp. considering that we
-are pre-loading the cache with immediately useful header information), so we
-allocate a new, minimally-sized skbuff.  For large frames the copying cost
-is non-trivial, and the larger copy might flush the cache of useful data, so
-we pass up the skbuff the packet was received into.
-
-IV. Notes
-
-Thanks to Steve Williams of Intel for arranging the non-disclosure agreement
-that stated that I could disclose the information.  But I still resent
-having to sign an Intel NDA when I'm helping Intel sell their own product!
-
-*/
-
-static int speedo_found1(struct pci_dev *pdev, void __iomem *ioaddr, int fnd_cnt, int acpi_idle_state);
-
-/* Offsets to the various registers.
-   All accesses need not be longword aligned. */
-enum speedo_offsets {
-        SCBStatus = 0, SCBCmd = 2,      /* Rx/Command Unit command and status. */
-        SCBIntmask = 3,
-        SCBPointer = 4,                         /* General purpose pointer. */
-        SCBPort = 8,                            /* Misc. commands and operands.  */
-        SCBflash = 12, SCBeeprom = 14, /* EEPROM and flash memory control. */
-        SCBCtrlMDI = 16,                        /* MDI interface control. */
-        SCBEarlyRx = 20,                        /* Early receive byte count. */
-};
-/* Commands that can be put in a command list entry. */
-enum commands {
-        CmdNOp = 0, CmdIASetup = 0x10000, CmdConfigure = 0x20000,
-        CmdMulticastList = 0x30000, CmdTx = 0x40000, CmdTDR = 0x50000,
-        CmdDump = 0x60000, CmdDiagnose = 0x70000,
-        CmdSuspend = 0x40000000,        /* Suspend after completion. */
-        CmdIntr = 0x20000000,           /* Interrupt after completion. */
-        CmdTxFlex = 0x00080000,         /* Use "Flexible mode" for CmdTx command. */
-};
-/* Clear CmdSuspend (1<<30) avoiding interference with the card access to the
-   status bits.  Previous driver versions used separate 16 bit fields for
-   commands and statuses.  --SAW
- */
-#if defined(__alpha__)
-# define clear_suspend(cmd)  clear_bit(30, &(cmd)->cmd_status);
-#else
-# define clear_suspend(cmd)  ((__le16 *)&(cmd)->cmd_status)[1] &= ~cpu_to_le16(1<<14)
-#endif
-
-enum SCBCmdBits {
-        SCBMaskCmdDone=0x8000, SCBMaskRxDone=0x4000, SCBMaskCmdIdle=0x2000,
-        SCBMaskRxSuspend=0x1000, SCBMaskEarlyRx=0x0800, SCBMaskFlowCtl=0x0400,
-        SCBTriggerIntr=0x0200, SCBMaskAll=0x0100,
-        /* The rest are Rx and Tx commands. */
-        CUStart=0x0010, CUResume=0x0020, CUStatsAddr=0x0040, CUShowStats=0x0050,
-        CUCmdBase=0x0060,       /* CU Base address (set to zero) . */
-        CUDumpStats=0x0070, /* Dump then reset stats counters. */
-        RxStart=0x0001, RxResume=0x0002, RxAbort=0x0004, RxAddrLoad=0x0006,
-        RxResumeNoResources=0x0007,
-};
-
-enum SCBPort_cmds {
-        PortReset=0, PortSelfTest=1, PortPartialReset=2, PortDump=3,
-};
-
-/* The Speedo3 Rx and Tx frame/buffer descriptors. */
-struct descriptor {                         /* A generic descriptor. */
-        volatile __le32 cmd_status;     /* All command and status fields. */
-        __le32 link;                                /* struct descriptor *  */
-        unsigned char params[0];
-};
-
-/* The Speedo3 Rx and Tx buffer descriptors. */
-struct RxFD {                                   /* Receive frame descriptor. */
-        volatile __le32 status;
-        __le32 link;                                    /* struct RxFD * */
-        __le32 rx_buf_addr;                     /* void * */
-        __le32 count;
-} RxFD_ALIGNMENT;
-
-/* Selected elements of the Tx/RxFD.status word. */
-enum RxFD_bits {
-        RxComplete=0x8000, RxOK=0x2000,
-        RxErrCRC=0x0800, RxErrAlign=0x0400, RxErrTooBig=0x0200, RxErrSymbol=0x0010,
-        RxEth2Type=0x0020, RxNoMatch=0x0004, RxNoIAMatch=0x0002,
-        TxUnderrun=0x1000,  StatusComplete=0x8000,
-};
-
-#define CONFIG_DATA_SIZE 22
-struct TxFD {                                   /* Transmit frame descriptor set. */
-        __le32 status;
-        __le32 link;                                    /* void * */
-        __le32 tx_desc_addr;                    /* Always points to the tx_buf_addr element. */
-        __le32 count;                                   /* # of TBD (=1), Tx start thresh., etc. */
-        /* This constitutes two "TBD" entries -- we only use one. */
-#define TX_DESCR_BUF_OFFSET 16
-        __le32 tx_buf_addr0;                    /* void *, frame to be transmitted.  */
-        __le32 tx_buf_size0;                    /* Length of Tx frame. */
-        __le32 tx_buf_addr1;                    /* void *, frame to be transmitted.  */
-        __le32 tx_buf_size1;                    /* Length of Tx frame. */
-        /* the structure must have space for at least CONFIG_DATA_SIZE starting
-         * from tx_desc_addr field */
-};
-
-/* Multicast filter setting block.  --SAW */
-struct speedo_mc_block {
-        struct speedo_mc_block *next;
-        unsigned int tx;
-        dma_addr_t frame_dma;
-        unsigned int len;
-        struct descriptor frame __attribute__ ((__aligned__(16)));
-};
-
-/* Elements of the dump_statistics block. This block must be lword aligned. */
-struct speedo_stats {
-        __le32 tx_good_frames;
-        __le32 tx_coll16_errs;
-        __le32 tx_late_colls;
-        __le32 tx_underruns;
-        __le32 tx_lost_carrier;
-        __le32 tx_deferred;
-        __le32 tx_one_colls;
-        __le32 tx_multi_colls;
-        __le32 tx_total_colls;
-        __le32 rx_good_frames;
-        __le32 rx_crc_errs;
-        __le32 rx_align_errs;
-        __le32 rx_resource_errs;
-        __le32 rx_overrun_errs;
-        __le32 rx_colls_errs;
-        __le32 rx_runt_errs;
-        __le32 done_marker;
-};
-
-enum Rx_ring_state_bits {
-        RrNoMem=1, RrPostponed=2, RrNoResources=4, RrOOMReported=8,
-};
-
-/* Do not change the position (alignment) of the first few elements!
-   The later elements are grouped for cache locality.
-
-   Unfortunately, all the positions have been shifted since there.
-   A new re-alignment is required.  2000/03/06  SAW */
-struct speedo_private {
-    void __iomem *regs;
-        struct TxFD     *tx_ring;               /* Commands (usually CmdTxPacket). */
-        struct RxFD *rx_ringp[RX_RING_SIZE];    /* Rx descriptor, used as ring. */
-        /* The addresses of a Tx/Rx-in-place packets/buffers. */
-        struct sk_buff *tx_skbuff[TX_RING_SIZE];
-        struct sk_buff *rx_skbuff[RX_RING_SIZE];
-        /* Mapped addresses of the rings. */
-        dma_addr_t tx_ring_dma;
-#define TX_RING_ELEM_DMA(sp, n) ((sp)->tx_ring_dma + (n)*sizeof(struct TxFD))
-        dma_addr_t rx_ring_dma[RX_RING_SIZE];
-        struct descriptor *last_cmd;            /* Last command sent. */
-        unsigned int cur_tx, dirty_tx;          /* The ring entries to be free()ed. */
-        spinlock_t lock;                        /* Group with Tx control cache line. */
-        u32 tx_threshold;                       /* The value for txdesc.count. */
-        struct RxFD *last_rxf;                  /* Last filled RX buffer. */
-        dma_addr_t last_rxf_dma;
-        unsigned int cur_rx, dirty_rx;          /* The next free ring entry */
-        long last_rx_time;                      /* Last Rx, in jiffies, to handle Rx hang. */
-        struct net_device_stats stats;
-        struct speedo_stats *lstats;
-        dma_addr_t lstats_dma;
-        int chip_id;
-        struct pci_dev *pdev;
-        struct timer_list timer;                /* Media selection timer. */
-        struct speedo_mc_block *mc_setup_head;  /* Multicast setup frame list head. */
-        struct speedo_mc_block *mc_setup_tail;  /* Multicast setup frame list tail. */
-        long in_interrupt;                      /* Word-aligned dev->interrupt */
-        unsigned char acpi_pwr;
-        signed char rx_mode;                    /* Current PROMISC/ALLMULTI setting. */
-        unsigned int tx_full:1;                 /* The Tx queue is full. */
-        unsigned int flow_ctrl:1;               /* Use 802.3x flow control. */
-        unsigned int rx_bug:1;                  /* Work around receiver hang errata. */
-        unsigned char default_port:8;           /* Last dev->if_port value. */
-        unsigned char rx_ring_state;            /* RX ring status flags. */
-        unsigned short phy[2];                  /* PHY media interfaces available. */
-        unsigned short partner;                 /* Link partner caps. */
-        struct mii_if_info mii_if;              /* MII API hooks, info */
-        u32 msg_enable;                         /* debug message level */
-};
-
-/* The parameters for a CmdConfigure operation.
-   There are so many options that it would be difficult to document each bit.
-   We mostly use the default or recommended settings. */
-static const char i82557_config_cmd[CONFIG_DATA_SIZE] = {
-        22, 0x08, 0, 0,  0, 0, 0x32, 0x03,  1, /* 1=Use MII  0=Use AUI */
-        0, 0x2E, 0,  0x60, 0,
-        0xf2, 0x48,   0, 0x40, 0xf2, 0x80,              /* 0x40=Force full-duplex */
-        0x3f, 0x05, };
-static const char i82558_config_cmd[CONFIG_DATA_SIZE] = {
-        22, 0x08, 0, 1,  0, 0, 0x22, 0x03,  1, /* 1=Use MII  0=Use AUI */
-        0, 0x2E, 0,  0x60, 0x08, 0x88,
-        0x68, 0, 0x40, 0xf2, 0x84,              /* Disable FC */
-        0x31, 0x05, };
-
-/* PHY media interface chips. */
-static const char * const phys[] = {
-        "None", "i82553-A/B", "i82553-C", "i82503",
-        "DP83840", "80c240", "80c24", "i82555",
-        "unknown-8", "unknown-9", "DP83840A", "unknown-11",
-        "unknown-12", "unknown-13", "unknown-14", "unknown-15", };
-enum phy_chips { NonSuchPhy=0, I82553AB, I82553C, I82503, DP83840, S80C240,
-                                         S80C24, I82555, DP83840A=10, };
-static const char is_mii[] = { 0, 1, 1, 0, 1, 1, 0, 1 };
-#define EE_READ_CMD             (6)
-
-static int eepro100_init_one(struct pci_dev *pdev,
-                const struct pci_device_id *ent);
-
-static int do_eeprom_cmd(void __iomem *ioaddr, int cmd, int cmd_len);
-static int mdio_read(struct net_device *dev, int phy_id, int location);
-static void mdio_write(struct net_device *dev, int phy_id, int location, int value);
-static int speedo_open(struct net_device *dev);
-static void speedo_resume(struct net_device *dev);
-static void speedo_timer(unsigned long data);
-static void speedo_init_rx_ring(struct net_device *dev);
-static void speedo_tx_timeout(struct net_device *dev);
-static int speedo_start_xmit(struct sk_buff *skb, struct net_device *dev);
-static void speedo_refill_rx_buffers(struct net_device *dev, int force);
-static int speedo_rx(struct net_device *dev);
-static void speedo_tx_buffer_gc(struct net_device *dev);
-static irqreturn_t speedo_interrupt(int irq, void *dev_instance);
-static int speedo_close(struct net_device *dev);
-static struct net_device_stats *speedo_get_stats(struct net_device *dev);
-static int speedo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd);
-static void set_rx_mode(struct net_device *dev);
-static void speedo_show_state(struct net_device *dev);
-static const struct ethtool_ops ethtool_ops;
-
-
-
-#ifdef honor_default_port
-/* Optional driver feature to allow forcing the transceiver setting.
-   Not recommended. */
-static int mii_ctrl[8] = { 0x3300, 0x3100, 0x0000, 0x0100,
-                                                   0x2000, 0x2100, 0x0400, 0x3100};
-#endif
-
-/* How to wait for the command unit to accept a command.
-   Typically this takes 0 ticks. */
-static inline unsigned char wait_for_cmd_done(struct net_device *dev,
-                                                                                                struct speedo_private *sp)
-{
-        int wait = 1000;
-        void __iomem *cmd_ioaddr = sp->regs + SCBCmd;
-        unsigned char r;
-
-        do  {
-                udelay(1);
-                r = ioread8(cmd_ioaddr);
-        } while(r && --wait >= 0);
-
-        if (wait < 0)
-                printk(KERN_ALERT "%s: wait_for_cmd_done timeout!\n", dev->name);
-        return r;
-}
-
-static int __devinit eepro100_init_one (struct pci_dev *pdev,
-                const struct pci_device_id *ent)
-{
-        void __iomem *ioaddr;
-        int irq, pci_bar;
-        int acpi_idle_state = 0, pm;
-        static int cards_found /* = 0 */;
-        unsigned long pci_base;
-
-#ifndef MODULE
-        /* when built-in, we only print version if device is found */
-        static int did_version;
-        if (did_version++ == 0)
-                printk(version);
-#endif
-
-        /* save power state before pci_enable_device overwrites it */
-        pm = pci_find_capability(pdev, PCI_CAP_ID_PM);
-        if (pm) {
-                u16 pwr_command;
-                pci_read_config_word(pdev, pm + PCI_PM_CTRL, &pwr_command);
-                acpi_idle_state = pwr_command & PCI_PM_CTRL_STATE_MASK;
-        }
-
-        if (pci_enable_device(pdev))
-                goto err_out_free_mmio_region;
-
-        pci_set_master(pdev);
-
-        if (!request_region(pci_resource_start(pdev, 1),
-                        pci_resource_len(pdev, 1), "eepro100")) {
-                dev_err(&pdev->dev, "eepro100: cannot reserve I/O ports\n");
-                goto err_out_none;
-        }
-        if (!request_mem_region(pci_resource_start(pdev, 0),
-                        pci_resource_len(pdev, 0), "eepro100")) {
-                dev_err(&pdev->dev, "eepro100: cannot reserve MMIO region\n");
-                goto err_out_free_pio_region;
-        }
-
-        irq = pdev->irq;
-        pci_bar = use_io ? 1 : 0;
-        pci_base = pci_resource_start(pdev, pci_bar);
-        if (DEBUG & NETIF_MSG_PROBE)
-                printk("Found Intel i82557 PCI Speedo at %#lx, IRQ %d.\n",
-                       pci_base, irq);
-
-        ioaddr = pci_iomap(pdev, pci_bar, 0);
-        if (!ioaddr) {
-                dev_err(&pdev->dev, "eepro100: cannot remap IO\n");
-                goto err_out_free_mmio_region;
-        }
-
-        if (speedo_found1(pdev, ioaddr, cards_found, acpi_idle_state) == 0)
-                cards_found++;
-        else
-                goto err_out_iounmap;
-
-        return 0;
-
-err_out_iounmap: ;
-        pci_iounmap(pdev, ioaddr);
-err_out_free_mmio_region:
-        release_mem_region(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));
-err_out_free_pio_region:
-        release_region(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));
-err_out_none:
-        return -ENODEV;
-}
-
-#ifdef CONFIG_NET_POLL_CONTROLLER
-/*
- * Polling 'interrupt' - used by things like netconsole to send skbs
- * without having to re-enable interrupts. It's not called while
- * the interrupt routine is executing.
- */
-
-static void poll_speedo (struct net_device *dev)
-{
-        /* disable_irq is not very nice, but with the funny lockless design
-           we have no other choice. */
-        disable_irq(dev->irq);
-        speedo_interrupt (dev->irq, dev);
-        enable_irq(dev->irq);
-}
-#endif
-
-static int __devinit speedo_found1(struct pci_dev *pdev,
-                void __iomem *ioaddr, int card_idx, int acpi_idle_state)
-{
-        struct net_device *dev;
-        struct speedo_private *sp;
-        const char *product;
-        int i, option;
-        u16 eeprom[0x100];
-        int size;
-        void *tx_ring_space;
-        dma_addr_t tx_ring_dma;
-        DECLARE_MAC_BUF(mac);
-
-        size = TX_RING_SIZE * sizeof(struct TxFD) + sizeof(struct speedo_stats);
-        tx_ring_space = pci_alloc_consistent(pdev, size, &tx_ring_dma);
-        if (tx_ring_space == NULL)
-                return -1;
-
-        dev = alloc_etherdev(sizeof(struct speedo_private));
-        if (dev == NULL) {
-                printk(KERN_ERR "eepro100: Could not allocate ethernet device.\n");
-                pci_free_consistent(pdev, size, tx_ring_space, tx_ring_dma);
-                return -1;
-        }
-
-        SET_NETDEV_DEV(dev, &pdev->dev);
-
-        if (dev->mem_start > 0)
-                option = dev->mem_start;
-        else if (card_idx >= 0  &&  options[card_idx] >= 0)
-                option = options[card_idx];
-        else
-                option = 0;
-
-        rtnl_lock();
-        if (dev_alloc_name(dev, dev->name) < 0)
-                goto err_free_unlock;
-
-        /* Read the station address EEPROM before doing the reset.
-           Nominally his should even be done before accepting the device, but
-           then we wouldn't have a device name with which to report the error.
-           The size test is for 6 bit vs. 8 bit address serial EEPROMs.
-        */
-        {
-                void __iomem *iobase;
-                int read_cmd, ee_size;
-                u16 sum;
-                int j;
-
-                /* Use IO only to avoid postponed writes and satisfy EEPROM timing
-                   requirements. */
-                iobase = pci_iomap(pdev, 1, pci_resource_len(pdev, 1));
-                if (!iobase)
-                        goto err_free_unlock;
-                if ((do_eeprom_cmd(iobase, EE_READ_CMD << 24, 27) & 0xffe0000)
-                        == 0xffe0000) {
-                        ee_size = 0x100;
-                        read_cmd = EE_READ_CMD << 24;
-                } else {
-                        ee_size = 0x40;
-                        read_cmd = EE_READ_CMD << 22;
-                }
-
-                for (j = 0, i = 0, sum = 0; i < ee_size; i++) {
-                        u16 value = do_eeprom_cmd(iobase, read_cmd | (i << 16), 27);
-                        eeprom[i] = value;
-                        sum += value;
-                        if (i < 3) {
-                                dev->dev_addr[j++] = value;
-                                dev->dev_addr[j++] = value >> 8;
-                        }
-                }
-                if (sum != 0xBABA)
-                        printk(KERN_WARNING "%s: Invalid EEPROM checksum %#4.4x, "
-                                   "check settings before activating this device!\n",
-                                   dev->name, sum);
-                /* Don't  unregister_netdev(dev);  as the EEPro may actually be
-                   usable, especially if the MAC address is set later.
-                   On the other hand, it may be unusable if MDI data is corrupted. */
-
-                pci_iounmap(pdev, iobase);
-        }
-
-        /* Reset the chip: stop Tx and Rx processes and clear counters.
-           This takes less than 10usec and will easily finish before the next
-           action. */
-        iowrite32(PortReset, ioaddr + SCBPort);
-        ioread32(ioaddr + SCBPort);
-        udelay(10);
-
-        if (eeprom[3] & 0x0100)
-                product = "OEM i82557/i82558 10/100 Ethernet";
-        else
-                product = pci_name(pdev);
-
-        printk(KERN_INFO "%s: %s, %s, IRQ %d.\n", dev->name, product,
-                   print_mac(mac, dev->dev_addr), pdev->irq);
-
-        sp = netdev_priv(dev);
-
-        /* we must initialize this early, for mdio_{read,write} */
-        sp->regs = ioaddr;
-
-#if 1 || defined(kernel_bloat)
-        /* OK, this is pure kernel bloat.  I don't like it when other drivers
-           waste non-pageable kernel space to emit similar messages, but I need
-           them for bug reports. */
-        {
-                const char *connectors[] = {" RJ45", " BNC", " AUI", " MII"};
-                /* The self-test results must be paragraph aligned. */
-                volatile s32 *self_test_results;
-                int boguscnt = 16000;   /* Timeout for set-test. */
-                if ((eeprom[3] & 0x03) != 0x03)
-                        printk(KERN_INFO "  Receiver lock-up bug exists -- enabling"
-                                   " work-around.\n");
-                printk(KERN_INFO "  Board assembly %4.4x%2.2x-%3.3d, Physical"
-                           " connectors present:",
-                           eeprom[8], eeprom[9]>>8, eeprom[9] & 0xff);
-                for (i = 0; i < 4; i++)
-                        if (eeprom[5] & (1<<i))
-                                printk(connectors[i]);
-                printk("\n"KERN_INFO"  Primary interface chip %s PHY #%d.\n",
-                           phys[(eeprom[6]>>8)&15], eeprom[6] & 0x1f);
-                if (eeprom[7] & 0x0700)
-                        printk(KERN_INFO "    Secondary interface chip %s.\n",
-                                   phys[(eeprom[7]>>8)&7]);
-                if (((eeprom[6]>>8) & 0x3f) == DP83840
-                        ||  ((eeprom[6]>>8) & 0x3f) == DP83840A) {
-                        int mdi_reg23 = mdio_read(dev, eeprom[6] & 0x1f, 23) | 0x0422;
-                        if (congenb)
-                          mdi_reg23 |= 0x0100;
-                        printk(KERN_INFO"  DP83840 specific setup, setting register 23 to %4.4x.\n",
-                                   mdi_reg23);
-                        mdio_write(dev, eeprom[6] & 0x1f, 23, mdi_reg23);
-                }
-                if ((option >= 0) && (option & 0x70)) {
-                        printk(KERN_INFO "  Forcing %dMbs %s-duplex operation.\n",
-                                   (option & 0x20 ? 100 : 10),
-                                   (option & 0x10 ? "full" : "half"));
-                        mdio_write(dev, eeprom[6] & 0x1f, MII_BMCR,
-                                           ((option & 0x20) ? 0x2000 : 0) |     /* 100mbps? */
-                                           ((option & 0x10) ? 0x0100 : 0)); /* Full duplex? */
-                }
-
-                /* Perform a system self-test. */
-                self_test_results = (s32*) ((((long) tx_ring_space) + 15) & ~0xf);
-                self_test_results[0] = 0;
-                self_test_results[1] = -1;
-                iowrite32(tx_ring_dma | PortSelfTest, ioaddr + SCBPort);
-                do {
-                        udelay(10);
-                } while (self_test_results[1] == -1  &&  --boguscnt >= 0);
-
-                if (boguscnt < 0) {             /* Test optimized out. */
-                        printk(KERN_ERR "Self test failed, status %8.8x:\n"
-                                   KERN_ERR " Failure to initialize the i82557.\n"
-                                   KERN_ERR " Verify that the card is a bus-master"
-                                   " capable slot.\n",
-                                   self_test_results[1]);
-                } else
-                        printk(KERN_INFO "  General self-test: %s.\n"
-                                   KERN_INFO "  Serial sub-system self-test: %s.\n"
-                                   KERN_INFO "  Internal registers self-test: %s.\n"
-                                   KERN_INFO "  ROM checksum self-test: %s (%#8.8x).\n",
-                                   self_test_results[1] & 0x1000 ? "failed" : "passed",
-                                   self_test_results[1] & 0x0020 ? "failed" : "passed",
-                                   self_test_results[1] & 0x0008 ? "failed" : "passed",
-                                   self_test_results[1] & 0x0004 ? "failed" : "passed",
-                                   self_test_results[0]);
-        }
-#endif  /* kernel_bloat */
-
-        iowrite32(PortReset, ioaddr + SCBPort);
-        ioread32(ioaddr + SCBPort);
-        udelay(10);
-
-        /* Return the chip to its original power state. */
-        pci_set_power_state(pdev, acpi_idle_state);
-
-        pci_set_drvdata (pdev, dev);
-        SET_NETDEV_DEV(dev, &pdev->dev);
-
-        dev->irq = pdev->irq;
-
-        sp->pdev = pdev;
-        sp->msg_enable = DEBUG;
-        sp->acpi_pwr = acpi_idle_state;
-        sp->tx_ring = tx_ring_space;
-        sp->tx_ring_dma = tx_ring_dma;
-        sp->lstats = (struct speedo_stats *)(sp->tx_ring + TX_RING_SIZE);
-        sp->lstats_dma = TX_RING_ELEM_DMA(sp, TX_RING_SIZE);
-        init_timer(&sp->timer); /* used in ioctl() */
-        spin_lock_init(&sp->lock);
-
-        sp->mii_if.full_duplex = option >= 0 && (option & 0x10) ? 1 : 0;
-        if (card_idx >= 0) {
-                if (full_duplex[card_idx] >= 0)
-                        sp->mii_if.full_duplex = full_duplex[card_idx];
-        }
-        sp->default_port = option >= 0 ? (option & 0x0f) : 0;
-
-        sp->phy[0] = eeprom[6];
-        sp->phy[1] = eeprom[7];
-
-        sp->mii_if.phy_id = eeprom[6] & 0x1f;
-        sp->mii_if.phy_id_mask = 0x1f;
-        sp->mii_if.reg_num_mask = 0x1f;
-        sp->mii_if.dev = dev;
-        sp->mii_if.mdio_read = mdio_read;
-        sp->mii_if.mdio_write = mdio_write;
-
-        sp->rx_bug = (eeprom[3] & 0x03) == 3 ? 0 : 1;
-        if (((pdev->device > 0x1030 && (pdev->device < 0x103F)))
-            || (pdev->device == 0x2449) || (pdev->device == 0x2459)
-            || (pdev->device == 0x245D)) {
-                sp->chip_id = 1;
-        }
-
-        if (sp->rx_bug)
-                printk(KERN_INFO "  Receiver lock-up workaround activated.\n");
-
-        /* The Speedo-specific entries in the device structure. */
-        dev->open = &speedo_open;
-        dev->hard_start_xmit = &speedo_start_xmit;
-        netif_set_tx_timeout(dev, &speedo_tx_timeout, TX_TIMEOUT);
-        dev->stop = &speedo_close;
-        dev->get_stats = &speedo_get_stats;
-        dev->set_multicast_list = &set_rx_mode;
-        dev->do_ioctl = &speedo_ioctl;
-        SET_ETHTOOL_OPS(dev, &ethtool_ops);
-#ifdef CONFIG_NET_POLL_CONTROLLER
-        dev->poll_controller = &poll_speedo;
-#endif
-
-        if (register_netdevice(dev))
-                goto err_free_unlock;
-        rtnl_unlock();
-
-        return 0;
-
- err_free_unlock:
-        rtnl_unlock();
-        free_netdev(dev);
-        return -1;
-}
-
-static void do_slow_command(struct net_device *dev, struct speedo_private *sp, int cmd)
-{
-        void __iomem *cmd_ioaddr = sp->regs + SCBCmd;
-        int wait = 0;
-        do
-                if (ioread8(cmd_ioaddr) == 0) break;
-        while(++wait <= 200);
-        if (wait > 100)
-                printk(KERN_ERR "Command %4.4x never accepted (%d polls)!\n",
-                       ioread8(cmd_ioaddr), wait);
-
-        iowrite8(cmd, cmd_ioaddr);
-
-        for (wait = 0; wait <= 100; wait++)
-                if (ioread8(cmd_ioaddr) == 0) return;
-        for (; wait <= 20000; wait++)
-                if (ioread8(cmd_ioaddr) == 0) return;
-                else udelay(1);
-        printk(KERN_ERR "Command %4.4x was not accepted after %d polls!"
-               "  Current status %8.8x.\n",
-               cmd, wait, ioread32(sp->regs + SCBStatus));
-}
-
-/* Serial EEPROM section.
-   A "bit" grungy, but we work our way through bit-by-bit :->. */
-/*  EEPROM_Ctrl bits. */
-#define EE_SHIFT_CLK    0x01    /* EEPROM shift clock. */
-#define EE_CS                   0x02    /* EEPROM chip select. */
-#define EE_DATA_WRITE   0x04    /* EEPROM chip data in. */
-#define EE_DATA_READ    0x08    /* EEPROM chip data out. */
-#define EE_ENB                  (0x4800 | EE_CS)
-#define EE_WRITE_0              0x4802
-#define EE_WRITE_1              0x4806
-#define EE_OFFSET               SCBeeprom
-
-/* The fixes for the code were kindly provided by Dragan Stancevic
-   <visitor@valinux.com> to strictly follow Intel specifications of EEPROM
-   access timing.
-   The publicly available sheet 64486302 (sec. 3.1) specifies 1us access
-   interval for serial EEPROM.  However, it looks like that there is an
-   additional requirement dictating larger udelay's in the code below.
-   2000/05/24  SAW */
-static int __devinit do_eeprom_cmd(void __iomem *ioaddr, int cmd, int cmd_len)
-{
-        unsigned retval = 0;
-        void __iomem *ee_addr = ioaddr + SCBeeprom;
-
-        iowrite16(EE_ENB, ee_addr); udelay(2);
-        iowrite16(EE_ENB | EE_SHIFT_CLK, ee_addr); udelay(2);
-
-        /* Shift the command bits out. */
-        do {
-                short dataval = (cmd & (1 << cmd_len)) ? EE_WRITE_1 : EE_WRITE_0;
-                iowrite16(dataval, ee_addr); udelay(2);
-                iowrite16(dataval | EE_SHIFT_CLK, ee_addr); udelay(2);
-                retval = (retval << 1) | ((ioread16(ee_addr) & EE_DATA_READ) ? 1 : 0);
-        } while (--cmd_len >= 0);
-        iowrite16(EE_ENB, ee_addr); udelay(2);
-
-        /* Terminate the EEPROM access. */
-        iowrite16(EE_ENB & ~EE_CS, ee_addr);
-        return retval;
-}
-
-static int mdio_read(struct net_device *dev, int phy_id, int location)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        int val, boguscnt = 64*10;              /* <64 usec. to complete, typ 27 ticks */
-        iowrite32(0x08000000 | (location<<16) | (phy_id<<21), ioaddr + SCBCtrlMDI);
-        do {
-                val = ioread32(ioaddr + SCBCtrlMDI);
-                if (--boguscnt < 0) {
-                        printk(KERN_ERR " mdio_read() timed out with val = %8.8x.\n", val);
-                        break;
-                }
-        } while (! (val & 0x10000000));
-        return val & 0xffff;
-}
-
-static void mdio_write(struct net_device *dev, int phy_id, int location, int value)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        int val, boguscnt = 64*10;              /* <64 usec. to complete, typ 27 ticks */
-        iowrite32(0x04000000 | (location<<16) | (phy_id<<21) | value,
-                 ioaddr + SCBCtrlMDI);
-        do {
-                val = ioread32(ioaddr + SCBCtrlMDI);
-                if (--boguscnt < 0) {
-                        printk(KERN_ERR" mdio_write() timed out with val = %8.8x.\n", val);
-                        break;
-                }
-        } while (! (val & 0x10000000));
-}
-
-static int
-speedo_open(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        int retval;
-
-        if (netif_msg_ifup(sp))
-                printk(KERN_DEBUG "%s: speedo_open() irq %d.\n", dev->name, dev->irq);
-
-        pci_set_power_state(sp->pdev, PCI_D0);
-
-        /* Set up the Tx queue early.. */
-        sp->cur_tx = 0;
-        sp->dirty_tx = 0;
-        sp->last_cmd = NULL;
-        sp->tx_full = 0;
-        sp->in_interrupt = 0;
-
-        /* .. we can safely take handler calls during init. */
-        retval = request_irq(dev->irq, &speedo_interrupt, IRQF_SHARED, dev->name, dev);
-        if (retval) {
-                return retval;
-        }
-
-        dev->if_port = sp->default_port;
-
-#ifdef oh_no_you_dont_unless_you_honour_the_options_passed_in_to_us
-        /* Retrigger negotiation to reset previous errors. */
-        if ((sp->phy[0] & 0x8000) == 0) {
-                int phy_addr = sp->phy[0] & 0x1f ;
-                /* Use 0x3300 for restarting NWay, other values to force xcvr:
-                   0x0000 10-HD
-                   0x0100 10-FD
-                   0x2000 100-HD
-                   0x2100 100-FD
-                */
-#ifdef honor_default_port
-                mdio_write(dev, phy_addr, MII_BMCR, mii_ctrl[dev->default_port & 7]);
-#else
-                mdio_write(dev, phy_addr, MII_BMCR, 0x3300);
-#endif
-        }
-#endif
-
-        speedo_init_rx_ring(dev);
-
-        /* Fire up the hardware. */
-        iowrite16(SCBMaskAll, ioaddr + SCBCmd);
-        speedo_resume(dev);
-
-        netdevice_start(dev);
-        netif_start_queue(dev);
-
-        /* Setup the chip and configure the multicast list. */
-        sp->mc_setup_head = NULL;
-        sp->mc_setup_tail = NULL;
-        sp->flow_ctrl = sp->partner = 0;
-        sp->rx_mode = -1;                       /* Invalid -> always reset the mode. */
-        set_rx_mode(dev);
-        if ((sp->phy[0] & 0x8000) == 0)
-                sp->mii_if.advertising = mdio_read(dev, sp->phy[0] & 0x1f, MII_ADVERTISE);
-
-        mii_check_link(&sp->mii_if);
-
-        if (netif_msg_ifup(sp)) {
-                printk(KERN_DEBUG "%s: Done speedo_open(), status %8.8x.\n",
-                           dev->name, ioread16(ioaddr + SCBStatus));
-        }
-
-        /* Set the timer.  The timer serves a dual purpose:
-           1) to monitor the media interface (e.g. link beat) and perhaps switch
-           to an alternate media type
-           2) to monitor Rx activity, and restart the Rx process if the receiver
-           hangs. */
-        sp->timer.expires = RUN_AT((24*HZ)/10);                         /* 2.4 sec. */
-        sp->timer.data = (unsigned long)dev;
-        sp->timer.function = &speedo_timer;                                     /* timer handler */
-        add_timer(&sp->timer);
-
-        /* No need to wait for the command unit to accept here. */
-        if ((sp->phy[0] & 0x8000) == 0)
-                mdio_read(dev, sp->phy[0] & 0x1f, MII_BMCR);
-
-        return 0;
-}
-
-/* Start the chip hardware after a full reset. */
-static void speedo_resume(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-
-        /* Start with a Tx threshold of 256 (0x..20.... 8 byte units). */
-        sp->tx_threshold = 0x01208000;
-
-        /* Set the segment registers to '0'. */
-        if (wait_for_cmd_done(dev, sp) != 0) {
-                iowrite32(PortPartialReset, ioaddr + SCBPort);
-                udelay(10);
-        }
-
-        iowrite32(0, ioaddr + SCBPointer);
-        ioread32(ioaddr + SCBPointer);                  /* Flush to PCI. */
-        udelay(10);                     /* Bogus, but it avoids the bug. */
-
-        /* Note: these next two operations can take a while. */
-        do_slow_command(dev, sp, RxAddrLoad);
-        do_slow_command(dev, sp, CUCmdBase);
-
-        /* Load the statistics block and rx ring addresses. */
-        iowrite32(sp->lstats_dma, ioaddr + SCBPointer);
-        ioread32(ioaddr + SCBPointer);                  /* Flush to PCI */
-
-        iowrite8(CUStatsAddr, ioaddr + SCBCmd);
-        sp->lstats->done_marker = 0;
-        wait_for_cmd_done(dev, sp);
-
-        if (sp->rx_ringp[sp->cur_rx % RX_RING_SIZE] == NULL) {
-                if (netif_msg_rx_err(sp))
-                        printk(KERN_DEBUG "%s: NULL cur_rx in speedo_resume().\n",
-                                        dev->name);
-        } else {
-                iowrite32(sp->rx_ring_dma[sp->cur_rx % RX_RING_SIZE],
-                         ioaddr + SCBPointer);
-                ioread32(ioaddr + SCBPointer);          /* Flush to PCI */
-        }
-
-        /* Note: RxStart should complete instantly. */
-        do_slow_command(dev, sp, RxStart);
-        do_slow_command(dev, sp, CUDumpStats);
-
-        /* Fill the first command with our physical address. */
-        {
-                struct descriptor *ias_cmd;
-
-                ias_cmd =
-                        (struct descriptor *)&sp->tx_ring[sp->cur_tx++ % TX_RING_SIZE];
-                /* Avoid a bug(?!) here by marking the command already completed. */
-                ias_cmd->cmd_status = cpu_to_le32((CmdSuspend | CmdIASetup) | 0xa000);
-                ias_cmd->link =
-                        cpu_to_le32(TX_RING_ELEM_DMA(sp, sp->cur_tx % TX_RING_SIZE));
-                memcpy(ias_cmd->params, dev->dev_addr, 6);
-                if (sp->last_cmd)
-                        clear_suspend(sp->last_cmd);
-                sp->last_cmd = ias_cmd;
-        }
-
-        /* Start the chip's Tx process and unmask interrupts. */
-        iowrite32(TX_RING_ELEM_DMA(sp, sp->dirty_tx % TX_RING_SIZE),
-                 ioaddr + SCBPointer);
-        /* We are not ACK-ing FCP and ER in the interrupt handler yet so they should
-           remain masked --Dragan */
-        iowrite16(CUStart | SCBMaskEarlyRx | SCBMaskFlowCtl, ioaddr + SCBCmd);
-}
-
-/*
- * Sometimes the receiver stops making progress.  This routine knows how to
- * get it going again, without losing packets or being otherwise nasty like
- * a chip reset would be.  Previously the driver had a whole sequence
- * of if RxSuspended, if it's no buffers do one thing, if it's no resources,
- * do another, etc.  But those things don't really matter.  Separate logic
- * in the ISR provides for allocating buffers--the other half of operation
- * is just making sure the receiver is active.  speedo_rx_soft_reset does that.
- * This problem with the old, more involved algorithm is shown up under
- * ping floods on the order of 60K packets/second on a 100Mbps fdx network.
- */
-static void
-speedo_rx_soft_reset(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        struct RxFD *rfd;
-        void __iomem *ioaddr;
-
-        ioaddr = sp->regs;
-        if (wait_for_cmd_done(dev, sp) != 0) {
-                printk("%s: previous command stalled\n", dev->name);
-                return;
-        }
-        /*
-        * Put the hardware into a known state.
-        */
-        iowrite8(RxAbort, ioaddr + SCBCmd);
-
-        rfd = sp->rx_ringp[sp->cur_rx % RX_RING_SIZE];
-
-        rfd->rx_buf_addr = cpu_to_le32(0xffffffff);
-
-        if (wait_for_cmd_done(dev, sp) != 0) {
-                printk("%s: RxAbort command stalled\n", dev->name);
-                return;
-        }
-        iowrite32(sp->rx_ring_dma[sp->cur_rx % RX_RING_SIZE],
-                ioaddr + SCBPointer);
-        iowrite8(RxStart, ioaddr + SCBCmd);
-}
-
-
-/* Media monitoring and control. */
-static void speedo_timer(unsigned long data)
-{
-        struct net_device *dev = (struct net_device *)data;
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        int phy_num = sp->phy[0] & 0x1f;
-
-        /* We have MII and lost link beat. */
-        if ((sp->phy[0] & 0x8000) == 0) {
-                int partner = mdio_read(dev, phy_num, MII_LPA);
-                if (partner != sp->partner) {
-                        int flow_ctrl = sp->mii_if.advertising & partner & 0x0400 ? 1 : 0;
-                        if (netif_msg_link(sp)) {
-                                printk(KERN_DEBUG "%s: Link status change.\n", dev->name);
-                                printk(KERN_DEBUG "%s: Old partner %x, new %x, adv %x.\n",
-                                           dev->name, sp->partner, partner, sp->mii_if.advertising);
-                        }
-                        sp->partner = partner;
-                        if (flow_ctrl != sp->flow_ctrl) {
-                                sp->flow_ctrl = flow_ctrl;
-                                sp->rx_mode = -1;       /* Trigger a reload. */
-                        }
-                }
-        }
-        mii_check_link(&sp->mii_if);
-        if (netif_msg_timer(sp)) {
-                printk(KERN_DEBUG "%s: Media control tick, status %4.4x.\n",
-                           dev->name, ioread16(ioaddr + SCBStatus));
-        }
-        if (sp->rx_mode < 0  ||
-                (sp->rx_bug  && jiffies - sp->last_rx_time > 2*HZ)) {
-                /* We haven't received a packet in a Long Time.  We might have been
-                   bitten by the receiver hang bug.  This can be cleared by sending
-                   a set multicast list command. */
-                if (netif_msg_timer(sp))
-                        printk(KERN_DEBUG "%s: Sending a multicast list set command"
-                                   " from a timer routine,"
-                                   " m=%d, j=%ld, l=%ld.\n",
-                                   dev->name, sp->rx_mode, jiffies, sp->last_rx_time);
-                set_rx_mode(dev);
-        }
-        /* We must continue to monitor the media. */
-        sp->timer.expires = RUN_AT(2*HZ);                       /* 2.0 sec. */
-        add_timer(&sp->timer);
-}
-
-static void speedo_show_state(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        int i;
-
-        if (netif_msg_pktdata(sp)) {
-                printk(KERN_DEBUG "%s: Tx ring dump,  Tx queue %u / %u:\n",
-                    dev->name, sp->cur_tx, sp->dirty_tx);
-                for (i = 0; i < TX_RING_SIZE; i++)
-                        printk(KERN_DEBUG "%s:  %c%c%2d %8.8x.\n", dev->name,
-                            i == sp->dirty_tx % TX_RING_SIZE ? '*' : ' ',
-                            i == sp->cur_tx % TX_RING_SIZE ? '=' : ' ',
-                            i, sp->tx_ring[i].status);
-
-                printk(KERN_DEBUG "%s: Printing Rx ring"
-                    " (next to receive into %u, dirty index %u).\n",
-                    dev->name, sp->cur_rx, sp->dirty_rx);
-                for (i = 0; i < RX_RING_SIZE; i++)
-                        printk(KERN_DEBUG "%s: %c%c%c%2d %8.8x.\n", dev->name,
-                            sp->rx_ringp[i] == sp->last_rxf ? 'l' : ' ',
-                            i == sp->dirty_rx % RX_RING_SIZE ? '*' : ' ',
-                            i == sp->cur_rx % RX_RING_SIZE ? '=' : ' ',
-                            i, (sp->rx_ringp[i] != NULL) ?
-                            (unsigned)sp->rx_ringp[i]->status : 0);
-        }
-
-#if 0
-        {
-                void __iomem *ioaddr = sp->regs;
-                int phy_num = sp->phy[0] & 0x1f;
-                for (i = 0; i < 16; i++) {
-                        /* FIXME: what does it mean?  --SAW */
-                        if (i == 6) i = 21;
-                        printk(KERN_DEBUG "%s:  PHY index %d register %d is %4.4x.\n",
-                                   dev->name, phy_num, i, mdio_read(dev, phy_num, i));
-                }
-        }
-#endif
-
-}
-
-/* Initialize the Rx and Tx rings, along with various 'dev' bits. */
-static void
-speedo_init_rx_ring(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        struct RxFD *rxf, *last_rxf = NULL;
-        dma_addr_t last_rxf_dma = 0 /* to shut up the compiler */;
-        int i;
-
-        sp->cur_rx = 0;
-
-        for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb;
-                skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD));
-                if (skb)
-                        rx_align(skb);        /* Align IP on 16 byte boundary */
-                sp->rx_skbuff[i] = skb;
-                if (skb == NULL)
-                        break;                  /* OK.  Just initially short of Rx bufs. */
-                skb->dev = dev;                 /* Mark as being used by this device. */
-                rxf = (struct RxFD *)skb->data;
-                sp->rx_ringp[i] = rxf;
-                sp->rx_ring_dma[i] =
-                        pci_map_single(sp->pdev, rxf,
-                                        PKT_BUF_SZ + sizeof(struct RxFD), PCI_DMA_BIDIRECTIONAL);
-                skb_reserve(skb, sizeof(struct RxFD));
-                if (last_rxf) {
-                        last_rxf->link = cpu_to_le32(sp->rx_ring_dma[i]);
-                        pci_dma_sync_single_for_device(sp->pdev, last_rxf_dma,
-                                                                                   sizeof(struct RxFD), PCI_DMA_TODEVICE);
-                }
-                last_rxf = rxf;
-                last_rxf_dma = sp->rx_ring_dma[i];
-                rxf->status = cpu_to_le32(0x00000001);  /* '1' is flag value only. */
-                rxf->link = 0;                                          /* None yet. */
-                /* This field unused by i82557. */
-                rxf->rx_buf_addr = cpu_to_le32(0xffffffff);
-                rxf->count = cpu_to_le32(PKT_BUF_SZ << 16);
-                pci_dma_sync_single_for_device(sp->pdev, sp->rx_ring_dma[i],
-                                                                           sizeof(struct RxFD), PCI_DMA_TODEVICE);
-        }
-        sp->dirty_rx = (unsigned int)(i - RX_RING_SIZE);
-        /* Mark the last entry as end-of-list. */
-        last_rxf->status = cpu_to_le32(0xC0000002);     /* '2' is flag value only. */
-        pci_dma_sync_single_for_device(sp->pdev, sp->rx_ring_dma[RX_RING_SIZE-1],
-                                                                   sizeof(struct RxFD), PCI_DMA_TODEVICE);
-        sp->last_rxf = last_rxf;
-        sp->last_rxf_dma = last_rxf_dma;
-}
-
-static void speedo_purge_tx(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        int entry;
-
-        while ((int)(sp->cur_tx - sp->dirty_tx) > 0) {
-                entry = sp->dirty_tx % TX_RING_SIZE;
-                if (sp->tx_skbuff[entry]) {
-                        sp->stats.tx_errors++;
-                        pci_unmap_single(sp->pdev,
-                                        le32_to_cpu(sp->tx_ring[entry].tx_buf_addr0),
-                                        sp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
-                        dev_kfree_skb_irq(sp->tx_skbuff[entry]);
-                        sp->tx_skbuff[entry] = NULL;
-                }
-                sp->dirty_tx++;
-        }
-        while (sp->mc_setup_head != NULL) {
-                struct speedo_mc_block *t;
-                if (netif_msg_tx_err(sp))
-                        printk(KERN_DEBUG "%s: freeing mc frame.\n", dev->name);
-                pci_unmap_single(sp->pdev, sp->mc_setup_head->frame_dma,
-                                sp->mc_setup_head->len, PCI_DMA_TODEVICE);
-                t = sp->mc_setup_head->next;
-                kfree(sp->mc_setup_head);
-                sp->mc_setup_head = t;
-        }
-        sp->mc_setup_tail = NULL;
-        sp->tx_full = 0;
-        netif_wake_queue(dev);
-}
-
-static void reset_mii(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-
-        /* Reset the MII transceiver, suggested by Fred Young @ scalable.com. */
-        if ((sp->phy[0] & 0x8000) == 0) {
-                int phy_addr = sp->phy[0] & 0x1f;
-                int advertising = mdio_read(dev, phy_addr, MII_ADVERTISE);
-                int mii_bmcr = mdio_read(dev, phy_addr, MII_BMCR);
-                mdio_write(dev, phy_addr, MII_BMCR, 0x0400);
-                mdio_write(dev, phy_addr, MII_BMSR, 0x0000);
-                mdio_write(dev, phy_addr, MII_ADVERTISE, 0x0000);
-                mdio_write(dev, phy_addr, MII_BMCR, 0x8000);
-#ifdef honor_default_port
-                mdio_write(dev, phy_addr, MII_BMCR, mii_ctrl[dev->default_port & 7]);
-#else
-                mdio_read(dev, phy_addr, MII_BMCR);
-                mdio_write(dev, phy_addr, MII_BMCR, mii_bmcr);
-                mdio_write(dev, phy_addr, MII_ADVERTISE, advertising);
-#endif
-        }
-}
-
-static void speedo_tx_timeout(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        int status = ioread16(ioaddr + SCBStatus);
-        unsigned long flags;
-
-        if (netif_msg_tx_err(sp)) {
-                printk(KERN_WARNING "%s: Transmit timed out: status %4.4x "
-                   " %4.4x at %d/%d command %8.8x.\n",
-                   dev->name, status, ioread16(ioaddr + SCBCmd),
-                   sp->dirty_tx, sp->cur_tx,
-                   sp->tx_ring[sp->dirty_tx % TX_RING_SIZE].status);
-
-        }
-        speedo_show_state(dev);
-#if 0
-        if ((status & 0x00C0) != 0x0080
-                &&  (status & 0x003C) == 0x0010) {
-                /* Only the command unit has stopped. */
-                printk(KERN_WARNING "%s: Trying to restart the transmitter...\n",
-                           dev->name);
-                iowrite32(TX_RING_ELEM_DMA(sp, dirty_tx % TX_RING_SIZE]),
-                         ioaddr + SCBPointer);
-                iowrite16(CUStart, ioaddr + SCBCmd);
-                reset_mii(dev);
-        } else {
-#else
-        {
-#endif
-                del_timer_sync(&sp->timer);
-                /* Reset the Tx and Rx units. */
-                iowrite32(PortReset, ioaddr + SCBPort);
-                /* We may get spurious interrupts here.  But I don't think that they
-                   may do much harm.  1999/12/09 SAW */
-                udelay(10);
-                /* Disable interrupts. */
-                iowrite16(SCBMaskAll, ioaddr + SCBCmd);
-                synchronize_irq(dev->irq);
-                speedo_tx_buffer_gc(dev);
-                /* Free as much as possible.
-                   It helps to recover from a hang because of out-of-memory.
-                   It also simplifies speedo_resume() in case TX ring is full or
-                   close-to-be full. */
-                speedo_purge_tx(dev);
-                speedo_refill_rx_buffers(dev, 1);
-                spin_lock_irqsave(&sp->lock, flags);
-                speedo_resume(dev);
-                sp->rx_mode = -1;
-                dev->trans_start = jiffies;
-                spin_unlock_irqrestore(&sp->lock, flags);
-                set_rx_mode(dev); /* it takes the spinlock itself --SAW */
-                /* Reset MII transceiver.  Do it before starting the timer to serialize
-                   mdio_xxx operations.  Yes, it's a paranoya :-)  2000/05/09 SAW */
-                reset_mii(dev);
-                sp->timer.expires = RUN_AT(2*HZ);
-                add_timer(&sp->timer);
-        }
-        return;
-}
-
-static int
-speedo_start_xmit(struct sk_buff *skb, struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        int entry;
-
-        /* Prevent interrupts from changing the Tx ring from underneath us. */
-        unsigned long flags;
-
-        spin_lock_irqsave(&sp->lock, flags);
-
-        /* Check if there are enough space. */
-        if ((int)(sp->cur_tx - sp->dirty_tx) >= TX_QUEUE_LIMIT) {
-                printk(KERN_ERR "%s: incorrect tbusy state, fixed.\n", dev->name);
-                netif_stop_queue(dev);
-                sp->tx_full = 1;
-                spin_unlock_irqrestore(&sp->lock, flags);
-                return 1;
-        }
-
-        /* Calculate the Tx descriptor entry. */
-        entry = sp->cur_tx++ % TX_RING_SIZE;
-
-        sp->tx_skbuff[entry] = skb;
-        sp->tx_ring[entry].status =
-                cpu_to_le32(CmdSuspend | CmdTx | CmdTxFlex);
-        if (!(entry & ((TX_RING_SIZE>>2)-1)))
-                sp->tx_ring[entry].status |= cpu_to_le32(CmdIntr);
-        sp->tx_ring[entry].link =
-                cpu_to_le32(TX_RING_ELEM_DMA(sp, sp->cur_tx % TX_RING_SIZE));
-        sp->tx_ring[entry].tx_desc_addr =
-                cpu_to_le32(TX_RING_ELEM_DMA(sp, entry) + TX_DESCR_BUF_OFFSET);
-        /* The data region is always in one buffer descriptor. */
-        sp->tx_ring[entry].count = cpu_to_le32(sp->tx_threshold);
-        sp->tx_ring[entry].tx_buf_addr0 =
-                cpu_to_le32(pci_map_single(sp->pdev, skb->data,
-                                           skb->len, PCI_DMA_TODEVICE));
-        sp->tx_ring[entry].tx_buf_size0 = cpu_to_le32(skb->len);
-
-        /* workaround for hardware bug on 10 mbit half duplex */
-
-        if ((sp->partner == 0) && (sp->chip_id == 1)) {
-                wait_for_cmd_done(dev, sp);
-                iowrite8(0 , ioaddr + SCBCmd);
-                udelay(1);
-        }
-
-        /* Trigger the command unit resume. */
-        wait_for_cmd_done(dev, sp);
-        clear_suspend(sp->last_cmd);
-        /* We want the time window between clearing suspend flag on the previous
-           command and resuming CU to be as small as possible.
-           Interrupts in between are very undesired.  --SAW */
-        iowrite8(CUResume, ioaddr + SCBCmd);
-        sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry];
-
-        /* Leave room for set_rx_mode(). If there is no more space than reserved
-           for multicast filter mark the ring as full. */
-        if ((int)(sp->cur_tx - sp->dirty_tx) >= TX_QUEUE_LIMIT) {
-                netif_stop_queue(dev);
-                sp->tx_full = 1;
-        }
-
-        spin_unlock_irqrestore(&sp->lock, flags);
-
-        dev->trans_start = jiffies;
-
-        return 0;
-}
-
-static void speedo_tx_buffer_gc(struct net_device *dev)
-{
-        unsigned int dirty_tx;
-        struct speedo_private *sp = netdev_priv(dev);
-
-        dirty_tx = sp->dirty_tx;
-        while ((int)(sp->cur_tx - dirty_tx) > 0) {
-                int entry = dirty_tx % TX_RING_SIZE;
-                int status = le32_to_cpu(sp->tx_ring[entry].status);
-
-                if (netif_msg_tx_done(sp))
-                        printk(KERN_DEBUG " scavenge candidate %d status %4.4x.\n",
-                                   entry, status);
-                if ((status & StatusComplete) == 0)
-                        break;                  /* It still hasn't been processed. */
-                if (status & TxUnderrun)
-                        if (sp->tx_threshold < 0x01e08000) {
-                                if (netif_msg_tx_err(sp))
-                                        printk(KERN_DEBUG "%s: TX underrun, threshold adjusted.\n",
-                                                   dev->name);
-                                sp->tx_threshold += 0x00040000;
-                        }
-                /* Free the original skb. */
-                if (sp->tx_skbuff[entry]) {
-                        sp->stats.tx_packets++; /* Count only user packets. */
-                        sp->stats.tx_bytes += sp->tx_skbuff[entry]->len;
-                        pci_unmap_single(sp->pdev,
-                                        le32_to_cpu(sp->tx_ring[entry].tx_buf_addr0),
-                                        sp->tx_skbuff[entry]->len, PCI_DMA_TODEVICE);
-                        dev_kfree_skb_irq(sp->tx_skbuff[entry]);
-                        sp->tx_skbuff[entry] = NULL;
-                }
-                dirty_tx++;
-        }
-
-        if (netif_msg_tx_err(sp) && (int)(sp->cur_tx - dirty_tx) > TX_RING_SIZE) {
-                printk(KERN_ERR "out-of-sync dirty pointer, %d vs. %d,"
-                           " full=%d.\n",
-                           dirty_tx, sp->cur_tx, sp->tx_full);
-                dirty_tx += TX_RING_SIZE;
-        }
-
-        while (sp->mc_setup_head != NULL
-                   && (int)(dirty_tx - sp->mc_setup_head->tx - 1) > 0) {
-                struct speedo_mc_block *t;
-                if (netif_msg_tx_err(sp))
-                        printk(KERN_DEBUG "%s: freeing mc frame.\n", dev->name);
-                pci_unmap_single(sp->pdev, sp->mc_setup_head->frame_dma,
-                                sp->mc_setup_head->len, PCI_DMA_TODEVICE);
-                t = sp->mc_setup_head->next;
-                kfree(sp->mc_setup_head);
-                sp->mc_setup_head = t;
-        }
-        if (sp->mc_setup_head == NULL)
-                sp->mc_setup_tail = NULL;
-
-        sp->dirty_tx = dirty_tx;
-}
-
-/* The interrupt handler does all of the Rx thread work and cleans up
-   after the Tx thread. */
-static irqreturn_t speedo_interrupt(int irq, void *dev_instance)
-{
-        struct net_device *dev = (struct net_device *)dev_instance;
-        struct speedo_private *sp;
-        void __iomem *ioaddr;
-        long boguscnt = max_interrupt_work;
-        unsigned short status;
-        unsigned int handled = 0;
-
-        sp = netdev_priv(dev);
-        ioaddr = sp->regs;
-
-#ifndef final_version
-        /* A lock to prevent simultaneous entry on SMP machines. */
-        if (test_and_set_bit(0, (void*)&sp->in_interrupt)) {
-                printk(KERN_ERR"%s: SMP simultaneous entry of an interrupt handler.\n",
-                           dev->name);
-                sp->in_interrupt = 0;   /* Avoid halting machine. */
-                return IRQ_NONE;
-        }
-#endif
-
-        do {
-                status = ioread16(ioaddr + SCBStatus);
-                /* Acknowledge all of the current interrupt sources ASAP. */
-                /* Will change from 0xfc00 to 0xff00 when we start handling
-                   FCP and ER interrupts --Dragan */
-                iowrite16(status & 0xfc00, ioaddr + SCBStatus);
-
-                if (netif_msg_intr(sp))
-                        printk(KERN_DEBUG "%s: interrupt  status=%#4.4x.\n",
-                                   dev->name, status);
-
-                if ((status & 0xfc00) == 0)
-                        break;
-                handled = 1;
-
-
-                if ((status & 0x5000) ||        /* Packet received, or Rx error. */
-                        (sp->rx_ring_state&(RrNoMem|RrPostponed)) == RrPostponed)
-                                                                        /* Need to gather the postponed packet. */
-                        speedo_rx(dev);
-
-                /* Always check if all rx buffers are allocated.  --SAW */
-                speedo_refill_rx_buffers(dev, 0);
-
-                spin_lock(&sp->lock);
-                /*
-                 * The chip may have suspended reception for various reasons.
-                 * Check for that, and re-prime it should this be the case.
-                 */
-                switch ((status >> 2) & 0xf) {
-                case 0: /* Idle */
-                        break;
-                case 1: /* Suspended */
-                case 2: /* No resources (RxFDs) */
-                case 9: /* Suspended with no more RBDs */
-                case 10: /* No resources due to no RBDs */
-                case 12: /* Ready with no RBDs */
-                        speedo_rx_soft_reset(dev);
-                        break;
-                case 3:  case 5:  case 6:  case 7:  case 8:
-                case 11:  case 13:  case 14:  case 15:
-                        /* these are all reserved values */
-                        break;
-                }
-
-
-                /* User interrupt, Command/Tx unit interrupt or CU not active. */
-                if (status & 0xA400) {
-                        speedo_tx_buffer_gc(dev);
-                        if (sp->tx_full
-                                && (int)(sp->cur_tx - sp->dirty_tx) < TX_QUEUE_UNFULL) {
-                                /* The ring is no longer full. */
-                                sp->tx_full = 0;
-                                netif_wake_queue(dev); /* Attention: under a spinlock.  --SAW */
-                        }
-                }
-
-                spin_unlock(&sp->lock);
-
-                if (--boguscnt < 0) {
-                        printk(KERN_ERR "%s: Too much work at interrupt, status=0x%4.4x.\n",
-                                   dev->name, status);
-                        /* Clear all interrupt sources. */
-                        /* Will change from 0xfc00 to 0xff00 when we start handling
-                           FCP and ER interrupts --Dragan */
-                        iowrite16(0xfc00, ioaddr + SCBStatus);
-                        break;
-                }
-        } while (1);
-
-        if (netif_msg_intr(sp))
-                printk(KERN_DEBUG "%s: exiting interrupt, status=%#4.4x.\n",
-                           dev->name, ioread16(ioaddr + SCBStatus));
-
-        clear_bit(0, (void*)&sp->in_interrupt);
-        return IRQ_RETVAL(handled);
-}
-
-static inline struct RxFD *speedo_rx_alloc(struct net_device *dev, int entry)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        struct RxFD *rxf;
-        struct sk_buff *skb;
-        /* Get a fresh skbuff to replace the consumed one. */
-        skb = dev_alloc_skb(PKT_BUF_SZ + sizeof(struct RxFD));
-        if (skb)
-                rx_align(skb);          /* Align IP on 16 byte boundary */
-        sp->rx_skbuff[entry] = skb;
-        if (skb == NULL) {
-                sp->rx_ringp[entry] = NULL;
-                return NULL;
-        }
-        rxf = sp->rx_ringp[entry] = (struct RxFD *)skb->data;
-        sp->rx_ring_dma[entry] =
-                pci_map_single(sp->pdev, rxf,
-                                           PKT_BUF_SZ + sizeof(struct RxFD), PCI_DMA_FROMDEVICE);
-        skb->dev = dev;
-        skb_reserve(skb, sizeof(struct RxFD));
-        rxf->rx_buf_addr = cpu_to_le32(0xffffffff);
-        pci_dma_sync_single_for_device(sp->pdev, sp->rx_ring_dma[entry],
-                                                                   sizeof(struct RxFD), PCI_DMA_TODEVICE);
-        return rxf;
-}
-
-static inline void speedo_rx_link(struct net_device *dev, int entry,
-                                                                  struct RxFD *rxf, dma_addr_t rxf_dma)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        rxf->status = cpu_to_le32(0xC0000001);  /* '1' for driver use only. */
-        rxf->link = 0;                  /* None yet. */
-        rxf->count = cpu_to_le32(PKT_BUF_SZ << 16);
-        sp->last_rxf->link = cpu_to_le32(rxf_dma);
-        sp->last_rxf->status &= cpu_to_le32(~0xC0000000);
-        pci_dma_sync_single_for_device(sp->pdev, sp->last_rxf_dma,
-                                                                   sizeof(struct RxFD), PCI_DMA_TODEVICE);
-        sp->last_rxf = rxf;
-        sp->last_rxf_dma = rxf_dma;
-}
-
-static int speedo_refill_rx_buf(struct net_device *dev, int force)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        int entry;
-        struct RxFD *rxf;
-
-        entry = sp->dirty_rx % RX_RING_SIZE;
-        if (sp->rx_skbuff[entry] == NULL) {
-                rxf = speedo_rx_alloc(dev, entry);
-                if (rxf == NULL) {
-                        unsigned int forw;
-                        int forw_entry;
-                        if (netif_msg_rx_err(sp) || !(sp->rx_ring_state & RrOOMReported)) {
-                                printk(KERN_WARNING "%s: can't fill rx buffer (force %d)!\n",
-                                                dev->name, force);
-                                sp->rx_ring_state |= RrOOMReported;
-                        }
-                        speedo_show_state(dev);
-                        if (!force)
-                                return -1;      /* Better luck next time!  */
-                        /* Borrow an skb from one of next entries. */
-                        for (forw = sp->dirty_rx + 1; forw != sp->cur_rx; forw++)
-                                if (sp->rx_skbuff[forw % RX_RING_SIZE] != NULL)
-                                        break;
-                        if (forw == sp->cur_rx)
-                                return -1;
-                        forw_entry = forw % RX_RING_SIZE;
-                        sp->rx_skbuff[entry] = sp->rx_skbuff[forw_entry];
-                        sp->rx_skbuff[forw_entry] = NULL;
-                        rxf = sp->rx_ringp[forw_entry];
-                        sp->rx_ringp[forw_entry] = NULL;
-                        sp->rx_ringp[entry] = rxf;
-                }
-        } else {
-                rxf = sp->rx_ringp[entry];
-        }
-        speedo_rx_link(dev, entry, rxf, sp->rx_ring_dma[entry]);
-        sp->dirty_rx++;
-        sp->rx_ring_state &= ~(RrNoMem|RrOOMReported); /* Mark the progress. */
-        return 0;
-}
-
-static void speedo_refill_rx_buffers(struct net_device *dev, int force)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-
-        /* Refill the RX ring. */
-        while ((int)(sp->cur_rx - sp->dirty_rx) > 0 &&
-                        speedo_refill_rx_buf(dev, force) != -1);
-}
-
-static int
-speedo_rx(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        int entry = sp->cur_rx % RX_RING_SIZE;
-        int rx_work_limit = sp->dirty_rx + RX_RING_SIZE - sp->cur_rx;
-        int alloc_ok = 1;
-        int npkts = 0;
-
-        if (netif_msg_intr(sp))
-                printk(KERN_DEBUG " In speedo_rx().\n");
-        /* If we own the next entry, it's a new packet. Send it up. */
-        while (sp->rx_ringp[entry] != NULL) {
-                int status;
-                int pkt_len;
-
-                pci_dma_sync_single_for_cpu(sp->pdev, sp->rx_ring_dma[entry],
-                                                                        sizeof(struct RxFD), PCI_DMA_FROMDEVICE);
-                status = le32_to_cpu(sp->rx_ringp[entry]->status);
-                pkt_len = le32_to_cpu(sp->rx_ringp[entry]->count) & 0x3fff;
-
-                if (!(status & RxComplete))
-                        break;
-
-                if (--rx_work_limit < 0)
-                        break;
-
-                /* Check for a rare out-of-memory case: the current buffer is
-                   the last buffer allocated in the RX ring.  --SAW */
-                if (sp->last_rxf == sp->rx_ringp[entry]) {
-                        /* Postpone the packet.  It'll be reaped at an interrupt when this
-                           packet is no longer the last packet in the ring. */
-                        if (netif_msg_rx_err(sp))
-                                printk(KERN_DEBUG "%s: RX packet postponed!\n",
-                                           dev->name);
-                        sp->rx_ring_state |= RrPostponed;
-                        break;
-                }
-
-                if (netif_msg_rx_status(sp))
-                        printk(KERN_DEBUG "  speedo_rx() status %8.8x len %d.\n", status,
-                                   pkt_len);
-                if ((status & (RxErrTooBig|RxOK|0x0f90)) != RxOK) {
-                        if (status & RxErrTooBig)
-                                printk(KERN_ERR "%s: Ethernet frame overran the Rx buffer, "
-                                           "status %8.8x!\n", dev->name, status);
-                        else if (! (status & RxOK)) {
-                                /* There was a fatal error.  This *should* be impossible. */
-                                sp->stats.rx_errors++;
-                                printk(KERN_ERR "%s: Anomalous event in speedo_rx(), "
-                                           "status %8.8x.\n",
-                                           dev->name, status);
-                        }
-                } else {
-                        struct sk_buff *skb;
-
-                        /* Check if the packet is long enough to just accept without
-                           copying to a properly sized skbuff. */
-                        if (pkt_len < rx_copybreak
-                                && (skb = dev_alloc_skb(pkt_len + 2)) != NULL) {
-                                skb_reserve(skb, 2);    /* Align IP on 16 byte boundaries */
-                                /* 'skb_put()' points to the start of sk_buff data area. */
-                                pci_dma_sync_single_for_cpu(sp->pdev, sp->rx_ring_dma[entry],
-                                                                                        sizeof(struct RxFD) + pkt_len,
-                                                                                        PCI_DMA_FROMDEVICE);
-
-#if 1 || USE_IP_CSUM
-                                /* Packet is in one chunk -- we can copy + cksum. */
-                                skb_copy_to_linear_data(skb, sp->rx_skbuff[entry]->data, pkt_len);
-                                skb_put(skb, pkt_len);
-#else
-                                skb_copy_from_linear_data(sp->rx_skbuff[entry],
-                                                          skb_put(skb, pkt_len),
-                                                          pkt_len);
-#endif
-                                pci_dma_sync_single_for_device(sp->pdev, sp->rx_ring_dma[entry],
-                                                                                           sizeof(struct RxFD) + pkt_len,
-                                                                                           PCI_DMA_FROMDEVICE);
-                                npkts++;
-                        } else {
-                                /* Pass up the already-filled skbuff. */
-                                skb = sp->rx_skbuff[entry];
-                                if (skb == NULL) {
-                                        printk(KERN_ERR "%s: Inconsistent Rx descriptor chain.\n",
-                                                   dev->name);
-                                        break;
-                                }
-                                sp->rx_skbuff[entry] = NULL;
-                                skb_put(skb, pkt_len);
-                                npkts++;
-                                sp->rx_ringp[entry] = NULL;
-                                pci_unmap_single(sp->pdev, sp->rx_ring_dma[entry],
-                                                                 PKT_BUF_SZ + sizeof(struct RxFD),
-                                                                 PCI_DMA_FROMDEVICE);
-                        }
-                        skb->protocol = eth_type_trans(skb, dev);
-                        netif_rx(skb);
-                        dev->last_rx = jiffies;
-                        sp->stats.rx_packets++;
-                        sp->stats.rx_bytes += pkt_len;
-                }
-                entry = (++sp->cur_rx) % RX_RING_SIZE;
-                sp->rx_ring_state &= ~RrPostponed;
-                /* Refill the recently taken buffers.
-                   Do it one-by-one to handle traffic bursts better. */
-                if (alloc_ok && speedo_refill_rx_buf(dev, 0) == -1)
-                        alloc_ok = 0;
-        }
-
-        /* Try hard to refill the recently taken buffers. */
-        speedo_refill_rx_buffers(dev, 1);
-
-        if (npkts)
-                sp->last_rx_time = jiffies;
-
-        return 0;
-}
-
-static int
-speedo_close(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        int i;
-
-        netdevice_stop(dev);
-        netif_stop_queue(dev);
-
-        if (netif_msg_ifdown(sp))
-                printk(KERN_DEBUG "%s: Shutting down ethercard, status was %4.4x.\n",
-                           dev->name, ioread16(ioaddr + SCBStatus));
-
-        /* Shut off the media monitoring timer. */
-        del_timer_sync(&sp->timer);
-
-        iowrite16(SCBMaskAll, ioaddr + SCBCmd);
-
-        /* Shutting down the chip nicely fails to disable flow control. So.. */
-        iowrite32(PortPartialReset, ioaddr + SCBPort);
-        ioread32(ioaddr + SCBPort); /* flush posted write */
-        /*
-         * The chip requires a 10 microsecond quiet period.  Wait here!
-         */
-        udelay(10);
-
-        free_irq(dev->irq, dev);
-        speedo_show_state(dev);
-
-    /* Free all the skbuffs in the Rx and Tx queues. */
-        for (i = 0; i < RX_RING_SIZE; i++) {
-                struct sk_buff *skb = sp->rx_skbuff[i];
-                sp->rx_skbuff[i] = NULL;
-                /* Clear the Rx descriptors. */
-                if (skb) {
-                        pci_unmap_single(sp->pdev,
-                                         sp->rx_ring_dma[i],
-                                         PKT_BUF_SZ + sizeof(struct RxFD), PCI_DMA_FROMDEVICE);
-                        dev_kfree_skb(skb);
-                }
-        }
-
-        for (i = 0; i < TX_RING_SIZE; i++) {
-                struct sk_buff *skb = sp->tx_skbuff[i];
-                sp->tx_skbuff[i] = NULL;
-                /* Clear the Tx descriptors. */
-                if (skb) {
-                        pci_unmap_single(sp->pdev,
-                                         le32_to_cpu(sp->tx_ring[i].tx_buf_addr0),
-                                         skb->len, PCI_DMA_TODEVICE);
-                        dev_kfree_skb(skb);
-                }
-        }
-
-        /* Free multicast setting blocks. */
-        for (i = 0; sp->mc_setup_head != NULL; i++) {
-                struct speedo_mc_block *t;
-                t = sp->mc_setup_head->next;
-                kfree(sp->mc_setup_head);
-                sp->mc_setup_head = t;
-        }
-        sp->mc_setup_tail = NULL;
-        if (netif_msg_ifdown(sp))
-                printk(KERN_DEBUG "%s: %d multicast blocks dropped.\n", dev->name, i);
-
-        pci_set_power_state(sp->pdev, PCI_D2);
-
-        return 0;
-}
-
-/* The Speedo-3 has an especially awkward and unusable method of getting
-   statistics out of the chip.  It takes an unpredictable length of time
-   for the dump-stats command to complete.  To avoid a busy-wait loop we
-   update the stats with the previous dump results, and then trigger a
-   new dump.
-
-   Oh, and incoming frames are dropped while executing dump-stats!
-   */
-static struct net_device_stats *
-speedo_get_stats(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-
-        /* Update only if the previous dump finished. */
-        if (sp->lstats->done_marker == cpu_to_le32(0xA007)) {
-                sp->stats.tx_aborted_errors += le32_to_cpu(sp->lstats->tx_coll16_errs);
-                sp->stats.tx_window_errors += le32_to_cpu(sp->lstats->tx_late_colls);
-                sp->stats.tx_fifo_errors += le32_to_cpu(sp->lstats->tx_underruns);
-                sp->stats.tx_fifo_errors += le32_to_cpu(sp->lstats->tx_lost_carrier);
-                /*sp->stats.tx_deferred += le32_to_cpu(sp->lstats->tx_deferred);*/
-                sp->stats.collisions += le32_to_cpu(sp->lstats->tx_total_colls);
-                sp->stats.rx_crc_errors += le32_to_cpu(sp->lstats->rx_crc_errs);
-                sp->stats.rx_frame_errors += le32_to_cpu(sp->lstats->rx_align_errs);
-                sp->stats.rx_over_errors += le32_to_cpu(sp->lstats->rx_resource_errs);
-                sp->stats.rx_fifo_errors += le32_to_cpu(sp->lstats->rx_overrun_errs);
-                sp->stats.rx_length_errors += le32_to_cpu(sp->lstats->rx_runt_errs);
-                sp->lstats->done_marker = 0x0000;
-                if (netif_running(dev)) {
-                        unsigned long flags;
-                        /* Take a spinlock to make wait_for_cmd_done and sending the
-                           command atomic.  --SAW */
-                        spin_lock_irqsave(&sp->lock, flags);
-                        wait_for_cmd_done(dev, sp);
-                        iowrite8(CUDumpStats, ioaddr + SCBCmd);
-                        spin_unlock_irqrestore(&sp->lock, flags);
-                }
-        }
-        return &sp->stats;
-}
-
-static void speedo_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        strncpy(info->driver, "eepro100", sizeof(info->driver)-1);
-        strncpy(info->version, version, sizeof(info->version)-1);
-        if (sp->pdev)
-                strcpy(info->bus_info, pci_name(sp->pdev));
-}
-
-static int speedo_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        spin_lock_irq(&sp->lock);
-        mii_ethtool_gset(&sp->mii_if, ecmd);
-        spin_unlock_irq(&sp->lock);
-        return 0;
-}
-
-static int speedo_set_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        int res;
-        spin_lock_irq(&sp->lock);
-        res = mii_ethtool_sset(&sp->mii_if, ecmd);
-        spin_unlock_irq(&sp->lock);
-        return res;
-}
-
-static int speedo_nway_reset(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        return mii_nway_restart(&sp->mii_if);
-}
-
-static u32 speedo_get_link(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        return mii_link_ok(&sp->mii_if);
-}
-
-static u32 speedo_get_msglevel(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        return sp->msg_enable;
-}
-
-static void speedo_set_msglevel(struct net_device *dev, u32 v)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        sp->msg_enable = v;
-}
-
-static const struct ethtool_ops ethtool_ops = {
-        .get_drvinfo = speedo_get_drvinfo,
-        .get_settings = speedo_get_settings,
-        .set_settings = speedo_set_settings,
-        .nway_reset = speedo_nway_reset,
-        .get_link = speedo_get_link,
-        .get_msglevel = speedo_get_msglevel,
-        .set_msglevel = speedo_set_msglevel,
-};
-
-static int speedo_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        struct mii_ioctl_data *data = if_mii(rq);
-        int phy = sp->phy[0] & 0x1f;
-        int saved_acpi;
-        int t;
-
-    switch(cmd) {
-        case SIOCGMIIPHY:               /* Get address of MII PHY in use. */
-                data->phy_id = phy;
-
-        case SIOCGMIIREG:               /* Read MII PHY register. */
-                /* FIXME: these operations need to be serialized with MDIO
-                   access from the timeout handler.
-                   They are currently serialized only with MDIO access from the
-                   timer routine.  2000/05/09 SAW */
-                saved_acpi = pci_set_power_state(sp->pdev, PCI_D0);
-                t = del_timer_sync(&sp->timer);
-                data->val_out = mdio_read(dev, data->phy_id & 0x1f, data->reg_num & 0x1f);
-                if (t)
-                        add_timer(&sp->timer); /* may be set to the past  --SAW */
-                pci_set_power_state(sp->pdev, saved_acpi);
-                return 0;
-
-        case SIOCSMIIREG:               /* Write MII PHY register. */
-                if (!capable(CAP_NET_ADMIN))
-                        return -EPERM;
-                saved_acpi = pci_set_power_state(sp->pdev, PCI_D0);
-                t = del_timer_sync(&sp->timer);
-                mdio_write(dev, data->phy_id, data->reg_num, data->val_in);
-                if (t)
-                        add_timer(&sp->timer); /* may be set to the past  --SAW */
-                pci_set_power_state(sp->pdev, saved_acpi);
-                return 0;
-        default:
-                return -EOPNOTSUPP;
-        }
-}
-
-/* Set or clear the multicast filter for this adaptor.
-   This is very ugly with Intel chips -- we usually have to execute an
-   entire configuration command, plus process a multicast command.
-   This is complicated.  We must put a large configuration command and
-   an arbitrarily-sized multicast command in the transmit list.
-   To minimize the disruption -- the previous command might have already
-   loaded the link -- we convert the current command block, normally a Tx
-   command, into a no-op and link it to the new command.
-*/
-static void set_rx_mode(struct net_device *dev)
-{
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        struct descriptor *last_cmd;
-        char new_rx_mode;
-        unsigned long flags;
-        int entry, i;
-
-        if (dev->flags & IFF_PROMISC) {                 /* Set promiscuous. */
-                new_rx_mode = 3;
-        } else if ((dev->flags & IFF_ALLMULTI)  ||
-                           dev->mc_count > multicast_filter_limit) {
-                new_rx_mode = 1;
-        } else
-                new_rx_mode = 0;
-
-        if (netif_msg_rx_status(sp))
-                printk(KERN_DEBUG "%s: set_rx_mode %d -> %d\n", dev->name,
-                                sp->rx_mode, new_rx_mode);
-
-        if ((int)(sp->cur_tx - sp->dirty_tx) > TX_RING_SIZE - TX_MULTICAST_SIZE) {
-            /* The Tx ring is full -- don't add anything!  Hope the mode will be
-                 * set again later. */
-                sp->rx_mode = -1;
-                return;
-        }
-
-        if (new_rx_mode != sp->rx_mode) {
-                u8 *config_cmd_data;
-
-                spin_lock_irqsave(&sp->lock, flags);
-                entry = sp->cur_tx++ % TX_RING_SIZE;
-                last_cmd = sp->last_cmd;
-                sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry];
-
-                sp->tx_skbuff[entry] = NULL;                    /* Redundant. */
-                sp->tx_ring[entry].status = cpu_to_le32(CmdSuspend | CmdConfigure);
-                sp->tx_ring[entry].link =
-                        cpu_to_le32(TX_RING_ELEM_DMA(sp, (entry + 1) % TX_RING_SIZE));
-                config_cmd_data = (void *)&sp->tx_ring[entry].tx_desc_addr;
-                /* Construct a full CmdConfig frame. */
-                memcpy(config_cmd_data, i82558_config_cmd, CONFIG_DATA_SIZE);
-                config_cmd_data[1] = (txfifo << 4) | rxfifo;
-                config_cmd_data[4] = rxdmacount;
-                config_cmd_data[5] = txdmacount + 0x80;
-                config_cmd_data[15] |= (new_rx_mode & 2) ? 1 : 0;
-                /* 0x80 doesn't disable FC 0x84 does.
-                   Disable Flow control since we are not ACK-ing any FC interrupts
-                   for now. --Dragan */
-                config_cmd_data[19] = 0x84;
-                config_cmd_data[19] |= sp->mii_if.full_duplex ? 0x40 : 0;
-                config_cmd_data[21] = (new_rx_mode & 1) ? 0x0D : 0x05;
-                if (sp->phy[0] & 0x8000) {                      /* Use the AUI port instead. */
-                        config_cmd_data[15] |= 0x80;
-                        config_cmd_data[8] = 0;
-                }
-                /* Trigger the command unit resume. */
-                wait_for_cmd_done(dev, sp);
-                clear_suspend(last_cmd);
-                iowrite8(CUResume, ioaddr + SCBCmd);
-                if ((int)(sp->cur_tx - sp->dirty_tx) >= TX_QUEUE_LIMIT) {
-                        netif_stop_queue(dev);
-                        sp->tx_full = 1;
-                }
-                spin_unlock_irqrestore(&sp->lock, flags);
-        }
-
-        if (new_rx_mode == 0  &&  dev->mc_count < 4) {
-                /* The simple case of 0-3 multicast list entries occurs often, and
-                   fits within one tx_ring[] entry. */
-                struct dev_mc_list *mclist;
-                __le16 *setup_params, *eaddrs;
-
-                spin_lock_irqsave(&sp->lock, flags);
-                entry = sp->cur_tx++ % TX_RING_SIZE;
-                last_cmd = sp->last_cmd;
-                sp->last_cmd = (struct descriptor *)&sp->tx_ring[entry];
-
-                sp->tx_skbuff[entry] = NULL;
-                sp->tx_ring[entry].status = cpu_to_le32(CmdSuspend | CmdMulticastList);
-                sp->tx_ring[entry].link =
-                        cpu_to_le32(TX_RING_ELEM_DMA(sp, (entry + 1) % TX_RING_SIZE));
-                sp->tx_ring[entry].tx_desc_addr = 0; /* Really MC list count. */
-                setup_params = (__le16 *)&sp->tx_ring[entry].tx_desc_addr;
-                *setup_params++ = cpu_to_le16(dev->mc_count*6);
-                /* Fill in the multicast addresses. */
-                for (i = 0, mclist = dev->mc_list; i < dev->mc_count;
-                         i++, mclist = mclist->next) {
-                        eaddrs = (__le16 *)mclist->dmi_addr;
-                        *setup_params++ = *eaddrs++;
-                        *setup_params++ = *eaddrs++;
-                        *setup_params++ = *eaddrs++;
-                }
-
-                wait_for_cmd_done(dev, sp);
-                clear_suspend(last_cmd);
-                /* Immediately trigger the command unit resume. */
-                iowrite8(CUResume, ioaddr + SCBCmd);
-
-                if ((int)(sp->cur_tx - sp->dirty_tx) >= TX_QUEUE_LIMIT) {
-                        netif_stop_queue(dev);
-                        sp->tx_full = 1;
-                }
-                spin_unlock_irqrestore(&sp->lock, flags);
-        } else if (new_rx_mode == 0) {
-                struct dev_mc_list *mclist;
-                __le16 *setup_params, *eaddrs;
-                struct speedo_mc_block *mc_blk;
-                struct descriptor *mc_setup_frm;
-                int i;
-
-                mc_blk = kmalloc(sizeof(*mc_blk) + 2 + multicast_filter_limit*6,
-                                                 GFP_ATOMIC);
-                if (mc_blk == NULL) {
-                        printk(KERN_ERR "%s: Failed to allocate a setup frame.\n",
-                                   dev->name);
-                        sp->rx_mode = -1; /* We failed, try again. */
-                        return;
-                }
-                mc_blk->next = NULL;
-                mc_blk->len = 2 + multicast_filter_limit*6;
-                mc_blk->frame_dma =
-                        pci_map_single(sp->pdev, &mc_blk->frame, mc_blk->len,
-                                        PCI_DMA_TODEVICE);
-                mc_setup_frm = &mc_blk->frame;
-
-                /* Fill the setup frame. */
-                if (netif_msg_ifup(sp))
-                        printk(KERN_DEBUG "%s: Constructing a setup frame at %p.\n",
-                                   dev->name, mc_setup_frm);
-                mc_setup_frm->cmd_status =
-                        cpu_to_le32(CmdSuspend | CmdIntr | CmdMulticastList);
-                /* Link set below. */
-                setup_params = (__le16 *)&mc_setup_frm->params;
-                *setup_params++ = cpu_to_le16(dev->mc_count*6);
-                /* Fill in the multicast addresses. */
-                for (i = 0, mclist = dev->mc_list; i < dev->mc_count;
-                         i++, mclist = mclist->next) {
-                        eaddrs = (__le16 *)mclist->dmi_addr;
-                        *setup_params++ = *eaddrs++;
-                        *setup_params++ = *eaddrs++;
-                        *setup_params++ = *eaddrs++;
-                }
-
-                /* Disable interrupts while playing with the Tx Cmd list. */
-                spin_lock_irqsave(&sp->lock, flags);
-
-                if (sp->mc_setup_tail)
-                        sp->mc_setup_tail->next = mc_blk;
-                else
-                        sp->mc_setup_head = mc_blk;
-                sp->mc_setup_tail = mc_blk;
-                mc_blk->tx = sp->cur_tx;
-
-                entry = sp->cur_tx++ % TX_RING_SIZE;
-                last_cmd = sp->last_cmd;
-                sp->last_cmd = mc_setup_frm;
-
-                /* Change the command to a NoOp, pointing to the CmdMulti command. */
-                sp->tx_skbuff[entry] = NULL;
-                sp->tx_ring[entry].status = cpu_to_le32(CmdNOp);
-                sp->tx_ring[entry].link = cpu_to_le32(mc_blk->frame_dma);
-
-                /* Set the link in the setup frame. */
-                mc_setup_frm->link =
-                        cpu_to_le32(TX_RING_ELEM_DMA(sp, (entry + 1) % TX_RING_SIZE));
-
-                pci_dma_sync_single_for_device(sp->pdev, mc_blk->frame_dma,
-                                                                           mc_blk->len, PCI_DMA_TODEVICE);
-
-                wait_for_cmd_done(dev, sp);
-                clear_suspend(last_cmd);
-                /* Immediately trigger the command unit resume. */
-                iowrite8(CUResume, ioaddr + SCBCmd);
-
-                if ((int)(sp->cur_tx - sp->dirty_tx) >= TX_QUEUE_LIMIT) {
-                        netif_stop_queue(dev);
-                        sp->tx_full = 1;
-                }
-                spin_unlock_irqrestore(&sp->lock, flags);
-
-                if (netif_msg_rx_status(sp))
-                        printk(" CmdMCSetup frame length %d in entry %d.\n",
-                                   dev->mc_count, entry);
-        }
-
-        sp->rx_mode = new_rx_mode;
-}
-
-#ifdef CONFIG_PM
-static int eepro100_suspend(struct pci_dev *pdev, pm_message_t state)
-{
-        struct net_device *dev = pci_get_drvdata (pdev);
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-
-        pci_save_state(pdev);
-
-        if (!netif_running(dev))
-                return 0;
-
-        del_timer_sync(&sp->timer);
-
-        netif_device_detach(dev);
-        iowrite32(PortPartialReset, ioaddr + SCBPort);
-
-        /* XXX call pci_set_power_state ()? */
-        pci_disable_device(pdev);
-        pci_set_power_state (pdev, PCI_D3hot);
-        return 0;
-}
-
-static int eepro100_resume(struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata (pdev);
-        struct speedo_private *sp = netdev_priv(dev);
-        void __iomem *ioaddr = sp->regs;
-        int rc;
-
-        pci_set_power_state(pdev, PCI_D0);
-        pci_restore_state(pdev);
-
-        rc = pci_enable_device(pdev);
-        if (rc)
-                return rc;
-
-        pci_set_master(pdev);
-
-        if (!netif_running(dev))
-                return 0;
-
-        /* I'm absolutely uncertain if this part of code may work.
-           The problems are:
-            - correct hardware reinitialization;
-                - correct driver behavior between different steps of the
-                  reinitialization;
-                - serialization with other driver calls.
-           2000/03/08  SAW */
-        iowrite16(SCBMaskAll, ioaddr + SCBCmd);
-        speedo_resume(dev);
-        netif_device_attach(dev);
-        sp->rx_mode = -1;
-        sp->flow_ctrl = sp->partner = 0;
-        set_rx_mode(dev);
-        sp->timer.expires = RUN_AT(2*HZ);
-        add_timer(&sp->timer);
-        return 0;
-}
-#endif /* CONFIG_PM */
-
-static void __devexit eepro100_remove_one (struct pci_dev *pdev)
-{
-        struct net_device *dev = pci_get_drvdata (pdev);
-        struct speedo_private *sp = netdev_priv(dev);
-
-        unregister_netdev(dev);
-
-        release_region(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));
-        release_mem_region(pci_resource_start(pdev, 0), pci_resource_len(pdev, 0));
-
-        pci_iounmap(pdev, sp->regs);
-        pci_free_consistent(pdev, TX_RING_SIZE * sizeof(struct TxFD)
-                                                                + sizeof(struct speedo_stats),
-                                                sp->tx_ring, sp->tx_ring_dma);
-        pci_disable_device(pdev);
-        free_netdev(dev);
-}
-
-static struct pci_device_id eepro100_pci_tbl[] = {
-        { PCI_VENDOR_ID_INTEL, 0x1229, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1209, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1029, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1030, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1031, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1032, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1033, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1034, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1035, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1036, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1037, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1038, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1039, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x103A, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x103B, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x103C, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x103D, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x103E, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1050, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1059, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x1227, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x2449, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x2459, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x245D, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x5200, PCI_ANY_ID, PCI_ANY_ID, },
-        { PCI_VENDOR_ID_INTEL, 0x5201, PCI_ANY_ID, PCI_ANY_ID, },
-        { 0,}
-};
-MODULE_DEVICE_TABLE(pci, eepro100_pci_tbl);
-
-static struct pci_driver eepro100_driver = {
-        .name           = "eepro100",
-        .id_table       = eepro100_pci_tbl,
-        .probe          = eepro100_init_one,
-        .remove         = __devexit_p(eepro100_remove_one),
-#ifdef CONFIG_PM
-        .suspend        = eepro100_suspend,
-        .resume         = eepro100_resume,
-#endif /* CONFIG_PM */
-};
-
-static int __init eepro100_init_module(void)
-{
-#ifdef MODULE
-        printk(version);
-#endif
-        return pci_register_driver(&eepro100_driver);
-}
-
-static void __exit eepro100_cleanup_module(void)
-{
-        pci_unregister_driver(&eepro100_driver);
-}
-
-module_init(eepro100_init_module);
-module_exit(eepro100_cleanup_module);
-
-/*
- * Local variables:
- *  compile-command: "gcc -DMODULE -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -c eepro100.c `[ -f /usr/include/linux/modversions.h ] && echo -DMODVERSIONS`"
- *  c-indent-level: 4
- *  c-basic-offset: 4
- *  tab-width: 4
- * End:
- */
diff --git a/drivers/net/enc28j60.c b/drivers/net/enc28j60.c
index e1b441effbbe..a5c7bd4532d0 100644
--- a/drivers/net/enc28j60.c
+++ b/drivers/net/enc28j60.c
@@ -477,12 +477,10 @@ static int enc28j60_set_hw_macaddr(struct net_device *ndev)
 
         mutex_lock(&priv->lock);
         if (!priv->hw_enable) {
-                if (netif_msg_drv(priv)) {
-                        DECLARE_MAC_BUF(mac);
+                if (netif_msg_drv(priv))
                         printk(KERN_INFO DRV_NAME
-                                ": %s: Setting MAC address to %s\n",
-                                ndev->name, print_mac(mac, ndev->dev_addr));
-                }
+                                ": %s: Setting MAC address to %pM\n",
+                                ndev->name, ndev->dev_addr);
                 /* NOTE: MAC address in ENC28J60 is byte-backward */
                 nolock_regb_write(priv, MAADR5, ndev->dev_addr[0]);
                 nolock_regb_write(priv, MAADR4, ndev->dev_addr[1]);
@@ -1328,11 +1326,9 @@ static int enc28j60_net_open(struct net_device *dev)
                 printk(KERN_DEBUG DRV_NAME ": %s() enter\n", __func__);
 
         if (!is_valid_ether_addr(dev->dev_addr)) {
-                if (netif_msg_ifup(priv)) {
-                        DECLARE_MAC_BUF(mac);
-                        dev_err(&dev->dev, "invalid MAC address %s\n",
-                                print_mac(mac, dev->dev_addr));
-                }
+                if (netif_msg_ifup(priv))
+                        dev_err(&dev->dev, "invalid MAC address %pM\n",
+                                dev->dev_addr);
                 return -EADDRNOTAVAIL;
         }
         /* Reset the hardware here (and take it out of low power mode) */
diff --git a/drivers/net/enic/enic_res.c b/drivers/net/enic/enic_res.c
index 95184b9108ef..e5fc9384f8f5 100644
--- a/drivers/net/enic/enic_res.c
+++ b/drivers/net/enic/enic_res.c
@@ -90,11 +90,8 @@ int enic_get_vnic_config(struct enic *enic)
 
         c->intr_timer = min_t(u16, VNIC_INTR_TIMER_MAX, c->intr_timer);
 
-        printk(KERN_INFO PFX "vNIC MAC addr %02x:%02x:%02x:%02x:%02x:%02x "
-                "wq/rq %d/%d\n",
-                enic->mac_addr[0], enic->mac_addr[1], enic->mac_addr[2],
-                enic->mac_addr[3], enic->mac_addr[4], enic->mac_addr[5],
-                c->wq_desc_count, c->rq_desc_count);
+        printk(KERN_INFO PFX "vNIC MAC addr %pM wq/rq %d/%d\n",
+                enic->mac_addr, c->wq_desc_count, c->rq_desc_count);
         printk(KERN_INFO PFX "vNIC mtu %d csum tx/rx %d/%d tso/lro %d/%d "
                 "intr timer %d\n",
                 c->mtu, ENIC_SETTING(enic, TXCSUM),
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c
index 4d104f5c30f9..9afd33c7188d 100644
--- a/drivers/net/enic/vnic_dev.c
+++ b/drivers/net/enic/vnic_dev.c
@@ -489,10 +489,7 @@ void vnic_dev_add_addr(struct vnic_dev *vdev, u8 *addr)
 
         err = vnic_dev_cmd(vdev, CMD_ADDR_ADD, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR
-                        "Can't add addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
-                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
-                        err);
+                printk(KERN_ERR "Can't add addr [%pM], %d\n", addr, err);
 }
 
 void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
@@ -507,10 +504,7 @@ void vnic_dev_del_addr(struct vnic_dev *vdev, u8 *addr)
 
         err = vnic_dev_cmd(vdev, CMD_ADDR_DEL, &a0, &a1, wait);
         if (err)
-                printk(KERN_ERR
-                        "Can't del addr [%02x:%02x:%02x:%02x:%02x:%02x], %d\n",
-                        addr[0], addr[1], addr[2], addr[3], addr[4], addr[5],
-                        err);
+                printk(KERN_ERR "Can't del addr [%pM], %d\n", addr, err);
 }
 
 int vnic_dev_notify_set(struct vnic_dev *vdev, u16 intr)
diff --git a/drivers/net/epic100.c b/drivers/net/epic100.c
index 76118ddd1042..65a404076abe 100644
--- a/drivers/net/epic100.c
+++ b/drivers/net/epic100.c
@@ -322,7 +322,6 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
         int i, ret, option = 0, duplex = 0;
         void *ring_space;
         dma_addr_t ring_dma;
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -364,7 +363,7 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
         ioaddr = pci_resource_start (pdev, 0);
 #else
         ioaddr = pci_resource_start (pdev, 1);
-        ioaddr = (long) ioremap (ioaddr, pci_resource_len (pdev, 1));
+        ioaddr = (long) pci_ioremap_bar(pdev, 1);
         if (!ioaddr) {
                 dev_err(&pdev->dev, "ioremap failed\n");
                 goto err_out_free_netdev;
@@ -499,9 +498,9 @@ static int __devinit epic_init_one (struct pci_dev *pdev,
         if (ret < 0)
                 goto err_out_unmap_rx;
 
-        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n",
+        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %pM\n",
                dev->name, pci_id_tbl[chip_idx].name, ioaddr, dev->irq,
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
 
 out:
         return ret;
diff --git a/drivers/net/es3210.c b/drivers/net/es3210.c
index deefa51b8c31..e7df9f4a183d 100644
--- a/drivers/net/es3210.c
+++ b/drivers/net/es3210.c
@@ -179,7 +179,6 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
 {
         int i, retval;
         unsigned long eisa_id;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr + ES_SA_PROM, ES_IO_EXTENT, "es3210"))
                 return -ENODEV;
@@ -205,14 +204,14 @@ static int __init es_probe1(struct net_device *dev, int ioaddr)
         if (dev->dev_addr[0] != ES_ADDR0 ||
             dev->dev_addr[1] != ES_ADDR1 ||
             dev->dev_addr[2] != ES_ADDR2) {
-                printk("es3210.c: card not found %s (invalid_prefix).\n",
-                       print_mac(mac, dev->dev_addr));
+                printk("es3210.c: card not found %pM (invalid_prefix).\n",
+                       dev->dev_addr);
                 retval = -ENODEV;
                 goto out;
         }
 
-        printk("es3210.c: ES3210 rev. %ld at %#x, node %s",
-               eisa_id>>24, ioaddr, print_mac(mac, dev->dev_addr));
+        printk("es3210.c: ES3210 rev. %ld at %#x, node %pM",
+               eisa_id>>24, ioaddr, dev->dev_addr);
 
         /* Snarf the interrupt now. */
         if (dev->irq == 0) {
diff --git a/drivers/net/ewrk3.c b/drivers/net/ewrk3.c
index 593a120e31b2..3ab2156905f0 100644
--- a/drivers/net/ewrk3.c
+++ b/drivers/net/ewrk3.c
@@ -396,7 +396,6 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase)
         u_long mem_start, shmem_length;
         u_char cr, cmr, icr, nicsr, lemac, hard_strapped = 0;
         u_char eeprom_image[EEPROM_MAX], chksum, eisa_cr = 0;
-        DECLARE_MAC_BUF(mac);
 
         /*
         ** Stop the EWRK3. Enable the DBR ROM. Disable interrupts and remote boot.
@@ -461,7 +460,7 @@ ewrk3_hw_init(struct net_device *dev, u_long iobase)
         if (lemac != LeMAC2)
                 DevicePresent(iobase);  /* need after EWRK3_INIT */
         status = get_hw_addr(dev, eeprom_image, lemac);
-        printk("%s\n", print_mac(mac, dev->dev_addr));
+        printk("%pM\n", dev->dev_addr);
 
         if (status) {
                 printk("      which has an EEPROM CRC error.\n");
@@ -646,10 +645,8 @@ static int ewrk3_open(struct net_device *dev)
                         ewrk3_init(dev);
 
                         if (ewrk3_debug > 1) {
-                                DECLARE_MAC_BUF(mac);
                                 printk("%s: ewrk3 open with irq %d\n", dev->name, dev->irq);
-                                printk("  physical address: %s\n",
-                                       print_mac(mac, dev->dev_addr));
+                                printk("  physical address: %pM\n", dev->dev_addr);
                                 if (lp->shmem_length == 0) {
                                         printk("  no shared memory, I/O only mode\n");
                                 } else {
diff --git a/drivers/net/fealnx.c b/drivers/net/fealnx.c
index b455ae931f7a..61c7cbba88be 100644
--- a/drivers/net/fealnx.c
+++ b/drivers/net/fealnx.c
@@ -486,7 +486,6 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
 #else
         int bar = 1;
 #endif
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -665,9 +664,9 @@ static int __devinit fealnx_init_one(struct pci_dev *pdev,
         if (err)
                 goto err_out_free_tx;
 
-        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n",
                dev->name, skel_netdrv_tbl[chip_id].chip_name, ioaddr,
-               print_mac(mac, dev->dev_addr), irq);
+               dev->dev_addr, irq);
 
         return 0;
 
diff --git a/drivers/net/fec.c b/drivers/net/fec.c
index ecd5c71a7a8a..2487d83ce5e4 100644
--- a/drivers/net/fec.c
+++ b/drivers/net/fec.c
@@ -2562,7 +2562,6 @@ static int __init fec_enet_module_init(void)
 {
         struct net_device *dev;
         int i, err;
-        DECLARE_MAC_BUF(mac);
 
         printk("FEC ENET Version 0.2\n");
 
@@ -2581,8 +2580,7 @@ static int __init fec_enet_module_init(void)
                         return -EIO;
                 }
 
-                printk("%s: ethernet %s\n",
-                       dev->name, print_mac(mac, dev->dev_addr));
+                printk("%s: ethernet %pM\n", dev->name, dev->dev_addr);
         }
         return 0;
 }
diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index cc7328b15521..74c588efa92e 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -5420,7 +5420,6 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
         u32 powerstate, txreg;
         u32 phystate_orig = 0, phystate;
         int phyinitialized = 0;
-        DECLARE_MAC_BUF(mac);
         static int printed_version;
 
         if (!printed_version++)
@@ -5653,8 +5652,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                  * to 01:23:45:67:89:ab
                  */
                 dev_printk(KERN_ERR, &pci_dev->dev,
-                        "Invalid Mac address detected: %s\n",
-                        print_mac(mac, dev->dev_addr));
+                        "Invalid Mac address detected: %pM\n",
+                        dev->dev_addr);
                 dev_printk(KERN_ERR, &pci_dev->dev,
                         "Please complain to your hardware vendor. Switching to a random MAC.\n");
                 dev->dev_addr[0] = 0x00;
@@ -5663,8 +5662,8 @@ static int __devinit nv_probe(struct pci_dev *pci_dev, const struct pci_device_i
                 get_random_bytes(&dev->dev_addr[3], 3);
         }
 
-        dprintk(KERN_DEBUG "%s: MAC Address %s\n",
-                pci_name(pci_dev), print_mac(mac, dev->dev_addr));
+        dprintk(KERN_DEBUG "%s: MAC Address %pM\n",
+                pci_name(pci_dev), dev->dev_addr);
 
         /* set mac address */
         nv_copy_mac_to_hw(dev);
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index cb51c1fb0338..e32f08d18c65 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1115,10 +1115,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
         if (ret)
                 goto out_free_bd;
 
-        printk(KERN_INFO "%s: fs_enet: %02x:%02x:%02x:%02x:%02x:%02x\n",
-               ndev->name,
-               ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
-               ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
+        printk(KERN_INFO "%s: fs_enet: %pM\n", ndev->name, ndev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index 83a5cb6aa23b..013525f3c3bd 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -162,7 +162,6 @@ static int gfar_probe(struct platform_device *pdev)
         struct gianfar_platform_data *einfo;
         struct resource *r;
         int err = 0, irq;
-        DECLARE_MAC_BUF(mac);
 
         einfo = (struct gianfar_platform_data *) pdev->dev.platform_data;
 
@@ -364,8 +363,7 @@ static int gfar_probe(struct platform_device *pdev)
         gfar_init_sysfs(dev);
 
         /* Print out the device info */
-        printk(KERN_INFO DEVICE_NAME "%s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO DEVICE_NAME "%pM\n", dev->name, dev->dev_addr);
 
         /* Even more device info helps when determining which kernel */
         /* provided which set of benchmarks. */
diff --git a/drivers/net/hamachi.c b/drivers/net/hamachi.c
index 3199526bcecb..1dc0fd061bfc 100644
--- a/drivers/net/hamachi.c
+++ b/drivers/net/hamachi.c
@@ -582,7 +582,6 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
         void *ring_space;
         dma_addr_t ring_dma;
         int ret = -ENOMEM;
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -744,9 +743,9 @@ static int __devinit hamachi_init_one (struct pci_dev *pdev,
                 goto err_out_unmap_rx;
         }
 
-        printk(KERN_INFO "%s: %s type %x at %p, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s type %x at %p, %pM, IRQ %d.\n",
                    dev->name, chip_tbl[chip_id].name, readl(ioaddr + ChipRev),
-                   ioaddr, print_mac(mac, dev->dev_addr), irq);
+                   ioaddr, dev->dev_addr, irq);
         i = readb(ioaddr + PCIClkMeas);
         printk(KERN_INFO "%s:  %d-bit %d Mhz PCI bus (%d), Virtual Jumpers "
                    "%2.2x, LPA %4.4x.\n",
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c
index 58f4b1d7bf1f..74529c832ad1 100644
--- a/drivers/net/hamradio/bpqether.c
+++ b/drivers/net/hamradio/bpqether.c
@@ -441,16 +441,15 @@ static int bpq_seq_show(struct seq_file *seq, void *v)
                          "dev   ether      destination        accept from\n");
         else {
                 const struct bpqdev *bpqdev = v;
-                DECLARE_MAC_BUF(mac);
 
-                seq_printf(seq, "%-5s %-10s %s  ",
+                seq_printf(seq, "%-5s %-10s %pM  ",
                         bpqdev->axdev->name, bpqdev->ethdev->name,
-                        print_mac(mac, bpqdev->dest_addr));
+                        bpqdev->dest_addr);
 
                 if (is_multicast_ether_addr(bpqdev->acpt_addr))
                         seq_printf(seq, "*\n");
                 else
-                        seq_printf(seq, "%s\n", print_mac(mac, bpqdev->acpt_addr));
+                        seq_printf(seq, "%pM\n", bpqdev->acpt_addr);
 
         }
         return 0;
diff --git a/drivers/net/hp-plus.c b/drivers/net/hp-plus.c
index fbbd3e660c27..9026fd6ea0ff 100644
--- a/drivers/net/hp-plus.c
+++ b/drivers/net/hp-plus.c
@@ -166,7 +166,6 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
         const char name[] = "HP-PC-LAN+";
         int mem_start;
         static unsigned version_printed;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -193,7 +192,7 @@ static int __init hpp_probe1(struct net_device *dev, int ioaddr)
         }
         checksum += inb(ioaddr + 14);
 
-        printk("%s", print_mac(mac, dev->dev_addr));
+        printk("%pM", dev->dev_addr);
 
         if (checksum != 0xff) {
                 printk(" bad checksum %2.2x.\n", checksum);
diff --git a/drivers/net/hp.c b/drivers/net/hp.c
index 0a8c64930ad3..3669194f1063 100644
--- a/drivers/net/hp.c
+++ b/drivers/net/hp.c
@@ -127,7 +127,6 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
         int i, retval, board_id, wordmode;
         const char *name;
         static unsigned version_printed;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, HP_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -161,7 +160,7 @@ static int __init hp_probe1(struct net_device *dev, int ioaddr)
         for(i = 0; i < ETHER_ADDR_LEN; i++)
                 dev->dev_addr[i] = inb(ioaddr + i);
 
-        printk(" %s", print_mac(mac, dev->dev_addr));
+        printk(" %pM", dev->dev_addr);
 
         /* Snarf the interrupt now.  Someday this could be moved to open(). */
         if (dev->irq < 2) {
diff --git a/drivers/net/hp100.c b/drivers/net/hp100.c
index 571dd80fb850..fd34452c05b1 100644
--- a/drivers/net/hp100.c
+++ b/drivers/net/hp100.c
@@ -2093,9 +2093,8 @@ static void hp100_set_multicast_list(struct net_device *dev)
                                 addrs = dmi->dmi_addr;
                                 if ((*addrs & 0x01) == 0x01) {  /* multicast address? */
 #ifdef HP100_DEBUG
-                                        DECLARE_MAC_BUF(mac);
-                                        printk("hp100: %s: multicast = %s, ",
-                                                     dev->name, print_mac(mac, addrs));
+                                        printk("hp100: %s: multicast = %pM, ",
+                                                     dev->name, addrs);
 #endif
                                         for (j = idx = 0; j < 6; j++) {
                                                 idx ^= *addrs++ & 0x3f;
diff --git a/drivers/net/hydra.c b/drivers/net/hydra.c
index b96cf2dcb109..b0ae0766ea4e 100644
--- a/drivers/net/hydra.c
+++ b/drivers/net/hydra.c
@@ -103,7 +103,6 @@ static int __devinit hydra_init(struct zorro_dev *z)
     int start_page, stop_page;
     int j;
     int err;
-    DECLARE_MAC_BUF(mac);
 
     static u32 hydra_offsets[16] = {
         0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e,
@@ -163,8 +162,8 @@ static int __devinit hydra_init(struct zorro_dev *z)
     zorro_set_drvdata(z, dev);
 
     printk(KERN_INFO "%s: Hydra at 0x%08lx, address "
-           "%s (hydra.c " HYDRA_VERSION ")\n",
-           dev->name, z->resource.start, print_mac(mac, dev->dev_addr));
+           "%pM (hydra.c " HYDRA_VERSION ")\n",
+           dev->name, z->resource.start, dev->dev_addr);
 
     return 0;
 }
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 901212aa37cb..87a706694fb3 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -396,9 +396,7 @@ static void emac_hash_mc(struct emac_instance *dev)
 
         for (dmi = dev->ndev->mc_list; dmi; dmi = dmi->next) {
                 int slot, reg, mask;
-                DBG2(dev, "mc %02x:%02x:%02x:%02x:%02x:%02x" NL,
-                     dmi->dmi_addr[0], dmi->dmi_addr[1], dmi->dmi_addr[2],
-                     dmi->dmi_addr[3], dmi->dmi_addr[4], dmi->dmi_addr[5]);
+                DBG2(dev, "mc %pM" NL, dmi->dmi_addr);
 
                 slot = EMAC_XAHT_CRC_TO_SLOT(dev, ether_crc(ETH_ALEN, dmi->dmi_addr));
                 reg = EMAC_XAHT_SLOT_TO_REG(dev, slot);
@@ -2865,11 +2863,8 @@ static int __devinit emac_probe(struct of_device *ofdev,
         wake_up_all(&emac_probe_wait);
 
 
-        printk(KERN_INFO
-               "%s: EMAC-%d %s, MAC %02x:%02x:%02x:%02x:%02x:%02x\n",
-               ndev->name, dev->cell_index, np->full_name,
-               ndev->dev_addr[0], ndev->dev_addr[1], ndev->dev_addr[2],
-               ndev->dev_addr[3], ndev->dev_addr[4], ndev->dev_addr[5]);
+        printk(KERN_INFO "%s: EMAC-%d %s, MAC %pM\n",
+               ndev->name, dev->cell_index, np->full_name, ndev->dev_addr);
 
         if (dev->phy_mode == PHY_MODE_SGMII)
                 printk(KERN_NOTICE "%s: in SGMII mode\n", ndev->name);
diff --git a/drivers/net/ibmlana.c b/drivers/net/ibmlana.c
index f02764725a22..0fad08c4ccd2 100644
--- a/drivers/net/ibmlana.c
+++ b/drivers/net/ibmlana.c
@@ -914,7 +914,6 @@ static int __devinit ibmlana_init_one(struct device *kdev)
         int base = 0, irq = 0, iobase = 0, memlen = 0;
         ibmlana_priv *priv;
         ibmlana_medium medium;
-        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(ibmlana_priv));
         if (!dev)
@@ -990,10 +989,10 @@ static int __devinit ibmlana_init_one(struct device *kdev)
         /* print config */
 
         printk(KERN_INFO "%s: IRQ %d, I/O %#lx, memory %#lx-%#lx, "
-               "MAC address %s.\n",
+               "MAC address %pM.\n",
                dev->name, priv->realirq, dev->base_addr,
                dev->mem_start, dev->mem_end - 1,
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
         printk(KERN_INFO "%s: %s medium\n", dev->name, MediaNames[priv->medium]);
 
         /* reset board */
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index c2d57f836088..9dc49588cba8 100644
--- a/drivers/net/ibmveth.c
+++ b/drivers/net/ibmveth.c
@@ -1371,13 +1371,12 @@ static int ibmveth_show(struct seq_file *seq, void *v)
         struct ibmveth_adapter *adapter = seq->private;
         char *current_mac = ((char*) &adapter->netdev->dev_addr);
         char *firmware_mac = ((char*) &adapter->mac_addr) ;
-        DECLARE_MAC_BUF(mac);
 
         seq_printf(seq, "%s %s\n\n", ibmveth_driver_string, ibmveth_driver_version);
 
         seq_printf(seq, "Unit Address:    0x%x\n", adapter->vdev->unit_address);
-        seq_printf(seq, "Current MAC:     %s\n", print_mac(mac, current_mac));
-        seq_printf(seq, "Firmware MAC:    %s\n", print_mac(mac, firmware_mac));
+        seq_printf(seq, "Current MAC:     %pM\n", current_mac);
+        seq_printf(seq, "Firmware MAC:    %pM\n", firmware_mac);
 
         seq_printf(seq, "\nAdapter Statistics:\n");
         seq_printf(seq, "  TX:  vio_map_single failres:      %ld\n", adapter->tx_map_failed);
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 1f397cd99414..3b42665ef1d4 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1275,16 +1275,14 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 
         dev_info(&pdev->dev, "Intel(R) Gigabit Ethernet Network Connection\n");
         /* print bus type/speed/width info */
-        dev_info(&pdev->dev,
-                 "%s: (PCIe:%s:%s) %02x:%02x:%02x:%02x:%02x:%02x\n",
+        dev_info(&pdev->dev, "%s: (PCIe:%s:%s) %pM\n",
                  netdev->name,
                  ((hw->bus.speed == e1000_bus_speed_2500)
                   ? "2.5Gb/s" : "unknown"),
                  ((hw->bus.width == e1000_bus_width_pcie_x4)
                   ? "Width x4" : (hw->bus.width == e1000_bus_width_pcie_x1)
                   ? "Width x1" : "unknown"),
-                 netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
-                 netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
+                 netdev->dev_addr);
 
         igb_read_part_num(hw, &part_num);
         dev_info(&pdev->dev, "%s: PBA No: %06x-%03x\n", netdev->name,
diff --git a/drivers/net/ioc3-eth.c b/drivers/net/ioc3-eth.c
index 1f25263dc7eb..afac65e46773 100644
--- a/drivers/net/ioc3-eth.c
+++ b/drivers/net/ioc3-eth.c
@@ -390,11 +390,8 @@ static int nic_init(struct ioc3 *ioc3)
         }
 
         printk("Found %s NIC", type);
-        if (type != unknown) {
-                printk (" registration number %02x:%02x:%02x:%02x:%02x:%02x,"
-                        " CRC %02x", serial[0], serial[1], serial[2],
-                        serial[3], serial[4], serial[5], crc);
-        }
+        if (type != unknown)
+                printk (" registration number %pM, CRC %02x", serial, crc);
         printk(".\n");
 
         return 0;
@@ -443,12 +440,9 @@ static void ioc3_get_eaddr_nic(struct ioc3_private *ip)
  */
 static void ioc3_get_eaddr(struct ioc3_private *ip)
 {
-        DECLARE_MAC_BUF(mac);
-
         ioc3_get_eaddr_nic(ip);
 
-        printk("Ethernet address is %s.\n",
-               print_mac(mac, priv_netdev(ip)->dev_addr));
+        printk("Ethernet address is %pM.\n", priv_netdev(ip)->dev_addr);
 }
 
 static void __ioc3_set_mac_address(struct net_device *dev)
diff --git a/drivers/net/isa-skeleton.c b/drivers/net/isa-skeleton.c
index d6ff26af37b3..1c8d72b01247 100644
--- a/drivers/net/isa-skeleton.c
+++ b/drivers/net/isa-skeleton.c
@@ -192,7 +192,6 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
         static unsigned version_printed;
         int i;
         int err = -ENODEV;
-        DECLARE_MAC_BUF(mac);
 
         /* Grab the region so that no one else tries to probe our ioports. */
         if (!request_region(ioaddr, NETCARD_IO_EXTENT, cardname))
@@ -220,7 +219,7 @@ static int __init netcard_probe1(struct net_device *dev, int ioaddr)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + i);
 
-        printk("%s", print_mac(mac, dev->dev_addr));
+        printk("%pM", dev->dev_addr);
 
         err = -EAGAIN;
 #ifdef jumpered_interrupts
diff --git a/drivers/net/ixgb/ixgb_main.c b/drivers/net/ixgb/ixgb_main.c
index be3c7dc96f63..21995dff1fa4 100644
--- a/drivers/net/ixgb/ixgb_main.c
+++ b/drivers/net/ixgb/ixgb_main.c
@@ -381,8 +381,7 @@ ixgb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         adapter->hw.back = adapter;
         adapter->msg_enable = netif_msg_init(debug, DEFAULT_DEBUG_LEVEL_SHIFT);
 
-        adapter->hw.hw_addr = ioremap(pci_resource_start(pdev, BAR_0),
-                                      pci_resource_len(pdev, BAR_0));
+        adapter->hw.hw_addr = pci_ioremap_bar(pdev, BAR_0);
         if (!adapter->hw.hw_addr) {
                 err = -EIO;
                 goto err_ioremap;
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 7548fb7360d9..028bfb20412c 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -3877,8 +3877,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
         pci_read_config_word(pdev, IXGBE_PCI_LINK_STATUS, &link_status);
         link_speed = link_status & IXGBE_PCI_LINK_SPEED;
         link_width = link_status & IXGBE_PCI_LINK_WIDTH;
-        dev_info(&pdev->dev, "(PCI Express:%s:%s) "
-                 "%02x:%02x:%02x:%02x:%02x:%02x\n",
+        dev_info(&pdev->dev, "(PCI Express:%s:%s) %pM\n",
                 ((link_speed == IXGBE_PCI_LINK_SPEED_5000) ? "5.0Gb/s" :
                  (link_speed == IXGBE_PCI_LINK_SPEED_2500) ? "2.5Gb/s" :
                  "Unknown"),
@@ -3887,8 +3886,7 @@ static int __devinit ixgbe_probe(struct pci_dev *pdev,
                  (link_width == IXGBE_PCI_LINK_WIDTH_2) ? "Width x2" :
                  (link_width == IXGBE_PCI_LINK_WIDTH_1) ? "Width x1" :
                  "Unknown"),
-                netdev->dev_addr[0], netdev->dev_addr[1], netdev->dev_addr[2],
-                netdev->dev_addr[3], netdev->dev_addr[4], netdev->dev_addr[5]);
+                netdev->dev_addr);
         ixgbe_read_pba_num_generic(hw, &part_num);
         dev_info(&pdev->dev, "MAC: %d, PHY: %d, PBA No: %06x-%03x\n",
                  hw->mac.type, hw->phy.type,
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c
index 07944820f745..334ff9e12cdd 100644
--- a/drivers/net/jazzsonic.c
+++ b/drivers/net/jazzsonic.c
@@ -208,7 +208,6 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
         struct sonic_local *lp;
         struct resource *res;
         int err = 0;
-        DECLARE_MAC_BUF(mac);
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!res)
@@ -233,8 +232,7 @@ static int __init jazz_sonic_probe(struct platform_device *pdev)
         if (err)
                 goto out1;
 
-        printk("%s: MAC %s IRQ %d\n",
-               dev->name, print_mac(mac, dev->dev_addr), dev->irq);
+        printk("%s: MAC %pM IRQ %d\n", dev->name, dev->dev_addr, dev->irq);
 
         return 0;
 
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 81c6cdc3851f..a10c68700e0e 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2862,18 +2862,10 @@ jme_init_one(struct pci_dev *pdev,
                 goto err_out_free_shadow;
         }
 
-        msg_probe(jme,
-                "JMC250 gigabit%s ver:%x rev:%x "
-                "macaddr:%02x:%02x:%02x:%02x:%02x:%02x\n",
+        msg_probe(jme, "JMC250 gigabit%s ver:%x rev:%x macaddr:%pM\n",
                 (jme->fpgaver != 0) ? " (FPGA)" : "",
                 (jme->fpgaver != 0) ? jme->fpgaver : jme->chiprev,
-                jme->rev,
-                netdev->dev_addr[0],
-                netdev->dev_addr[1],
-                netdev->dev_addr[2],
-                netdev->dev_addr[3],
-                netdev->dev_addr[4],
-                netdev->dev_addr[5]);
+                jme->rev, netdev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/lance.c b/drivers/net/lance.c
index 977ed3401bb3..4ab536de24a8 100644
--- a/drivers/net/lance.c
+++ b/drivers/net/lance.c
@@ -466,7 +466,6 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int
         unsigned long flags;
         int err = -ENOMEM;
         void __iomem *bios;
-        DECLARE_MAC_BUF(mac);
 
         /* First we look for special cases.
            Check for HP's on-board ethernet by looking for 'HP' in the BIOS.
@@ -529,7 +528,7 @@ static int __init lance_probe1(struct net_device *dev, int ioaddr, int irq, int
            The first six bytes are the station address. */
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + i);
-        printk("%s", print_mac(mac, dev->dev_addr));
+        printk("%pM", dev->dev_addr);
 
         dev->base_addr = ioaddr;
         /* Make certain the data structures used by the LANCE are aligned and DMAble. */
diff --git a/drivers/net/lib82596.c b/drivers/net/lib82596.c
index b59f442bbf36..cc8f64197a90 100644
--- a/drivers/net/lib82596.c
+++ b/drivers/net/lib82596.c
@@ -1034,12 +1034,8 @@ static int i596_start_xmit(struct sk_buff *skb, struct net_device *dev)
 
 static void print_eth(unsigned char *add, char *str)
 {
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
-
-        printk(KERN_DEBUG "i596 0x%p, %s --> %s %02X%02X, %s\n",
-               add, print_mac(mac, add + 6), print_mac(mac2, add),
-               add[12], add[13], str);
+        printk(KERN_DEBUG "i596 0x%p, %pM --> %pM %02X%02X, %s\n",
+               add, add + 6, add, add[12], add[13], str);
 }
 
 static int __devinit i82596_probe(struct net_device *dev)
@@ -1343,7 +1339,6 @@ static void set_multicast_list(struct net_device *dev)
         struct i596_private *lp = netdev_priv(dev);
         struct i596_dma *dma = lp->dma;
         int config = 0, cnt;
-        DECLARE_MAC_BUF(mac);
 
         DEB(DEB_MULTI,
             printk(KERN_DEBUG
@@ -1407,8 +1402,8 @@ static void set_multicast_list(struct net_device *dev)
                         if (i596_debug > 1)
                                 DEB(DEB_MULTI,
                                     printk(KERN_DEBUG
-                                           "%s: Adding address %s\n",
-                                           dev->name, print_mac(mac, cp)));
+                                           "%s: Adding address %pM\n",
+                                           dev->name, cp));
                 }
                 DMA_WBACK_INV(dev, &dma->mc_cmd, sizeof(struct mc_cmd));
                 i596_add_cmd(dev, &cmd->cmd);
diff --git a/drivers/net/lne390.c b/drivers/net/lne390.c
index b36989097883..bc70d5e79ab1 100644
--- a/drivers/net/lne390.c
+++ b/drivers/net/lne390.c
@@ -169,7 +169,6 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
 {
         int i, revision, ret;
         unsigned long eisa_id;
-        DECLARE_MAC_BUF(mac);
 
         if (inb_p(ioaddr + LNE390_ID_PORT) == 0xff) return -ENODEV;
 
@@ -203,8 +202,8 @@ static int __init lne390_probe1(struct net_device *dev, int ioaddr)
 
         for(i = 0; i < ETHER_ADDR_LEN; i++)
                 dev->dev_addr[i] = inb(ioaddr + LNE390_SA_PROM + i);
-        printk("lne390.c: LNE390%X in EISA slot %d, address %s.\n",
-               0xa+revision, ioaddr/0x1000, print_mac(mac, dev->dev_addr));
+        printk("lne390.c: LNE390%X in EISA slot %d, address %pM.\n",
+               0xa+revision, ioaddr/0x1000, dev->dev_addr);
 
         printk("lne390.c: ");
 
diff --git a/drivers/net/mac89x0.c b/drivers/net/mac89x0.c
index 4ce8afd481c3..ca9c5a858679 100644
--- a/drivers/net/mac89x0.c
+++ b/drivers/net/mac89x0.c
@@ -181,7 +181,6 @@ struct net_device * __init mac89x0_probe(int unit)
         unsigned long ioaddr;
         unsigned short sig;
         int err = -ENODEV;
-        DECLARE_MAC_BUF(mac);
 
         if (!MACH_IS_MAC)
                 return ERR_PTR(-ENODEV);
@@ -279,8 +278,7 @@ struct net_device * __init mac89x0_probe(int unit)
 
         /* print the IRQ and ethernet address. */
 
-        printk(" IRQ %d ADDR %s\n",
-               dev->irq, print_mac(mac, dev->dev_addr));
+        printk(" IRQ %d ADDR %pM\n", dev->irq, dev->dev_addr);
 
         dev->open               = net_open;
         dev->stop               = net_close;
diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index 01f7a31bac76..e00c896d0c9b 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -1104,7 +1104,6 @@ static int __init macb_probe(struct platform_device *pdev)
         unsigned long pclk_hz;
         u32 config;
         int err = -ENXIO;
-        DECLARE_MAC_BUF(mac);
 
         regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!regs) {
@@ -1223,10 +1222,8 @@ static int __init macb_probe(struct platform_device *pdev)
 
         platform_set_drvdata(pdev, dev);
 
-        printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d "
-               "(%s)\n",
-               dev->name, dev->base_addr, dev->irq,
-               print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: Atmel MACB at 0x%08lx irq %d (%pM)\n",
+               dev->name, dev->base_addr, dev->irq, dev->dev_addr);
 
         phydev = bp->phy_dev;
         printk(KERN_INFO "%s: attached PHY driver [%s] "
diff --git a/drivers/net/mace.c b/drivers/net/mace.c
index 451acdca2a21..a2021c0103b3 100644
--- a/drivers/net/mace.c
+++ b/drivers/net/mace.c
@@ -101,7 +101,6 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
         struct mace_data *mp;
         const unsigned char *addr;
         int j, rev, rc = -EBUSY;
-        DECLARE_MAC_BUF(mac);
 
         if (macio_resource_count(mdev) != 3 || macio_irq_count(mdev) != 3) {
                 printk(KERN_ERR "can't use MACE %s: need 3 addrs and 3 irqs\n",
@@ -241,8 +240,8 @@ static int __devinit mace_probe(struct macio_dev *mdev, const struct of_device_i
                 goto err_free_rx_irq;
         }
 
-        printk(KERN_INFO "%s: MACE at %s, chip revision %d.%d\n",
-               dev->name, print_mac(mac, dev->dev_addr),
+        printk(KERN_INFO "%s: MACE at %pM, chip revision %d.%d\n",
+               dev->name, dev->dev_addr,
                mp->chipid >> 8, mp->chipid & 0xff);
 
         return 0;
diff --git a/drivers/net/macmace.c b/drivers/net/macmace.c
index 85587a6667b9..0b28318789a3 100644
--- a/drivers/net/macmace.c
+++ b/drivers/net/macmace.c
@@ -194,7 +194,6 @@ static int __devinit mace_probe(struct platform_device *pdev)
         unsigned char checksum = 0;
         static int found = 0;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         if (found || macintosh_config->ether_type != MAC_ETHER_MACE)
                 return -ENODEV;
@@ -249,8 +248,8 @@ static int __devinit mace_probe(struct platform_device *pdev)
         dev->set_multicast_list = mace_set_multicast;
         dev->set_mac_address    = mace_set_address;
 
-        printk(KERN_INFO "%s: 68K MACE, hardware address %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: 68K MACE, hardware address %pM\n",
+               dev->name, dev->dev_addr);
 
         err = register_netdev(dev);
         if (!err)
diff --git a/drivers/net/macsonic.c b/drivers/net/macsonic.c
index e64c2086d33c..205bb05c25d6 100644
--- a/drivers/net/macsonic.c
+++ b/drivers/net/macsonic.c
@@ -220,7 +220,6 @@ static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev)
         struct sonic_local *lp = netdev_priv(dev);
         const int prom_addr = ONBOARD_SONIC_PROM_BASE;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         /* On NuBus boards we can sometimes look in the ROM resources.
            No such luck for comm-slot/onboard. */
@@ -264,8 +263,8 @@ static int __init mac_onboard_sonic_ethernet_addr(struct net_device *dev)
                 dev->dev_addr[1] = val >> 8;
                 dev->dev_addr[0] = val & 0xff;
 
-                printk(KERN_INFO "HW Address from CAM 15: %s\n",
-                       print_mac(mac, dev->dev_addr));
+                printk(KERN_INFO "HW Address from CAM 15: %pM\n",
+                       dev->dev_addr);
         } else return 0;
 
         if (memcmp(dev->dev_addr, "\x08\x00\x07", 3) &&
@@ -560,7 +559,6 @@ static int __init mac_sonic_probe(struct platform_device *pdev)
         struct net_device *dev;
         struct sonic_local *lp;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof(struct sonic_local));
         if (!dev)
@@ -584,8 +582,7 @@ found:
         if (err)
                 goto out;
 
-        printk("%s: MAC %s IRQ %d\n",
-               dev->name, print_mac(mac, dev->dev_addr), dev->irq);
+        printk("%s: MAC %pM IRQ %d\n", dev->name, dev->dev_addr, dev->irq);
 
         return 0;
 
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 42394505bb50..1d2de0b77a2c 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -333,10 +333,34 @@ static u32 macvlan_ethtool_get_rx_csum(struct net_device *dev)
         return lowerdev->ethtool_ops->get_rx_csum(lowerdev);
 }
 
+static int macvlan_ethtool_get_settings(struct net_device *dev,
+                                        struct ethtool_cmd *cmd)
+{
+        const struct macvlan_dev *vlan = netdev_priv(dev);
+        struct net_device *lowerdev = vlan->lowerdev;
+
+        if (!lowerdev->ethtool_ops->get_settings)
+                return -EOPNOTSUPP;
+
+        return lowerdev->ethtool_ops->get_settings(lowerdev, cmd);
+}
+
+static u32 macvlan_ethtool_get_flags(struct net_device *dev)
+{
+        const struct macvlan_dev *vlan = netdev_priv(dev);
+        struct net_device *lowerdev = vlan->lowerdev;
+
+        if (!lowerdev->ethtool_ops->get_flags)
+                return 0;
+        return lowerdev->ethtool_ops->get_flags(lowerdev);
+}
+
 static const struct ethtool_ops macvlan_ethtool_ops = {
         .get_link               = ethtool_op_get_link,
+        .get_settings           = macvlan_ethtool_get_settings,
         .get_rx_csum            = macvlan_ethtool_get_rx_csum,
         .get_drvinfo            = macvlan_ethtool_get_drvinfo,
+        .get_flags              = macvlan_ethtool_get_flags,
 };
 
 static void macvlan_setup(struct net_device *dev)
diff --git a/drivers/net/meth.c b/drivers/net/meth.c
index a1e22ed1f6ee..621133b45f8f 100644
--- a/drivers/net/meth.c
+++ b/drivers/net/meth.c
@@ -94,10 +94,9 @@ char o2meth_eaddr[8]={0,0,0,0,0,0,0,0};
 static inline void load_eaddr(struct net_device *dev)
 {
         int i;
-        DECLARE_MAC_BUF(mac);
         u64 macaddr;
 
-        DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
+        DPRINTK("Loading MAC Address: %pM\n", dev->dev_addr);
         macaddr = 0;
         for (i = 0; i < 6; i++)
                 macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8);
diff --git a/drivers/net/mlx4/mcg.c b/drivers/net/mlx4/mcg.c
index 592c01ae2c5d..b1622062b12d 100644
--- a/drivers/net/mlx4/mcg.c
+++ b/drivers/net/mlx4/mcg.c
@@ -118,17 +118,7 @@ static int find_mgm(struct mlx4_dev *dev,
                 return err;
 
         if (0)
-                mlx4_dbg(dev, "Hash for %04x:%04x:%04x:%04x:"
-                          "%04x:%04x:%04x:%04x is %04x\n",
-                          be16_to_cpu(((__be16 *) gid)[0]),
-                          be16_to_cpu(((__be16 *) gid)[1]),
-                          be16_to_cpu(((__be16 *) gid)[2]),
-                          be16_to_cpu(((__be16 *) gid)[3]),
-                          be16_to_cpu(((__be16 *) gid)[4]),
-                          be16_to_cpu(((__be16 *) gid)[5]),
-                          be16_to_cpu(((__be16 *) gid)[6]),
-                          be16_to_cpu(((__be16 *) gid)[7]),
-                          *hash);
+                mlx4_dbg(dev, "Hash for %pI6 is %04x\n", gid, *hash);
 
         *index = *hash;
         *prev  = -1;
@@ -277,16 +267,7 @@ int mlx4_multicast_detach(struct mlx4_dev *dev, struct mlx4_qp *qp, u8 gid[16])
                 goto out;
 
         if (index == -1) {
-                mlx4_err(dev, "MGID %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
-                          "not found\n",
-                          be16_to_cpu(((__be16 *) gid)[0]),
-                          be16_to_cpu(((__be16 *) gid)[1]),
-                          be16_to_cpu(((__be16 *) gid)[2]),
-                          be16_to_cpu(((__be16 *) gid)[3]),
-                          be16_to_cpu(((__be16 *) gid)[4]),
-                          be16_to_cpu(((__be16 *) gid)[5]),
-                          be16_to_cpu(((__be16 *) gid)[6]),
-                          be16_to_cpu(((__be16 *) gid)[7]));
+                mlx4_err(dev, "MGID %pI6 not found\n", gid);
                 err = -EINVAL;
                 goto out;
         }
diff --git a/drivers/net/mv643xx_eth.c b/drivers/net/mv643xx_eth.c
index a9c8c08044b1..3a759d0a7d1a 100644
--- a/drivers/net/mv643xx_eth.c
+++ b/drivers/net/mv643xx_eth.c
@@ -2589,7 +2589,6 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         struct mv643xx_eth_private *mp;
         struct net_device *dev;
         struct resource *res;
-        DECLARE_MAC_BUF(mac);
         int err;
 
         pd = pdev->dev.platform_data;
@@ -2683,8 +2682,8 @@ static int mv643xx_eth_probe(struct platform_device *pdev)
         if (err)
                 goto out;
 
-        dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %s\n",
-                   mp->port_num, print_mac(mac, dev->dev_addr));
+        dev_printk(KERN_NOTICE, &dev->dev, "port %d with MAC address %pM\n",
+                   mp->port_num, dev->dev_addr);
 
         if (mp->tx_desc_sram_size > 0)
                 dev_printk(KERN_NOTICE, &dev->dev, "configured with sram\n");
diff --git a/drivers/net/mvme147.c b/drivers/net/mvme147.c
index 06ca4252155f..d30b0d0026ec 100644
--- a/drivers/net/mvme147.c
+++ b/drivers/net/mvme147.c
@@ -67,7 +67,6 @@ struct net_device * __init mvme147lance_probe(int unit)
         u_long *addr;
         u_long address;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         if (!MACH_IS_MVME147 || called)
                 return ERR_PTR(-ENODEV);
@@ -102,9 +101,9 @@ struct net_device * __init mvme147lance_probe(int unit)
         dev->dev_addr[3]=address&0xff;
 
         printk("%s: MVME147 at 0x%08lx, irq %d, "
-               "Hardware Address %s\n",
+               "Hardware Address %pM\n",
                dev->name, dev->base_addr, MVME147_LANCE_IRQ,
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
 
         lp = (struct m147lance_private *)dev->priv;
         lp->ram = __get_dma_pages(GFP_ATOMIC, 3);       /* 16K */
diff --git a/drivers/net/myri10ge/myri10ge.c b/drivers/net/myri10ge/myri10ge.c
index a5f428bcc0eb..d2cbc7d55b10 100644
--- a/drivers/net/myri10ge/myri10ge.c
+++ b/drivers/net/myri10ge/myri10ge.c
@@ -2983,7 +2983,6 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
         struct dev_mc_list *mc_list;
         __be32 data[2] = { 0, 0 };
         int err;
-        DECLARE_MAC_BUF(mac);
 
         /* can be called from atomic contexts,
          * pass 1 to force atomicity in myri10ge_send_cmd() */
@@ -3030,8 +3029,7 @@ static void myri10ge_set_multicast_list(struct net_device *dev)
                         printk(KERN_ERR "myri10ge: %s: Failed "
                                "MXGEFW_JOIN_MULTICAST_GROUP, error status:"
                                "%d\t", dev->name, err);
-                        printk(KERN_ERR "MAC %s\n",
-                               print_mac(mac, mc_list->dmi_addr));
+                        printk(KERN_ERR "MAC %pM\n", mc_list->dmi_addr);
                         goto abort;
                 }
         }
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 3ad7589d6a1c..1bbdde199220 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -318,13 +318,10 @@ static void myri_is_not_so_happy(struct myri_eth *mp)
 #ifdef DEBUG_HEADER
 static void dump_ehdr(struct ethhdr *ehdr)
 {
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
-        printk("ehdr[h_dst(%s)"
-               "h_source(%s)"
+        printk("ehdr[h_dst(%pM)"
+               "h_source(%pM)"
                "h_proto(%04x)]\n",
-               print_mac(mac, ehdr->h_dest), print_mac(mac2, ehdr->h_source),
-               ehdr->h_proto);
+               ehdr->h_dest, ehdr->h_source, ehdr->h_proto);
 }
 
 static void dump_ehdr_and_myripad(unsigned char *stuff)
@@ -905,7 +902,6 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic
         struct device_node *dp = op->node;
         static unsigned version_printed;
         struct net_device *dev;
-        DECLARE_MAC_BUF(mac);
         struct myri_eth *mp;
         const void *prop;
         static int num;
@@ -1088,8 +1084,8 @@ static int __devinit myri_sbus_probe(struct of_device *op, const struct of_devic
 
         num++;
 
-        printk("%s: MyriCOM MyriNET Ethernet %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk("%s: MyriCOM MyriNET Ethernet %pM\n",
+               dev->name, dev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c
index f7fa3944659b..5f1de803feeb 100644
--- a/drivers/net/natsemi.c
+++ b/drivers/net/natsemi.c
@@ -792,7 +792,6 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
         const int pcibar = 1; /* PCI base address register */
         int prev_eedata;
         u32 tmp;
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -948,10 +947,10 @@ static int __devinit natsemi_probe1 (struct pci_dev *pdev,
 
         if (netif_msg_drv(np)) {
                 printk(KERN_INFO "natsemi %s: %s at %#08llx "
-                       "(%s), %s, IRQ %d",
+                       "(%s), %pM, IRQ %d",
                        dev->name, natsemi_pci_info[chip_idx].name,
                        (unsigned long long)iostart, pci_name(np->pci_dev),
-                       print_mac(mac, dev->dev_addr), irq);
+                       dev->dev_addr, irq);
                 if (dev->if_port == PORT_TP)
                         printk(", port TP.\n");
                 else if (np->ignore_phy)
diff --git a/drivers/net/ne-h8300.c b/drivers/net/ne-h8300.c
index fbc7531d3c7d..aa99f5e09d37 100644
--- a/drivers/net/ne-h8300.c
+++ b/drivers/net/ne-h8300.c
@@ -204,7 +204,6 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
         static unsigned version_printed;
         struct ei_device *ei_local = (struct ei_device *) netdev_priv(dev);
         unsigned char bus_width;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -299,7 +298,7 @@ static int __init ne_probe1(struct net_device *dev, int ioaddr)
 
         for(i = 0; i < ETHER_ADDR_LEN; i++)
                 dev->dev_addr[i] = SA_prom[i];
-        printk(" %s\n", print_mac(mac, dev->dev_addr));
+        printk(" %pM\n", dev->dev_addr);
 
         printk("%s: %s found at %#x, using IRQ %d.\n",
                 dev->name, name, ioaddr, dev->irq);
diff --git a/drivers/net/ne.c b/drivers/net/ne.c
index eb681c0d51ba..f708712a374a 100644
--- a/drivers/net/ne.c
+++ b/drivers/net/ne.c
@@ -297,7 +297,6 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
         int neX000, ctron, copam, bad_card;
         int reg0, ret;
         static unsigned version_printed;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, NE_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -517,7 +516,7 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr)
         }
 #endif
 
-        printk("%s\n", print_mac(mac, dev->dev_addr));
+        printk("%pM\n", dev->dev_addr);
 
         ei_status.name = name;
         ei_status.tx_start_page = start_page;
diff --git a/drivers/net/ne2.c b/drivers/net/ne2.c
index 332df75a9ab6..6f8f32603466 100644
--- a/drivers/net/ne2.c
+++ b/drivers/net/ne2.c
@@ -302,7 +302,6 @@ out:
 static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
 {
         int len=0;
-        DECLARE_MAC_BUF(mac);
 
         len += sprintf(buf+len, "The NE/2 Ethernet Adapter\n" );
         len += sprintf(buf+len, "Driver written by Wim Dumon ");
@@ -313,7 +312,7 @@ static int ne2_procinfo(char *buf, int slot, struct net_device *dev)
         len += sprintf(buf+len, "Based on the original NE2000 drivers\n" );
         len += sprintf(buf+len, "Base IO: %#x\n", (unsigned int)dev->base_addr);
         len += sprintf(buf+len, "IRQ    : %d\n", dev->irq);
-        len += sprintf(buf+len, "HW addr : %s\n", print_mac(mac, dev->dev_addr));
+        len += sprintf(buf+len, "HW addr : %pM\n", dev->dev_addr);
 
         return len;
 }
@@ -326,7 +325,6 @@ static int __init ne2_probe1(struct net_device *dev, int slot)
         const char *name = "NE/2";
         int start_page, stop_page;
         static unsigned version_printed;
-        DECLARE_MAC_BUF(mac);
 
         if (ei_debug && version_printed++ == 0)
                 printk(version);
@@ -469,7 +467,7 @@ static int __init ne2_probe1(struct net_device *dev, int slot)
         for(i = 0; i < ETHER_ADDR_LEN; i++)
                 dev->dev_addr[i] = SA_prom[i];
 
-        printk(" %s\n", print_mac(mac, dev->dev_addr));
+        printk(" %pM\n", dev->dev_addr);
 
         printk("%s: %s found at %#x, using IRQ %d.\n",
                         dev->name, name, base_addr, dev->irq);
diff --git a/drivers/net/ne2k-pci.c b/drivers/net/ne2k-pci.c
index de0de744a8fa..12a7d6de1411 100644
--- a/drivers/net/ne2k-pci.c
+++ b/drivers/net/ne2k-pci.c
@@ -212,7 +212,6 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
         static unsigned int fnd_cnt;
         long ioaddr;
         int flags = pci_clone_list[chip_idx].flags;
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -368,9 +367,9 @@ static int __devinit ne2k_pci_init_one (struct pci_dev *pdev,
 
         for(i = 0; i < 6; i++)
                 dev->dev_addr[i] = SA_prom[i];
-        printk("%s: %s found at %#lx, IRQ %d, %s.\n",
+        printk("%s: %s found at %#lx, IRQ %d, %pM.\n",
                dev->name, pci_clone_list[chip_idx].name, ioaddr, dev->irq,
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
 
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 
diff --git a/drivers/net/ne3210.c b/drivers/net/ne3210.c
index 425043a88db9..6681ca748c74 100644
--- a/drivers/net/ne3210.c
+++ b/drivers/net/ne3210.c
@@ -99,7 +99,6 @@ static int __init ne3210_eisa_probe (struct device *device)
         int i, retval, port_index;
         struct eisa_device *edev = to_eisa_device (device);
         struct net_device *dev;
-        DECLARE_MAC_BUF(mac);
 
         /* Allocate dev->priv and fill in 8390 specific dev fields. */
         if (!(dev = alloc_ei_netdev ())) {
@@ -131,8 +130,8 @@ static int __init ne3210_eisa_probe (struct device *device)
         port_index = inb(ioaddr + NE3210_CFG2) >> 6;
         for(i = 0; i < ETHER_ADDR_LEN; i++)
                 dev->dev_addr[i] = inb(ioaddr + NE3210_SA_PROM + i);
-        printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %s.\n",
-                edev->slot, ifmap[port_index], print_mac(mac, dev->dev_addr));
+        printk("ne3210.c: NE3210 in EISA slot %d, media: %s, addr: %pM.\n",
+                edev->slot, ifmap[port_index], dev->dev_addr);
 
         /* Snarf the interrupt now. CFG file has them all listed as `edge' with share=NO */
         dev->irq = irq_map[(inb(ioaddr + NE3210_CFG2) >> 3) & 0x07];
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 9681618c3232..d304d38cd5d1 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -307,17 +307,14 @@ static ssize_t show_remote_ip(struct netconsole_target *nt, char *buf)
 static ssize_t show_local_mac(struct netconsole_target *nt, char *buf)
 {
         struct net_device *dev = nt->np.dev;
+        static const u8 bcast[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
 
-        DECLARE_MAC_BUF(mac);
-        return snprintf(buf, PAGE_SIZE, "%s\n", dev ?
-                        print_mac(mac, dev->dev_addr) : "ff:ff:ff:ff:ff:ff");
+        return snprintf(buf, PAGE_SIZE, "%pM\n", dev ? dev->dev_addr : bcast);
 }
 
 static ssize_t show_remote_mac(struct netconsole_target *nt, char *buf)
 {
-        DECLARE_MAC_BUF(mac);
-        return snprintf(buf, PAGE_SIZE, "%s\n",
-                        print_mac(mac, nt->np.remote_mac));
+        return snprintf(buf, PAGE_SIZE, "%pM\n", nt->np.remote_mac);
 }
 
 /*
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 6ef3f0d84bcf..33caca90e80c 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -439,7 +439,6 @@ netxen_read_mac_addr(struct netxen_adapter *adapter)
         int i;
         unsigned char *p;
         __le64 mac_addr;
-        DECLARE_MAC_BUF(mac);
         struct net_device *netdev = adapter->netdev;
         struct pci_dev *pdev = adapter->pdev;
 
@@ -462,10 +461,9 @@ netxen_read_mac_addr(struct netxen_adapter *adapter)
 
         /* set station address */
 
-        if (!is_valid_ether_addr(netdev->perm_addr)) {
-                dev_warn(&pdev->dev, "Bad MAC address %s.\n",
-                                print_mac(mac, netdev->dev_addr));
-        } else
+        if (!is_valid_ether_addr(netdev->perm_addr))
+                dev_warn(&pdev->dev, "Bad MAC address %pM.\n", netdev->dev_addr);
+        else
                 adapter->macaddr_set(adapter, netdev->dev_addr);
 
         return 0;
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index 27f07f6a45b1..c3b9c83b32fe 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -608,7 +608,6 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
         int phy = adapter->physical_port;
         unsigned char mac_addr[6];
         int i;
-        DECLARE_MAC_BUF(mac);
 
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
                 return 0;
@@ -636,10 +635,8 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
         if (i == 10) {
                 printk(KERN_ERR "%s: cannot set Mac addr for %s\n",
                        netxen_nic_driver_name, adapter->netdev->name);
-                printk(KERN_ERR "MAC address set: %s.\n",
-                       print_mac(mac, addr));
-                printk(KERN_ERR "MAC address get: %s.\n",
-                       print_mac(mac, mac_addr));
+                printk(KERN_ERR "MAC address set: %pM.\n", addr);
+                printk(KERN_ERR "MAC address get: %pM.\n", mac_addr);
         }
         return 0;
 }
diff --git a/drivers/net/ni5010.c b/drivers/net/ni5010.c
index 8e0ca9f4e404..e88ec8a2f837 100644
--- a/drivers/net/ni5010.c
+++ b/drivers/net/ni5010.c
@@ -203,7 +203,6 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
         unsigned int data = 0;
         int boguscount = 40;
         int err = -ENODEV;
-        DECLARE_MAC_BUF(mac);
 
         dev->base_addr = ioaddr;
         dev->irq = irq;
@@ -271,7 +270,7 @@ static int __init ni5010_probe1(struct net_device *dev, int ioaddr)
                 outw(i, IE_GP);
                 dev->dev_addr[i] = inb(IE_SAPROM);
         }
-        printk("%s ", print_mac(mac, dev->dev_addr));
+        printk("%pM ", dev->dev_addr);
 
         PRINTK2((KERN_DEBUG "%s: I/O #4 passed!\n", dev->name));
 
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index ebc812702903..f927bc06980a 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -8638,10 +8638,8 @@ static void __devinit niu_assign_netdev_ops(struct net_device *dev)
 static void __devinit niu_device_announce(struct niu *np)
 {
         struct net_device *dev = np->dev;
-        DECLARE_MAC_BUF(mac);
 
-        pr_info("%s: NIU Ethernet %s\n",
-                dev->name, print_mac(mac, dev->dev_addr));
+        pr_info("%s: NIU Ethernet %pM\n", dev->name, dev->dev_addr);
 
         if (np->parent->plat_type == PLAT_TYPE_ATCA_CP3220) {
                 pr_info("%s: Port type[%s] mode[%s:%s] XCVR[%s] phy[%s]\n",
diff --git a/drivers/net/ns83820.c b/drivers/net/ns83820.c
index ff449619f047..4bb64415437f 100644
--- a/drivers/net/ns83820.c
+++ b/drivers/net/ns83820.c
@@ -1955,7 +1955,6 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
         long addr;
         int err;
         int using_dac = 0;
-        DECLARE_MAC_BUF(mac);
 
         /* See if we can set the dma mask early on; failure is fatal. */
         if (sizeof(dma_addr_t) == 8 &&
@@ -2220,12 +2219,11 @@ static int __devinit ns83820_init_one(struct pci_dev *pci_dev, const struct pci_
                 ndev->features |= NETIF_F_HIGHDMA;
         }
 
-        printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %s io=0x%08lx irq=%d f=%s\n",
+        printk(KERN_INFO "%s: ns83820 v" VERSION ": DP83820 v%u.%u: %pM io=0x%08lx irq=%d f=%s\n",
                 ndev->name,
                 (unsigned)readl(dev->base + SRR) >> 8,
                 (unsigned)readl(dev->base + SRR) & 0xff,
-                print_mac(mac, ndev->dev_addr),
-                addr, pci_dev->irq,
+                ndev->dev_addr, addr, pci_dev->irq,
                 (ndev->features & NETIF_F_HIGHDMA) ? "h,sg" : "sg"
                 );
 
diff --git a/drivers/net/pasemi_mac.c b/drivers/net/pasemi_mac.c
index edc0fd588985..b0270052c3a9 100644
--- a/drivers/net/pasemi_mac.c
+++ b/drivers/net/pasemi_mac.c
@@ -1742,7 +1742,6 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct net_device *dev;
         struct pasemi_mac *mac;
         int err;
-        DECLARE_MAC_BUF(mac_buf);
 
         err = pci_enable_device(pdev);
         if (err)
@@ -1849,9 +1848,9 @@ pasemi_mac_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                         err);
                 goto out;
         } else if netif_msg_probe(mac)
-                printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %s\n",
+                printk(KERN_INFO "%s: PA Semi %s: intf %d, hw addr %pM\n",
                        dev->name, mac->type == MAC_TYPE_GMAC ? "GMAC" : "XAUI",
-                       mac->dma_if, print_mac(mac_buf, dev->dev_addr));
+                       mac->dma_if, dev->dev_addr);
 
         return err;
 
diff --git a/drivers/net/pci-skeleton.c b/drivers/net/pci-skeleton.c
index 0a575fef29e6..bf952acee1f7 100644
--- a/drivers/net/pci-skeleton.c
+++ b/drivers/net/pci-skeleton.c
@@ -737,7 +737,6 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
         int i, addr_len, option;
         void *ioaddr = NULL;
         static int board_idx = -1;
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -797,11 +796,11 @@ static int __devinit netdrv_init_one (struct pci_dev *pdev,
 
         tp->phys[0] = 32;
 
-        printk (KERN_INFO "%s: %s at 0x%lx, %sIRQ %d\n",
+        printk (KERN_INFO "%s: %s at 0x%lx, %pM IRQ %d\n",
                 dev->name,
                 board_info[ent->driver_data].name,
                 dev->base_addr,
-                print_mac(mac, dev->dev_addr),
+                dev->dev_addr,
                 dev->irq);
 
         printk (KERN_DEBUG "%s:  Identified 8139 chip type '%s'\n",
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 08c4dd896077..dcbb11ab98db 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -345,7 +345,6 @@ static int tc574_config(struct pcmcia_device *link)
         __be16 *phys_addr;
         char *cardname;
         __u32 config;
-        DECLARE_MAC_BUF(mac);
 
         phys_addr = (__be16 *)dev->dev_addr;
 
@@ -463,9 +462,9 @@ static int tc574_config(struct pcmcia_device *link)
         strcpy(lp->node.dev_name, dev->name);
 
         printk(KERN_INFO "%s: %s at io %#3lx, irq %d, "
-               "hw_addr %s.\n",
+               "hw_addr %pM.\n",
                dev->name, cardname, dev->base_addr, dev->irq,
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
         printk(" %dK FIFO split %s Rx:Tx, %sMII interface.\n",
                    8 << config & Ram_size,
                    ram_split[(config & Ram_split) >> Ram_split_shift],
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index c235cdba69c6..5882109be777 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -255,7 +255,6 @@ static int tc589_config(struct pcmcia_device *link)
     int last_fn, last_ret, i, j, multi = 0, fifo;
     unsigned int ioaddr;
     char *ram_split[] = {"5:3", "3:1", "1:1", "3:5"};
-    DECLARE_MAC_BUF(mac);
     
     DEBUG(0, "3c589_config(0x%p)\n", link);
 
@@ -333,9 +332,9 @@ static int tc589_config(struct pcmcia_device *link)
     strcpy(lp->node.dev_name, dev->name);
 
     printk(KERN_INFO "%s: 3Com 3c%s, io %#3lx, irq %d, "
-           "hw_addr %s\n",
+           "hw_addr %pM\n",
            dev->name, (multi ? "562" : "589"), dev->base_addr, dev->irq,
-           print_mac(mac, dev->dev_addr));
+           dev->dev_addr);
     printk(KERN_INFO "  %dK FIFO split %s Rx:Tx, %s xcvr\n",
            (fifo & 7) ? 32 : 8, ram_split[(fifo >> 16) & 3],
            if_names[dev->if_port]);
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index b37a498939ae..889f1bdb0853 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -321,7 +321,6 @@ static int axnet_config(struct pcmcia_device *link)
     struct net_device *dev = link->priv;
     axnet_dev_t *info = PRIV(dev);
     int i, j, last_ret, last_fn;
-    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "axnet_config(0x%p)\n", link);
 
@@ -397,10 +396,10 @@ static int axnet_config(struct pcmcia_device *link)
     strcpy(info->node.dev_name, dev->name);
 
     printk(KERN_INFO "%s: Asix AX88%d90: io %#3lx, irq %d, "
-           "hw_addr %s\n",
+           "hw_addr %pM\n",
            dev->name, ((info->flags & IS_AX88790) ? 7 : 1),
            dev->base_addr, dev->irq,
-           print_mac(mac, dev->dev_addr));
+           dev->dev_addr);
     if (info->phy_id != -1) {
         DEBUG(0, "  MII transceiver at index %d, status %x.\n", info->phy_id, j);
     } else {
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 69d916daa7bb..465e4ad363ce 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -348,7 +348,6 @@ static int fmvj18x_config(struct pcmcia_device *link)
     cardtype_t cardtype;
     char *card_name = "unknown";
     u_char *node_id;
-    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "fmvj18x_config(0x%p)\n", link);
 
@@ -539,9 +538,9 @@ static int fmvj18x_config(struct pcmcia_device *link)
 
     /* print current configuration */
     printk(KERN_INFO "%s: %s, sram %s, port %#3lx, irq %d, "
-           "hw_addr %s\n",
+           "hw_addr %pM\n",
            dev->name, card_name, sram_config == 0 ? "4K TX*2" : "8K TX*2", 
-           dev->base_addr, dev->irq, print_mac(mac, dev->dev_addr));
+           dev->base_addr, dev->irq, dev->dev_addr);
 
     return 0;
     
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index 448cd40aeba5..35a1d1024c50 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -659,7 +659,6 @@ static int nmclan_config(struct pcmcia_device *link)
   u_char buf[64];
   int i, last_ret, last_fn;
   unsigned int ioaddr;
-  DECLARE_MAC_BUF(mac);
 
   DEBUG(0, "nmclan_config(0x%p)\n", link);
 
@@ -719,9 +718,9 @@ static int nmclan_config(struct pcmcia_device *link)
   strcpy(lp->node.dev_name, dev->name);
 
   printk(KERN_INFO "%s: nmclan: port %#3lx, irq %d, %s port,"
-         " hw_addr %s\n",
+         " hw_addr %pM\n",
          dev->name, dev->base_addr, dev->irq, if_names[dev->if_port],
-         print_mac(mac, dev->dev_addr));
+         dev->dev_addr);
   return 0;
 
 cs_failed:
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index e40d6301aa7a..69625373a8ed 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -554,7 +554,6 @@ static int pcnet_config(struct pcmcia_device *link)
     int last_ret, last_fn, start_pg, stop_pg, cm_offset;
     int has_shmem = 0;
     hw_info_t *local_hw_info;
-    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "pcnet_config(0x%p)\n", link);
 
@@ -675,7 +674,7 @@ static int pcnet_config(struct pcmcia_device *link)
         printk (" mem %#5lx,", dev->mem_start);
     if (info->flags & HAS_MISC_REG)
         printk(" %s xcvr,", if_names[dev->if_port]);
-    printk(" hw_addr %s\n", print_mac(mac, dev->dev_addr));
+    printk(" hw_addr %pM\n", dev->dev_addr);
     return 0;
 
 cs_failed:
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index c74d6656d266..fccd53ef3c64 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -949,7 +949,6 @@ static int smc91c92_config(struct pcmcia_device *link)
     int i, j, rev;
     unsigned int ioaddr;
     u_long mir;
-    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "smc91c92_config(0x%p)\n", link);
 
@@ -1062,9 +1061,9 @@ static int smc91c92_config(struct pcmcia_device *link)
     strcpy(smc->node.dev_name, dev->name);
 
     printk(KERN_INFO "%s: smc91c%s rev %d: io %#3lx, irq %d, "
-           "hw_addr %s\n",
+           "hw_addr %pM\n",
            dev->name, name, (rev & 0x0f), dev->base_addr, dev->irq,
-           print_mac(mac, dev->dev_addr));
+           dev->dev_addr);
 
     if (rev > 0) {
         if (mir & 0x3ff)
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index e1fd585e7131..c45c3064fee6 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -772,7 +772,6 @@ xirc2ps_config(struct pcmcia_device * link)
     int err, i;
     u_char buf[64];
     cistpl_lan_node_id_t *node_id = (cistpl_lan_node_id_t*)parse.funce.data;
-    DECLARE_MAC_BUF(mac);
 
     local->dingo_ccr = NULL;
 
@@ -1051,9 +1050,9 @@ xirc2ps_config(struct pcmcia_device * link)
     strcpy(local->node.dev_name, dev->name);
 
     /* give some infos about the hardware */
-    printk(KERN_INFO "%s: %s: port %#3lx, irq %d, hwaddr %s\n",
+    printk(KERN_INFO "%s: %s: port %#3lx, irq %d, hwaddr %pM\n",
            dev->name, local->manf_str,(u_long)dev->base_addr, (int)dev->irq,
-           print_mac(mac, dev->dev_addr));
+           dev->dev_addr);
 
     return 0;
 
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c
index ca8c0e037400..15bf6fe8416d 100644
--- a/drivers/net/pcnet32.c
+++ b/drivers/net/pcnet32.c
@@ -1747,8 +1747,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
                 memset(dev->dev_addr, 0, sizeof(dev->dev_addr));
 
         if (pcnet32_debug & NETIF_MSG_PROBE) {
-                DECLARE_MAC_BUF(mac);
-                printk(" %s", print_mac(mac, dev->dev_addr));
+                printk(" %pM", dev->dev_addr);
 
                 /* Version 0x2623 and 0x2624 */
                 if (((chip_version + 1) & 0xfffe) == 0x2624) {
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index b646e92134dc..c22b30533a14 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -958,7 +958,6 @@ static int pppoe_seq_show(struct seq_file *seq, void *v)
 {
         struct pppox_sock *po;
         char *dev_name;
-        DECLARE_MAC_BUF(mac);
 
         if (v == SEQ_START_TOKEN) {
                 seq_puts(seq, "Id       Address              Device\n");
@@ -968,8 +967,8 @@ static int pppoe_seq_show(struct seq_file *seq, void *v)
         po = v;
         dev_name = po->pppoe_pa.dev;
 
-        seq_printf(seq, "%08X %s %8s\n",
-                   po->pppoe_pa.sid, print_mac(mac, po->pppoe_pa.remote), dev_name);
+        seq_printf(seq, "%08X %pM %8s\n",
+                   po->pppoe_pa.sid, po->pppoe_pa.remote, dev_name);
 out:
         return 0;
 }
diff --git a/drivers/net/ps3_gelic_net.c b/drivers/net/ps3_gelic_net.c
index 2eb54fd7bed5..4b564eda5bd9 100644
--- a/drivers/net/ps3_gelic_net.c
+++ b/drivers/net/ps3_gelic_net.c
@@ -1443,7 +1443,6 @@ int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card)
 {
         int status;
         u64 v1, v2;
-        DECLARE_MAC_BUF(mac);
 
         netdev->features = NETIF_F_IP_CSUM;
 
@@ -1474,9 +1473,8 @@ int gelic_net_setup_netdev(struct net_device *netdev, struct gelic_card *card)
                         __func__, netdev->name, status);
                 return status;
         }
-        dev_info(ctodev(card), "%s: MAC addr %s\n",
-                 netdev->name,
-                 print_mac(mac, netdev->dev_addr));
+        dev_info(ctodev(card), "%s: MAC addr %pM\n",
+                 netdev->name, netdev->dev_addr);
 
         return 0;
 }
diff --git a/drivers/net/ps3_gelic_wireless.c b/drivers/net/ps3_gelic_wireless.c
index a834b52a6a2c..d10dc3ea9c79 100644
--- a/drivers/net/ps3_gelic_wireless.c
+++ b/drivers/net/ps3_gelic_wireless.c
@@ -763,7 +763,6 @@ static void scan_list_dump(struct gelic_wl_info *wl)
 {
         struct gelic_wl_scan_info *scan_info;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         i = 0;
         list_for_each_entry(scan_info, &wl->network_list, list) {
@@ -775,8 +774,7 @@ static void scan_list_dump(struct gelic_wl_info *wl)
                          scan_info->rate_len, scan_info->rate_ext_len,
                          scan_info->essid_len);
                 /* -- */
-                pr_debug("bssid=%s\n",
-                         print_mac(mac, &scan_info->hwinfo->bssid[2]));
+                pr_debug("bssid=%pM\n", &scan_info->hwinfo->bssid[2]);
                 pr_debug("essid=%s\n", scan_info->hwinfo->essid);
         }
 }
@@ -1167,11 +1165,7 @@ static int gelic_wl_set_ap(struct net_device *netdev,
                        ETH_ALEN);
                 set_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
                 set_bit(GELIC_WL_STAT_CONFIGURED, &wl->stat);
-                pr_debug("%s: bss=%02x:%02x:%02x:%02x:%02x:%02x\n",
-                         __func__,
-                         wl->bssid[0], wl->bssid[1],
-                         wl->bssid[2], wl->bssid[3],
-                         wl->bssid[4], wl->bssid[5]);
+                pr_debug("%s: bss=%pM\n", __func__, wl->bssid);
         } else {
                 pr_debug("%s: clear bssid\n", __func__);
                 clear_bit(GELIC_WL_STAT_BSSID_SET, &wl->stat);
@@ -1632,7 +1626,6 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
         unsigned long this_time = jiffies;
         unsigned int data_len, i, found, r;
         void *buf;
-        DECLARE_MAC_BUF(mac);
 
         pr_debug("%s:start\n", __func__);
         mutex_lock(&wl->scan_lock);
@@ -1684,9 +1677,9 @@ static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
              scan_info_size < data_len;
              i++, scan_info_size += be16_to_cpu(scan_info->size),
              scan_info = (void *)scan_info + be16_to_cpu(scan_info->size)) {
-                pr_debug("%s:size=%d bssid=%s scan_info=%p\n", __func__,
+                pr_debug("%s:size=%d bssid=%pM scan_info=%p\n", __func__,
                          be16_to_cpu(scan_info->size),
-                         print_mac(mac, &scan_info->bssid[2]), scan_info);
+                         &scan_info->bssid[2], scan_info);
 
                 /*
                  * The wireless firmware may return invalid channel 0 and/or
@@ -1787,7 +1780,6 @@ struct gelic_wl_scan_info *gelic_wl_find_best_bss(struct gelic_wl_info *wl)
         struct gelic_wl_scan_info *best_bss;
         int weight, best_weight;
         u16 security;
-        DECLARE_MAC_BUF(mac);
 
         pr_debug("%s: <-\n", __func__);
 
@@ -1857,8 +1849,8 @@ struct gelic_wl_scan_info *gelic_wl_find_best_bss(struct gelic_wl_info *wl)
 #ifdef DEBUG
         pr_debug("%s: -> bss=%p\n", __func__, best_bss);
         if (best_bss) {
-                pr_debug("%s:addr=%s\n", __func__,
-                         print_mac(mac, &best_bss->hwinfo->bssid[2]));
+                pr_debug("%s:addr=%pM\n", __func__,
+                         &best_bss->hwinfo->bssid[2]);
         }
 #endif
         return best_bss;
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c
index 3cdd07c45b6d..acf8dc55e2a0 100644
--- a/drivers/net/qla3xxx.c
+++ b/drivers/net/qla3xxx.c
@@ -3529,7 +3529,6 @@ static void ql_display_dev_info(struct net_device *ndev)
 {
         struct ql3_adapter *qdev = (struct ql3_adapter *)netdev_priv(ndev);
         struct pci_dev *pdev = qdev->pdev;
-        DECLARE_MAC_BUF(mac);
 
         printk(KERN_INFO PFX
                "\n%s Adapter %d RevisionID %d found %s on PCI slot %d.\n",
@@ -3555,8 +3554,8 @@ static void ql_display_dev_info(struct net_device *ndev)
 
         if (netif_msg_probe(qdev))
                 printk(KERN_INFO PFX
-                       "%s: MAC address %s\n",
-                       ndev->name, print_mac(mac, ndev->dev_addr));
+                       "%s: MAC address %pM\n",
+                       ndev->name, ndev->dev_addr);
 }
 
 static int ql_adapter_down(struct ql3_adapter *qdev, int do_reset)
@@ -3978,9 +3977,7 @@ static int __devinit ql3xxx_probe(struct pci_dev *pdev,
         if (qdev->device_id == QL3032_DEVICE_ID)
                 ndev->features |= NETIF_F_IP_CSUM | NETIF_F_SG;
 
-        qdev->mem_map_registers =
-            ioremap_nocache(pci_resource_start(pdev, 1),
-                            pci_resource_len(qdev->pdev, 1));
+        qdev->mem_map_registers = pci_ioremap_bar(pdev, 1);
         if (!qdev->mem_map_registers) {
                 printk(KERN_ERR PFX "%s: cannot map device registers\n",
                        pci_name(pdev));
diff --git a/drivers/net/qlge/qlge_main.c b/drivers/net/qlge/qlge_main.c
index b83a9c9b6a97..6445d2cb1322 100644
--- a/drivers/net/qlge/qlge_main.c
+++ b/drivers/net/qlge/qlge_main.c
@@ -336,12 +336,11 @@ static int ql_set_mac_addr_reg(struct ql_adapter *qdev, u8 *addr, u32 type,
                             (addr[5]);
 
                         QPRINTK(qdev, IFUP, INFO,
-                                "Adding %s address %02x:%02x:%02x:%02x:%02x:%02x"
+                                "Adding %s address %pM"
                                 " at index %d in the CAM.\n",
                                 ((type ==
                                   MAC_ADDR_TYPE_MULTI_MAC) ? "MULTICAST" :
-                                 "UNICAST"), addr[0], addr[1], addr[2], addr[3],
-                                addr[4], addr[5], index);
+                                 "UNICAST"), addr, index);
 
                         status =
                             ql_wait_reg_rdy(qdev,
@@ -3127,11 +3126,7 @@ static void ql_display_dev_info(struct net_device *ndev)
                 qdev->chip_rev_id >> 4 & 0x0000000f,
                 qdev->chip_rev_id >> 8 & 0x0000000f,
                 qdev->chip_rev_id >> 12 & 0x0000000f);
-        QPRINTK(qdev, PROBE, INFO,
-                "MAC address %02x:%02x:%02x:%02x:%02x:%02x\n",
-                ndev->dev_addr[0], ndev->dev_addr[1],
-                ndev->dev_addr[2], ndev->dev_addr[3], ndev->dev_addr[4],
-                ndev->dev_addr[5]);
+        QPRINTK(qdev, PROBE, INFO, "MAC address %pM\n", ndev->dev_addr);
 }
 
 static int ql_adapter_down(struct ql_adapter *qdev)
diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index 2b8fd68bc516..bd4f4ad5d360 100644
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -435,7 +435,6 @@ static int rionet_setup_netdev(struct rio_mport *mport)
         struct net_device *ndev = NULL;
         struct rionet_private *rnet;
         u16 device_id;
-        DECLARE_MAC_BUF(mac);
 
         /* Allocate our net_device structure */
         ndev = alloc_etherdev(sizeof(struct rionet_private));
@@ -485,12 +484,12 @@ static int rionet_setup_netdev(struct rio_mport *mport)
         if (rc != 0)
                 goto out;
 
-        printk("%s: %s %s Version %s, MAC %s\n",
+        printk("%s: %s %s Version %s, MAC %pM\n",
                ndev->name,
                DRV_NAME,
                DRV_DESC,
                DRV_VERSION,
-               print_mac(mac, ndev->dev_addr));
+               ndev->dev_addr);
 
       out:
         return rc;
diff --git a/drivers/net/rrunner.c b/drivers/net/rrunner.c
index 3dd8f1342f70..7343291030c5 100644
--- a/drivers/net/rrunner.c
+++ b/drivers/net/rrunner.c
@@ -511,7 +511,6 @@ static int __devinit rr_init(struct net_device *dev)
         struct rr_private *rrpriv;
         struct rr_regs __iomem *regs;
         u32 sram_size, rev;
-        DECLARE_MAC_BUF(mac);
 
         rrpriv = netdev_priv(dev);
         regs = rrpriv->regs;
@@ -549,7 +548,7 @@ static int __devinit rr_init(struct net_device *dev)
         *(__be32 *)(dev->dev_addr+2) =
           htonl(rr_read_eeprom_word(rrpriv, offsetof(struct eeprom, manf.BoardULA[4])));
 
-        printk("  MAC: %s\n", print_mac(mac, dev->dev_addr));
+        printk("  MAC: %pM\n", dev->dev_addr);
 
         sram_size = rr_read_eeprom_word(rrpriv, 8);
         printk("  SRAM size 0x%06x\n", sram_size);
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c
index 6a1375f9cbb8..5663fa7aa3da 100644
--- a/drivers/net/s2io.c
+++ b/drivers/net/s2io.c
@@ -7748,7 +7748,6 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
         int mode;
         u8 dev_intr_type = intr_type;
         u8 dev_multiq = 0;
-        DECLARE_MAC_BUF(mac);
 
         ret = s2io_verify_parm(pdev, &dev_intr_type, &dev_multiq);
         if (ret)
@@ -7918,8 +7917,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto mem_alloc_failed;
         }
 
-        sp->bar0 = ioremap(pci_resource_start(pdev, 0),
-                                     pci_resource_len(pdev, 0));
+        sp->bar0 = pci_ioremap_bar(pdev, 0);
         if (!sp->bar0) {
                 DBG_PRINT(ERR_DBG, "%s: Neterion: cannot remap io mem1\n",
                           dev->name);
@@ -7927,8 +7925,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                 goto bar0_remap_failed;
         }
 
-        sp->bar1 = ioremap(pci_resource_start(pdev, 2),
-                                     pci_resource_len(pdev, 2));
+        sp->bar1 = pci_ioremap_bar(pdev, 2);
         if (!sp->bar1) {
                 DBG_PRINT(ERR_DBG, "%s: Neterion: cannot remap io mem2\n",
                           dev->name);
@@ -8125,8 +8122,7 @@ s2io_init_nic(struct pci_dev *pdev, const struct pci_device_id *pre)
                   sp->product_name, pdev->revision);
         DBG_PRINT(ERR_DBG, "%s: Driver version %s\n", dev->name,
                   s2io_driver_version);
-        DBG_PRINT(ERR_DBG, "%s: MAC ADDR: %s\n",
-                  dev->name, print_mac(mac, dev->dev_addr));
+        DBG_PRINT(ERR_DBG, "%s: MAC ADDR: %pM\n", dev->name, dev->dev_addr);
         DBG_PRINT(ERR_DBG, "SERIAL NUMBER: %s\n", sp->serial_num);
         if (sp->device_type & XFRAME_II_DEVICE) {
                 mode = s2io_print_pci_mode(sp);
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c
index 2615d46e6e50..480caec1e024 100644
--- a/drivers/net/sb1250-mac.c
+++ b/drivers/net/sb1250-mac.c
@@ -2292,7 +2292,6 @@ static int sbmac_init(struct platform_device *pldev, long long base)
         uint64_t ea_reg;
         int i;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         sc->sbm_dev = dev;
         sc->sbe_idx = idx;
@@ -2373,8 +2372,8 @@ static int sbmac_init(struct platform_device *pldev, long long base)
          * process so we need to finish off the config message that
          * was being displayed)
          */
-        pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %s\n",
-               dev->name, base, print_mac(mac, eaddr));
+        pr_info("%s: SiByte Ethernet at 0x%08Lx, address: %pM\n",
+               dev->name, base, eaddr);
 
         sc->mii_bus->name = sbmac_mdio_string;
         snprintf(sc->mii_bus->id, MII_BUS_ID_SIZE, "%x", idx);
diff --git a/drivers/net/seeq8005.c b/drivers/net/seeq8005.c
index 48c64fb20eec..ad12e7fa06c6 100644
--- a/drivers/net/seeq8005.c
+++ b/drivers/net/seeq8005.c
@@ -158,7 +158,6 @@ static int __init seeq8005_probe1(struct net_device *dev, int ioaddr)
         int old_dmaar;
         int old_rear;
         int retval;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, SEEQ8005_IO_EXTENT, "seeq8005"))
                 return -ENODEV;
@@ -303,7 +302,7 @@ static int __init seeq8005_probe1(struct net_device *dev, int ioaddr)
         /* Retrieve and print the ethernet address. */
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = SA_prom[i+6];
-        printk("%s", print_mac(mac, dev->dev_addr));
+        printk("%pM", dev->dev_addr);
 
         if (dev->irq == 0xff)
                 ;                       /* Do nothing: a user-level program will set it. */
diff --git a/drivers/net/sfc/efx.c b/drivers/net/sfc/efx.c
index 06ea71c7e34e..5b05789f0b79 100644
--- a/drivers/net/sfc/efx.c
+++ b/drivers/net/sfc/efx.c
@@ -612,17 +612,15 @@ static int efx_probe_port(struct efx_nic *efx)
         if (is_valid_ether_addr(efx->mac_address)) {
                 memcpy(efx->net_dev->dev_addr, efx->mac_address, ETH_ALEN);
         } else {
-                DECLARE_MAC_BUF(mac);
-
-                EFX_ERR(efx, "invalid MAC address %s\n",
-                        print_mac(mac, efx->mac_address));
+                EFX_ERR(efx, "invalid MAC address %pM\n",
+                        efx->mac_address);
                 if (!allow_bad_hwaddr) {
                         rc = -EINVAL;
                         goto err;
                 }
                 random_ether_addr(efx->net_dev->dev_addr);
-                EFX_INFO(efx, "using locally-generated MAC %s\n",
-                         print_mac(mac, efx->net_dev->dev_addr));
+                EFX_INFO(efx, "using locally-generated MAC %pM\n",
+                         efx->net_dev->dev_addr);
         }
 
         return 0;
@@ -1401,9 +1399,8 @@ static int efx_set_mac_address(struct net_device *net_dev, void *data)
         EFX_ASSERT_RESET_SERIALISED(efx);
 
         if (!is_valid_ether_addr(new_addr)) {
-                DECLARE_MAC_BUF(mac);
-                EFX_ERR(efx, "invalid ethernet MAC address requested: %s\n",
-                        print_mac(mac, new_addr));
+                EFX_ERR(efx, "invalid ethernet MAC address requested: %pM\n",
+                        new_addr);
                 return -EINVAL;
         }
 
diff --git a/drivers/net/sgiseeq.c b/drivers/net/sgiseeq.c
index 6261201403cd..ffc700e4f165 100644
--- a/drivers/net/sgiseeq.c
+++ b/drivers/net/sgiseeq.c
@@ -719,7 +719,6 @@ static int __init sgiseeq_probe(struct platform_device *pdev)
         struct sgiseeq_private *sp;
         struct net_device *dev;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         dev = alloc_etherdev(sizeof (struct sgiseeq_private));
         if (!dev) {
@@ -793,8 +792,7 @@ static int __init sgiseeq_probe(struct platform_device *pdev)
                 goto err_out_free_page;
         }
 
-        printk(KERN_INFO "%s: %s %s\n",
-               dev->name, sgiseeqstr, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: %s %pM\n", dev->name, sgiseeqstr, dev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c
index e6e3bf58a569..f6c8f70b405c 100644
--- a/drivers/net/sis190.c
+++ b/drivers/net/sis190.c
@@ -1791,7 +1791,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
         struct net_device *dev;
         void __iomem *ioaddr;
         int rc;
-        DECLARE_MAC_BUF(mac);
 
         if (!printed_version) {
                 net_drv(&debug, KERN_INFO SIS190_DRIVER_NAME " loaded.\n");
@@ -1841,10 +1840,9 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
         if (rc < 0)
                 goto err_remove_mii;
 
-        net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), "
-                  "%s\n",
+        net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), %pM\n",
                   pci_name(pdev), sis_chip_info[ent->driver_data].name,
-                  ioaddr, dev->irq, print_mac(mac, dev->dev_addr));
+                  ioaddr, dev->irq, dev->dev_addr);
 
         net_probe(tp, KERN_INFO "%s: %s mode.\n", dev->name,
                   (tp->features & F_HAS_RGMII) ? "RGMII" : "GMII");
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c
index fa3a460f8e2f..bb7056a897bf 100644
--- a/drivers/net/sis900.c
+++ b/drivers/net/sis900.c
@@ -404,7 +404,6 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
         int i, ret;
         const char *card_name = card_names[pci_id->driver_data];
         const char *dev_name = pci_name(pci_dev);
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -534,9 +533,9 @@ static int __devinit sis900_probe(struct pci_dev *pci_dev,
                 goto err_unmap_rx;
 
         /* print some information about our NIC */
-        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %s\n",
+        printk(KERN_INFO "%s: %s at %#lx, IRQ %d, %pM\n",
                net_dev->name, card_name, ioaddr, net_dev->irq,
-               print_mac(mac, net_dev->dev_addr));
+               net_dev->dev_addr);
 
         /* Detect Wake on Lan support */
         ret = (inl(net_dev->base_addr + CFGPMC) & PMESP) >> 27;
diff --git a/drivers/net/skge.c b/drivers/net/skge.c
index 43f4c730be42..7911839f7375 100644
--- a/drivers/net/skge.c
+++ b/drivers/net/skge.c
@@ -149,24 +149,6 @@ static u32 wol_supported(const struct skge_hw *hw)
         return WAKE_MAGIC | WAKE_PHY;
 }
 
-static u32 pci_wake_enabled(struct pci_dev *dev)
-{
-        int pm = pci_find_capability(dev, PCI_CAP_ID_PM);
-        u16 value;
-
-        /* If device doesn't support PM Capabilities, but request is to disable
-         * wake events, it's a nop; otherwise fail */
-        if (!pm)
-                return 0;
-
-        pci_read_config_word(dev, pm + PCI_PM_PMC, &value);
-
-        value &= PCI_PM_CAP_PME_MASK;
-        value >>= ffs(PCI_PM_CAP_PME_MASK) - 1;   /* First bit of mask */
-
-        return value != 0;
-}
-
 static void skge_wol_init(struct skge_port *skge)
 {
         struct skge_hw *hw = skge->hw;
@@ -254,10 +236,14 @@ static int skge_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         struct skge_port *skge = netdev_priv(dev);
         struct skge_hw *hw = skge->hw;
 
-        if (wol->wolopts & ~wol_supported(hw))
+        if ((wol->wolopts & ~wol_supported(hw))
+            || !device_can_wakeup(&hw->pdev->dev))
                 return -EOPNOTSUPP;
 
         skge->wol = wol->wolopts;
+
+        device_set_wakeup_enable(&hw->pdev->dev, skge->wol);
+
         return 0;
 }
 
@@ -3856,7 +3842,7 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
         skge->speed = -1;
         skge->advertising = skge_supported_modes(hw);
 
-        if (pci_wake_enabled(hw->pdev))
+        if (device_may_wakeup(&hw->pdev->dev))
                 skge->wol = wol_supported(hw) & WAKE_MAGIC;
 
         hw->dev[port] = dev;
@@ -3885,11 +3871,10 @@ static struct net_device *skge_devinit(struct skge_hw *hw, int port,
 static void __devinit skge_show_addr(struct net_device *dev)
 {
         const struct skge_port *skge = netdev_priv(dev);
-        DECLARE_MAC_BUF(mac);
 
         if (netif_msg_probe(skge))
-                printk(KERN_INFO PFX "%s: addr %s\n",
-                       dev->name, print_mac(mac, dev->dev_addr));
+                printk(KERN_INFO PFX "%s: addr %pM\n",
+                       dev->name, dev->dev_addr);
 }
 
 static int __devinit skge_probe(struct pci_dev *pdev,
@@ -4082,8 +4067,8 @@ static int skge_suspend(struct pci_dev *pdev, pm_message_t state)
         }
 
         skge_write32(hw, B0_IMSK, 0);
-        pci_enable_wake(pdev, pci_choose_state(pdev, state), wol);
-        pci_set_power_state(pdev, pci_choose_state(pdev, state));
+
+        pci_prepare_to_sleep(pdev);
 
         return 0;
 }
@@ -4096,7 +4081,7 @@ static int skge_resume(struct pci_dev *pdev)
         if (!hw)
                 return 0;
 
-        err = pci_set_power_state(pdev, PCI_D0);
+        err = pci_back_from_sleep(pdev);
         if (err)
                 goto out;
 
@@ -4104,8 +4089,6 @@ static int skge_resume(struct pci_dev *pdev)
         if (err)
                 goto out;
 
-        pci_enable_wake(pdev, PCI_D0, 0);
-
         err = skge_reset(hw);
         if (err)
                 goto out;
@@ -4146,8 +4129,8 @@ static void skge_shutdown(struct pci_dev *pdev)
                 wol |= skge->wol;
         }
 
-        pci_enable_wake(pdev, PCI_D3hot, wol);
-        pci_enable_wake(pdev, PCI_D3cold, wol);
+        if (pci_enable_wake(pdev, PCI_D3cold, wol))
+                pci_enable_wake(pdev, PCI_D3hot, wol);
 
         pci_disable_device(pdev);
         pci_set_power_state(pdev, PCI_D3hot);
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 3813d15e2df7..4dcd1a62fb49 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -4118,11 +4118,10 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
 static void __devinit sky2_show_addr(struct net_device *dev)
 {
         const struct sky2_port *sky2 = netdev_priv(dev);
-        DECLARE_MAC_BUF(mac);
 
         if (netif_msg_probe(sky2))
-                printk(KERN_INFO PFX "%s: addr %s\n",
-                       dev->name, print_mac(mac, dev->dev_addr));
+                printk(KERN_INFO PFX "%s: addr %pM\n",
+                       dev->name, dev->dev_addr);
 }
 
 /* Handle software interrupt used during MSI test */
diff --git a/drivers/net/smc-mca.c b/drivers/net/smc-mca.c
index d6abb68e6e2f..58a0e0a4a325 100644
--- a/drivers/net/smc-mca.c
+++ b/drivers/net/smc-mca.c
@@ -196,7 +196,6 @@ static int __init ultramca_probe(struct device *gen_dev)
         int tirq = 0;
         int base_addr = ultra_io[ultra_found];
         int irq = ultra_irq[ultra_found];
-        DECLARE_MAC_BUF(mac);
 
         if (base_addr || irq) {
                 printk(KERN_INFO "Probing for SMC MCA adapter");
@@ -334,8 +333,8 @@ static int __init ultramca_probe(struct device *gen_dev)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + 8 + i);
 
-        printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x, %s",
-               slot + 1, ioaddr, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "smc_mca[%d]: Parameters: %#3x, %pM",
+               slot + 1, ioaddr, dev->dev_addr);
 
         /* Switch from the station address to the alternate register set
          * and read the useful registers there.
diff --git a/drivers/net/smc-ultra.c b/drivers/net/smc-ultra.c
index 00d6cf1af484..0fe0251767bb 100644
--- a/drivers/net/smc-ultra.c
+++ b/drivers/net/smc-ultra.c
@@ -198,7 +198,6 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
         unsigned char num_pages, irqreg, addr, piomode;
         unsigned char idreg = inb(ioaddr + 7);
         unsigned char reg4 = inb(ioaddr + 4) & 0x7f;
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, ULTRA_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -228,8 +227,8 @@ static int __init ultra_probe1(struct net_device *dev, int ioaddr)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + 8 + i);
 
-        printk("%s: %s at %#3x, %s", dev->name, model_name,
-               ioaddr, print_mac(mac, dev->dev_addr));
+        printk("%s: %s at %#3x, %pM", dev->name, model_name,
+               ioaddr, dev->dev_addr);
 
         /* Switch from the station address to the alternate register set and
            read the useful registers there. */
diff --git a/drivers/net/smc-ultra32.c b/drivers/net/smc-ultra32.c
index a5a91ace28cc..cb6c097a2e0a 100644
--- a/drivers/net/smc-ultra32.c
+++ b/drivers/net/smc-ultra32.c
@@ -163,7 +163,6 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
         unsigned char idreg;
         unsigned char reg4;
         const char *ifmap[] = {"UTP No Link", "", "UTP/AUI", "UTP/BNC"};
-        DECLARE_MAC_BUF(mac);
 
         if (!request_region(ioaddr, ULTRA32_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -207,8 +206,8 @@ static int __init ultra32_probe1(struct net_device *dev, int ioaddr)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + 8 + i);
 
-        printk("%s: %s at 0x%X, %s",
-               dev->name, model_name, ioaddr, print_mac(mac, dev->dev_addr));
+        printk("%s: %s at 0x%X, %pM",
+               dev->name, model_name, ioaddr, dev->dev_addr);
 
         /* Switch from the station address to the alternate register set and
            read the useful registers there. */
diff --git a/drivers/net/smc9194.c b/drivers/net/smc9194.c
index de67744c4a2a..3bc733634a53 100644
--- a/drivers/net/smc9194.c
+++ b/drivers/net/smc9194.c
@@ -876,8 +876,6 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
         word memory_info_register;
         word memory_cfg_register;
 
-        DECLARE_MAC_BUF(mac);
-
         /* Grab the region so that no one else tries to probe our ioports. */
         if (!request_region(ioaddr, SMC_IO_EXTENT, DRV_NAME))
                 return -EBUSY;
@@ -1033,7 +1031,7 @@ static int __init smc_probe(struct net_device *dev, int ioaddr)
         /*
          . Print the Ethernet address
         */
-        printk("ADDR: %s\n", print_mac(mac, dev->dev_addr));
+        printk("ADDR: %pM\n", dev->dev_addr);
 
         /* set the private data to zero by default */
         memset(dev->priv, 0, sizeof(struct smc_local));
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c
index 6f9895d4e5bd..2d8bfa7bd9e9 100644
--- a/drivers/net/smc91x.c
+++ b/drivers/net/smc91x.c
@@ -1778,7 +1778,6 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
         int retval;
         unsigned int val, revision_register;
         const char *version_string;
-        DECLARE_MAC_BUF(mac);
 
         DBG(2, "%s: %s\n", CARDNAME, __func__);
 
@@ -1972,8 +1971,8 @@ static int __init smc_probe(struct net_device *dev, void __iomem *ioaddr,
                                "set using ifconfig\n", dev->name);
                 } else {
                         /* Print the Ethernet address */
-                        printk("%s: Ethernet addr: %s\n",
-                               dev->name, print_mac(mac, dev->dev_addr));
+                        printk("%s: Ethernet addr: %pM\n",
+                               dev->name, dev->dev_addr);
                 }
 
                 if (lp->phy_type == 0) {
diff --git a/drivers/net/starfire.c b/drivers/net/starfire.c
index 1d2ef8f47780..32814183d5a3 100644
--- a/drivers/net/starfire.c
+++ b/drivers/net/starfire.c
@@ -653,7 +653,6 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         void __iomem *base;
         int drv_flags, io_size;
         int boguscnt;
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -823,9 +822,9 @@ static int __devinit starfire_init_one(struct pci_dev *pdev,
         if (register_netdev(dev))
                 goto err_out_cleardev;
 
-        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n",
                dev->name, netdrv_tbl[chip_idx].name, base,
-               print_mac(mac, dev->dev_addr), irq);
+               dev->dev_addr, irq);
 
         if (drv_flags & CanHaveMII) {
                 int phy, phy_idx = 0;
@@ -1452,12 +1451,8 @@ static int __netdev_rx(struct net_device *dev, int *quota)
 #ifndef final_version                   /* Remove after testing. */
                 /* You will want this info for the initial debug. */
                 if (debug > 5) {
-                        printk(KERN_DEBUG "  Rx data " MAC_FMT " " MAC_FMT
-                               " %2.2x%2.2x.\n",
-                               skb->data[0], skb->data[1], skb->data[2],
-                               skb->data[3], skb->data[4], skb->data[5],
-                               skb->data[6], skb->data[7], skb->data[8],
-                               skb->data[9], skb->data[10], skb->data[11],
+                        printk(KERN_DEBUG "  Rx data %pM %pM %2.2x%2.2x.\n",
+                               skb->data, skb->data + 6,
                                skb->data[12], skb->data[13]);
                 }
 #endif
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c
index 359452a06c67..608aa2f789d1 100644
--- a/drivers/net/sun3lance.c
+++ b/drivers/net/sun3lance.c
@@ -303,7 +303,6 @@ static int __init lance_probe( struct net_device *dev)
         static int              did_version;
         volatile unsigned short *ioaddr_probe;
         unsigned short tmp1, tmp2;
-        DECLARE_MAC_BUF(mac);
 
 #ifdef CONFIG_SUN3
         ioaddr = (unsigned long)ioremap(LANCE_OBIO, PAGE_SIZE);
@@ -379,7 +378,7 @@ static int __init lance_probe( struct net_device *dev)
         MEM->init.hwaddr[4] = dev->dev_addr[5];
         MEM->init.hwaddr[5] = dev->dev_addr[4];
 
-        printk("%s\n", print_mac(mac, dev->dev_addr));
+        printk("%pM\n", dev->dev_addr);
 
         MEM->init.mode = 0x0000;
         MEM->init.filter[0] = 0x00000000;
@@ -824,12 +823,10 @@ static int lance_rx( struct net_device *dev )
 #if 0
                                 if (lance_debug >= 3) {
                                         u_char *data = PKTBUF_ADDR(head);
-                                        DECLARE_MAC_BUF(mac);
-                                        DECLARE_MAC_BUF(mac2)
                                         printk("%s: RX pkt %d type 0x%04x"
-                                               " from %s to %s",
+                                               " from %pM to %pM",
                                                dev->name, lp->new_tx, ((u_short *)data)[6],
-                                               print_mac(mac, &data[6]), print_mac(mac2, data));
+                                               &data[6], data);
 
                                         printk(" data %02x %02x %02x %02x %02x %02x %02x %02x "
                                                "len %d at %08x\n",
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 018d0fca9422..e964395fceee 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1081,7 +1081,6 @@ static int __devinit bigmac_ether_init(struct of_device *op,
         static int version_printed;
         struct net_device *dev;
         u8 bsizes, bsizes_more;
-        DECLARE_MAC_BUF(mac);
         struct bigmac *bp;
         int i;
 
@@ -1212,8 +1211,8 @@ static int __devinit bigmac_ether_init(struct of_device *op,
 
         dev_set_drvdata(&bp->bigmac_op->dev, bp);
 
-        printk(KERN_INFO "%s: BigMAC 100baseT Ethernet %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: BigMAC 100baseT Ethernet %pM\n",
+               dev->name, dev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/sundance.c b/drivers/net/sundance.c
index f860ea150395..8c6a8941a054 100644
--- a/drivers/net/sundance.c
+++ b/drivers/net/sundance.c
@@ -468,7 +468,6 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
         int bar = 1;
 #endif
         int phy, phy_end, phy_idx = 0;
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -547,9 +546,9 @@ static int __devinit sundance_probe1 (struct pci_dev *pdev,
         if (i)
                 goto err_out_unmap_rx;
 
-        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n",
                dev->name, pci_id_tbl[chip_idx].name, ioaddr,
-               print_mac(mac, dev->dev_addr), irq);
+               dev->dev_addr, irq);
 
         np->phys[0] = 1;                /* Default setting */
         np->mii_preamble_required++;
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 4291458955ef..250f08687b71 100644
--- a/drivers/net/sungem.c
+++ b/drivers/net/sungem.c
@@ -2966,7 +2966,6 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
         struct net_device *dev;
         struct gem *gp;
         int err, pci_using_dac;
-        DECLARE_MAC_BUF(mac);
 
         if (gem_version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -3150,9 +3149,8 @@ static int __devinit gem_init_one(struct pci_dev *pdev,
                 goto err_out_free_consistent;
         }
 
-        printk(KERN_INFO "%s: Sun GEM (PCI) 10/100/1000BaseT Ethernet "
-               "%s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: Sun GEM (PCI) 10/100/1000BaseT Ethernet %pM\n",
+               dev->name, dev->dev_addr);
 
         if (gp->phy_type == phy_mii_mdio0 ||
             gp->phy_type == phy_mii_mdio1)
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index f1ebeb5f65b2..b55f7a4b52e7 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2617,7 +2617,6 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
         struct net_device *dev;
         int i, qfe_slot = -1;
         int err = -ENODEV;
-        DECLARE_MAC_BUF(mac);
 
         if (is_qfe) {
                 qp = quattro_sbus_find(op);
@@ -2797,7 +2796,7 @@ static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
                 printk(KERN_INFO "%s: HAPPY MEAL (SBUS) 10/100baseT Ethernet ",
                        dev->name);
 
-        printk("%s\n", print_mac(mac, dev->dev_addr));
+        printk("%pM\n", dev->dev_addr);
 
         return 0;
 
@@ -2932,7 +2931,6 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
         int i, qfe_slot = -1;
         char prom_name[64];
         int err;
-        DECLARE_MAC_BUF(mac);
 
         /* Now make sure pci_dev cookie is there. */
 #ifdef CONFIG_SPARC
@@ -3141,7 +3139,7 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev,
                 printk(KERN_INFO "%s: HAPPY MEAL (PCI/CheerIO) 10/100BaseT Ethernet ",
                        dev->name);
 
-        printk("%s\n", print_mac(mac, dev->dev_addr));
+        printk("%pM\n", dev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 704301a5a7ff..c67cf94b5bff 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1321,7 +1321,6 @@ static int __devinit sparc_lance_probe_one(struct of_device *op,
         static unsigned version_printed;
         struct lance_private *lp;
         struct net_device *dev;
-        DECLARE_MAC_BUF(mac);
         int    i;
 
         dev = alloc_etherdev(sizeof(struct lance_private) + 8);
@@ -1491,8 +1490,8 @@ no_link_test:
 
         dev_set_drvdata(&op->dev, lp);
 
-        printk(KERN_INFO "%s: LANCE %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: LANCE %pM\n",
+               dev->name, dev->dev_addr);
 
         return 0;
 
diff --git a/drivers/net/sunvnet.c b/drivers/net/sunvnet.c
index a720065553df..233f1cda36e5 100644
--- a/drivers/net/sunvnet.c
+++ b/drivers/net/sunvnet.c
@@ -1149,7 +1149,6 @@ static int __devinit vnet_port_probe(struct vio_dev *vdev,
         struct vnet *vp;
         const u64 *rmac;
         int len, i, err, switch_port;
-        DECLARE_MAC_BUF(mac);
 
         print_version();
 
@@ -1214,8 +1213,8 @@ static int __devinit vnet_port_probe(struct vio_dev *vdev,
 
         dev_set_drvdata(&vdev->dev, port);
 
-        printk(KERN_INFO "%s: PORT ( remote-mac %s%s )\n",
-               vp->dev->name, print_mac(mac, port->raddr),
+        printk(KERN_INFO "%s: PORT ( remote-mac %pM%s )\n",
+               vp->dev->name, port->raddr,
                switch_port ? " switch-port" : "");
 
         vio_port_up(&port->vio);
diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index df20cafff7dd..51de139491a0 100644
--- a/drivers/net/tc35815.c
+++ b/drivers/net/tc35815.c
@@ -236,7 +236,7 @@ struct tc35815_regs {
 #define Rx_Halted              0x00008000 /* Rx Halted                       */
 #define Rx_Good                0x00004000 /* Rx Good                         */
 #define Rx_RxPar               0x00002000 /* Rx Parity Error                 */
-                            /* 0x00001000    not use                         */
+#define Rx_TypePkt             0x00001000 /* Rx Type Packet                  */
 #define Rx_LongErr             0x00000800 /* Rx Long Error                   */
 #define Rx_Over                0x00000400 /* Rx Overflow                     */
 #define Rx_CRCErr              0x00000200 /* Rx CRC Error                    */
@@ -244,8 +244,9 @@ struct tc35815_regs {
 #define Rx_10Stat              0x00000080 /* Rx 10Mbps Status                */
 #define Rx_IntRx               0x00000040 /* Rx Interrupt                    */
 #define Rx_CtlRecd             0x00000020 /* Rx Control Receive              */
+#define Rx_InLenErr            0x00000010 /* Rx In Range Frame Length Error  */
 
-#define Rx_Stat_Mask           0x0000EFC0 /* Rx All Status Mask              */
+#define Rx_Stat_Mask           0x0000FFF0 /* Rx All Status Mask              */
 
 /* Int_En bit asign -------------------------------------------------------- */
 #define Int_NRAbtEn            0x00000800 /* 1:Non-recoverable Abort Enable  */
@@ -865,7 +866,6 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
         struct net_device *dev;
         struct tc35815_local *lp;
         int rc;
-        DECLARE_MAC_BUF(mac);
 
         static int printed_version;
         if (!printed_version++) {
@@ -942,11 +942,11 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
                 goto err_out;
 
         memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
-        printk(KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n",
+        printk(KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
                 dev->name,
                 chip_info[ent->driver_data].name,
                 dev->base_addr,
-                print_mac(mac, dev->dev_addr),
+                dev->dev_addr,
                 dev->irq);
 
         rc = tc_mii_init(dev);
@@ -1288,12 +1288,9 @@ panic_queues(struct net_device *dev)
 
 static void print_eth(const u8 *add)
 {
-        DECLARE_MAC_BUF(mac);
-
         printk(KERN_DEBUG "print_eth(%p)\n", add);
-        printk(KERN_DEBUG " %s =>", print_mac(mac, add + 6));
-        printk(KERN_CONT " %s : %02x%02x\n",
-                print_mac(mac, add), add[12], add[13]);
+        printk(KERN_DEBUG " %pM => %pM : %02x%02x\n",
+                add + 6, add, add[12], add[13]);
 }
 
 static int tc35815_tx_full(struct net_device *dev)
@@ -2153,13 +2150,12 @@ static void tc35815_set_cam_entry(struct net_device *dev, int index, unsigned ch
         int cam_index = index * 6;
         u32 cam_data;
         u32 saved_addr;
-        DECLARE_MAC_BUF(mac);
 
         saved_addr = tc_readl(&tr->CAM_Adr);
 
         if (netif_msg_hw(lp))
-                printk(KERN_DEBUG "%s: CAM %d: %s\n",
-                        dev->name, index, print_mac(mac, addr));
+                printk(KERN_DEBUG "%s: CAM %d: %pM\n",
+                        dev->name, index, addr);
         if (index & 1) {
                 /* read modify write */
                 tc_writel(cam_index - 2, &tr->CAM_Adr);
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index eb9f8f3638e1..d0500db4f713 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -13252,7 +13252,6 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         int err, pm_cap;
         char str[40];
         u64 dma_mask, persist_dma_mask;
-        DECLARE_MAC_BUF(mac);
 
         if (tg3_version_printed++ == 0)
                 printk(KERN_INFO "%s", version);
@@ -13536,7 +13535,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
         }
 
         printk(KERN_INFO "%s: Tigon3 [partno(%s) rev %04x PHY(%s)] "
-               "(%s) %s Ethernet %s\n",
+               "(%s) %s Ethernet %pM\n",
                dev->name,
                tp->board_part_number,
                tp->pci_chip_rev_id,
@@ -13545,7 +13544,7 @@ static int __devinit tg3_init_one(struct pci_dev *pdev,
                ((tp->tg3_flags & TG3_FLAG_10_100_ONLY) ? "10/100Base-TX" :
                 ((tp->tg3_flags2 & TG3_FLG2_ANY_SERDES) ? "1000Base-SX" :
                  "10/100/1000Base-T")),
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
 
         printk(KERN_INFO "%s: RXcsums[%d] LinkChgREG[%d] "
                "MIirq[%d] ASF[%d] WireSpeed[%d] TSOcap[%d]\n",
diff --git a/drivers/net/tokenring/abyss.c b/drivers/net/tokenring/abyss.c
index 7a7de0469eae..b566d6d79ecd 100644
--- a/drivers/net/tokenring/abyss.c
+++ b/drivers/net/tokenring/abyss.c
@@ -99,7 +99,6 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
         struct net_local *tp;
         int ret, pci_irq_line;
         unsigned long pci_ioaddr;
-        DECLARE_MAC_BUF(mac);
         
         if (versionprinted++ == 0)
                 printk("%s", version);
@@ -147,8 +146,7 @@ static int __devinit abyss_attach(struct pci_dev *pdev, const struct pci_device_
 
         abyss_read_eeprom(dev);
 
-        printk("%s:    Ring Station Address: %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk("%s:    Ring Station Address: %pM\n", dev->name, dev->dev_addr);
 
         tp = netdev_priv(dev);
         tp->setnselout = abyss_setnselout_pins;
diff --git a/drivers/net/tokenring/ibmtr.c b/drivers/net/tokenring/ibmtr.c
index e494c63bfbd9..ad978982eee4 100644
--- a/drivers/net/tokenring/ibmtr.c
+++ b/drivers/net/tokenring/ibmtr.c
@@ -389,7 +389,6 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
         unsigned long timeout;
         static int version_printed;
 #endif
-        DECLARE_MAC_BUF(mac);
 
         /*    Query the adapter PIO base port which will return
          *    indication of where MMIO was placed. We also have a
@@ -703,8 +702,7 @@ static int __devinit ibmtr_probe1(struct net_device *dev, int PIOaddr)
                 channel_def[cardpresent - 1], adapter_def(ti->adapter_type));
         DPRINTK("using irq %d, PIOaddr %hx, %dK shared RAM.\n",
                         irq, PIOaddr, ti->mapped_ram_size / 2);
-        DPRINTK("Hardware address : %s\n",
-                print_mac(mac, dev->dev_addr));
+        DPRINTK("Hardware address : %pM\n", dev->dev_addr);
         if (ti->page_mask)
                 DPRINTK("Shared RAM paging enabled. "
                         "Page size: %uK Shared Ram size %dK\n",
@@ -1741,8 +1739,6 @@ static void tr_rx(struct net_device *dev)
                 void __iomem *trhhdr = rbuf + offsetof(struct rec_buf, data);
                 u8 saddr[6];
                 u8 daddr[6];
-                DECLARE_MAC_BUF(mac);
-                DECLARE_MAC_BUF(mac2);
                 int i;
                 for (i = 0 ; i < 6 ; i++)
                         saddr[i] = readb(trhhdr + SADDR_OFST + i);
@@ -1750,9 +1746,9 @@ static void tr_rx(struct net_device *dev)
                         daddr[i] = readb(trhhdr + DADDR_OFST + i);
                 DPRINTK("Probably non-IP frame received.\n");
                 DPRINTK("ssap: %02X dsap: %02X "
-                        "saddr: %s daddr: %$s\n",
+                        "saddr: %pM daddr: %pM\n",
                         readb(llc + SSAP_OFST), readb(llc + DSAP_OFST),
-                        print_mac(mac, saddr), print_mac(mac2, daddr));
+                        saddr, daddr);
         }
 #endif
 
diff --git a/drivers/net/tokenring/lanstreamer.c b/drivers/net/tokenring/lanstreamer.c
index 59d1673f9387..bd70e818212a 100644
--- a/drivers/net/tokenring/lanstreamer.c
+++ b/drivers/net/tokenring/lanstreamer.c
@@ -446,9 +446,6 @@ static int streamer_reset(struct net_device *dev)
         unsigned int uaa_addr;
         struct sk_buff *skb = NULL;
         __u16 misr;
-#if STREAMER_DEBUG
-        DECLARE_MAC_BUF(mac);
-#endif
 
         streamer_priv = netdev_priv(dev);
         streamer_mmio = streamer_priv->streamer_mmio;
@@ -577,8 +574,7 @@ static int streamer_reset(struct net_device *dev)
                         dev->dev_addr[i+1]= addr & 0xff;
                 }
 #if STREAMER_DEBUG
-                printk("Adapter address: %s\n",
-                       print_mac(mac, dev->dev_addr));
+                printk("Adapter address: %pM\n", dev->dev_addr);
 #endif
         }
         return 0;
@@ -1538,7 +1534,6 @@ static void streamer_arb_cmd(struct net_device *dev)
 
 #if STREAMER_NETWORK_MONITOR
         struct trh_hdr *mac_hdr;
-        DECLARE_MAC_BUF(mac);
 #endif
 
         writew(streamer_priv->arb, streamer_mmio + LAPA);
@@ -1611,11 +1606,11 @@ static void streamer_arb_cmd(struct net_device *dev)
                        dev->name);
                 mac_hdr = tr_hdr(mac_frame);
                 printk(KERN_WARNING
-                       "%s: MAC Frame Dest. Addr: %s\n",
-                       dev->name, print_mac(mac, mac_hdr->daddr));
+                       "%s: MAC Frame Dest. Addr: %pM\n",
+                       dev->name, mac_hdr->daddr);
                 printk(KERN_WARNING
-                       "%s: MAC Frame Srce. Addr: %s\n",
-                       dev->name, DEV->ADDR6(mac_hdr->saddr));
+                       "%s: MAC Frame Srce. Addr: %pM\n",
+                       dev->name, mac_hdr->saddr);
 #endif
                 netif_rx(mac_frame);
 
@@ -1850,8 +1845,6 @@ static int sprintf_info(char *buffer, struct net_device *dev)
         struct streamer_parameters_table spt;
         int size = 0;
         int i;
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
 
         writew(streamer_priv->streamer_addr_table_addr, streamer_mmio + LAPA);
         for (i = 0; i < 14; i += 2) {
@@ -1873,9 +1866,8 @@ static int sprintf_info(char *buffer, struct net_device *dev)
         size = sprintf(buffer, "\n%6s: Adapter Address   : Node Address      : Functional Addr\n", dev->name);
 
         size += sprintf(buffer + size,
-                        "%6s: %s : %s : %02x:%02x:%02x:%02x\n",
-                        dev->name, print_mac(mac, dev->dev_addr),
-                        print_mac(mac2, sat.node_addr),
+                        "%6s: %pM : %pM : %02x:%02x:%02x:%02x\n",
+                        dev->name, dev->dev_addr, sat.node_addr,
                         sat.func_addr[0], sat.func_addr[1],
                         sat.func_addr[2], sat.func_addr[3]);
 
@@ -1884,19 +1876,18 @@ static int sprintf_info(char *buffer, struct net_device *dev)
         size += sprintf(buffer + size, "%6s: Physical Addr : Up Node Address   : Poll Address      : AccPri : Auth Src : Att Code :\n", dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s: %02x:%02x:%02x:%02x   : %s : %s : %04x   : %04x     :  %04x    :\n",
+                    "%6s: %02x:%02x:%02x:%02x   : %pM : %pM : %04x   : %04x     :  %04x    :\n",
                     dev->name, spt.phys_addr[0], spt.phys_addr[1],
                     spt.phys_addr[2], spt.phys_addr[3],
-                    print_mac(mac, spt.up_node_addr),
-                    print_mac(mac2, spt.poll_addr),
+                    spt.up_node_addr, spt.poll_addr,
                     ntohs(spt.acc_priority), ntohs(spt.auth_source_class),
                     ntohs(spt.att_code));
 
         size += sprintf(buffer + size, "%6s: Source Address    : Bcn T : Maj. V : Lan St : Lcl Rg : Mon Err : Frame Correl : \n", dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s: %s : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
-                    dev->name, print_mac(mac, spt.source_addr),
+                    "%6s: %pM : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
+                    dev->name, spt.source_addr,
                     ntohs(spt.beacon_type), ntohs(spt.major_vector),
                     ntohs(spt.lan_status), ntohs(spt.local_ring),
                     ntohs(spt.mon_error), ntohs(spt.frame_correl));
@@ -1905,10 +1896,10 @@ static int sprintf_info(char *buffer, struct net_device *dev)
                     dev->name);
 
         size += sprintf(buffer + size,
-                    "%6s:                :  %02x  :  %02x  : %s : %02x:%02x:%02x:%02x    : \n",
+                    "%6s:                :  %02x  :  %02x  : %pM : %02x:%02x:%02x:%02x    : \n",
                     dev->name, ntohs(spt.beacon_transmit),
                     ntohs(spt.beacon_receive),
-                    print_mac(mac, spt.beacon_naun),
+                    spt.beacon_naun,
                     spt.beacon_phys[0], spt.beacon_phys[1],
                     spt.beacon_phys[2], spt.beacon_phys[3]);
         return size;
diff --git a/drivers/net/tokenring/madgemc.c b/drivers/net/tokenring/madgemc.c
index c9c5a2b1ed9e..0ba6f0bc7c00 100644
--- a/drivers/net/tokenring/madgemc.c
+++ b/drivers/net/tokenring/madgemc.c
@@ -152,7 +152,6 @@ static int __devinit madgemc_probe(struct device *device)
         struct card_info *card;
         struct mca_device *mdev = to_mca_device(device);
         int ret = 0;
-        DECLARE_MAC_BUF(mac);
 
         if (versionprinted++ == 0)
                 printk("%s", version);
@@ -323,8 +322,8 @@ static int __devinit madgemc_probe(struct device *device)
         mca_device_set_name(mdev, (card->cardtype == 0x08)?MADGEMC16_CARDNAME:MADGEMC32_CARDNAME);
         mca_set_adapter_procfn(mdev->slot, madgemc_mcaproc, dev);
 
-        printk("%s:     Ring Station Address: %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk("%s:     Ring Station Address: %pM\n",
+               dev->name, dev->dev_addr);
 
         if (tmsdev_init(dev, device)) {
                 printk("%s: unable to get memory for dev->priv.\n", 
@@ -690,7 +689,6 @@ static int madgemc_mcaproc(char *buf, int slot, void *d)
         struct net_local *tp = netdev_priv(dev);
         struct card_info *curcard = tp->tmspriv;
         int len = 0;
-        DECLARE_MAC_BUF(mac);
         
         len += sprintf(buf+len, "-------\n");
         if (curcard) {
@@ -714,8 +712,8 @@ static int madgemc_mcaproc(char *buf, int slot, void *d)
                 }
                 len += sprintf(buf+len, " (%s)\n", (curcard->fairness)?"Unfair":"Fair");
                 
-                len += sprintf(buf+len, "Ring Station Address: %s\n",
-                               print_mac(mac, dev->dev_addr));
+                len += sprintf(buf+len, "Ring Station Address: %pM\n",
+                               dev->dev_addr);
         } else 
                 len += sprintf(buf+len, "Card not configured\n");
 
diff --git a/drivers/net/tokenring/olympic.c b/drivers/net/tokenring/olympic.c
index 0ab51a0f35fc..f78bc5d40708 100644
--- a/drivers/net/tokenring/olympic.c
+++ b/drivers/net/tokenring/olympic.c
@@ -421,10 +421,7 @@ static int olympic_init(struct net_device *dev)
         memcpy_fromio(&dev->dev_addr[0], adapter_addr,6);
 
 #if OLYMPIC_DEBUG
- {
-        DECLARE_MAC_BUF(mac);
-        printk("adapter address: %s\n", print_mac(mac, dev->dev_addr));
- }
+        printk("adapter address: %pM\n", dev->dev_addr);
 #endif
 
         olympic_priv->olympic_addr_table_addr = swab16(readw(init_srb + 12)); 
@@ -441,7 +438,6 @@ static int olympic_open(struct net_device *dev)
         unsigned long flags, t;
         int i, open_finished = 1 ;
         u8 resp, err;
-        DECLARE_MAC_BUF(mac);
 
         DECLARE_WAITQUEUE(wait,current) ; 
 
@@ -569,8 +565,8 @@ static int olympic_open(struct net_device *dev)
                         goto out;
 
                 case 0x32:
-                        printk(KERN_WARNING "%s: Invalid LAA: %s\n",
-                               dev->name, print_mac(mac, olympic_priv->olympic_laa));
+                        printk(KERN_WARNING "%s: Invalid LAA: %pM\n",
+                               dev->name, olympic_priv->olympic_laa);
                         goto out;
 
                 default:
@@ -704,13 +700,12 @@ static int olympic_open(struct net_device *dev)
                 u8 __iomem *opt;
                 int i;
                 u8 addr[6];
-                DECLARE_MAC_BUF(mac);
                 oat = (olympic_priv->olympic_lap + olympic_priv->olympic_addr_table_addr);
                 opt = (olympic_priv->olympic_lap + olympic_priv->olympic_parms_addr);
 
                 for (i = 0; i < 6; i++)
                         addr[i] = readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr)+i);
-                printk("%s: Node Address: %s\n",dev->name, print_mac(mac, addr));
+                printk("%s: Node Address: %pM\n", dev->name, addr);
                 printk("%s: Functional Address: %02x:%02x:%02x:%02x\n",dev->name, 
                         readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)), 
                         readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+1),
@@ -719,7 +714,7 @@ static int olympic_open(struct net_device *dev)
 
                 for (i = 0; i < 6; i++)
                         addr[i] = readb(opt+offsetof(struct olympic_parameters_table, up_node_addr)+i);
-                printk("%s: NAUN Address: %s\n",dev->name, print_mac(mac, addr));
+                printk("%s: NAUN Address: %pM\n", dev->name, addr);
         }
         
         netif_start_queue(dev);
@@ -1440,16 +1435,10 @@ static void olympic_arb_cmd(struct net_device *dev)
                         struct trh_hdr *mac_hdr;
                         printk(KERN_WARNING "%s: Received MAC Frame, details: \n",dev->name);
                         mac_hdr = tr_hdr(mac_frame);
-                        printk(KERN_WARNING "%s: MAC Frame Dest. Addr: "
-                               MAC_FMT " \n", dev->name,
-                               mac_hdr->daddr[0], mac_hdr->daddr[1],
-                               mac_hdr->daddr[2], mac_hdr->daddr[3],
-                               mac_hdr->daddr[4], mac_hdr->daddr[5]);
-                        printk(KERN_WARNING "%s: MAC Frame Srce. Addr: "
-                               MAC_FMT " \n", dev->name,
-                               mac_hdr->saddr[0], mac_hdr->saddr[1],
-                               mac_hdr->saddr[2], mac_hdr->saddr[3],
-                               mac_hdr->saddr[4], mac_hdr->saddr[5]);
+                        printk(KERN_WARNING "%s: MAC Frame Dest. Addr: %pM\n",
+                               dev->name, mac_hdr->daddr);
+                        printk(KERN_WARNING "%s: MAC Frame Srce. Addr: %pM\n",
+                               dev->name, mac_hdr->saddr);
                 }
                 netif_rx(mac_frame);
                 dev->last_rx = jiffies;
@@ -1647,8 +1636,6 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
         u8 addr[6];
         u8 addr2[6];
         int i;
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
 
         size = sprintf(buffer, 
                 "IBM Pit/Pit-Phy/Olympic Chipset Token Ring Adapter %s\n",dev->name);
@@ -1658,10 +1645,9 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
         for (i = 0 ; i < 6 ; i++)
                 addr[i] = readb(oat+offsetof(struct olympic_adapter_addr_table,node_addr) + i);
 
-        size += sprintf(buffer+size, "%6s: %s : %s : %02x:%02x:%02x:%02x\n",
+        size += sprintf(buffer+size, "%6s: %pM : %pM : %02x:%02x:%02x:%02x\n",
            dev->name,
-           print_mac(mac, dev->dev_addr),
-           print_mac(mac2, addr),
+           dev->dev_addr, addr,
            readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)), 
            readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+1),
            readb(oat+offsetof(struct olympic_adapter_addr_table,func_addr)+2),
@@ -1677,14 +1663,13 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
         for (i = 0 ; i < 6 ; i++)
                 addr2[i] =  readb(opt+offsetof(struct olympic_parameters_table, poll_addr) + i);
 
-        size += sprintf(buffer+size, "%6s: %02x:%02x:%02x:%02x   : %s : %s : %04x   : %04x     :  %04x    :\n",
+        size += sprintf(buffer+size, "%6s: %02x:%02x:%02x:%02x   : %pM : %pM : %04x   : %04x     :  %04x    :\n",
           dev->name,
           readb(opt+offsetof(struct olympic_parameters_table, phys_addr)),
           readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+1),
           readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+2),
           readb(opt+offsetof(struct olympic_parameters_table, phys_addr)+3),
-          print_mac(mac, addr),
-          print_mac(mac2, addr2),
+          addr, addr2,
           swab16(readw(opt+offsetof(struct olympic_parameters_table, acc_priority))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, auth_source_class))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, att_code))));
@@ -1694,9 +1679,8 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
         
         for (i = 0 ; i < 6 ; i++)
                 addr[i] = readb(opt+offsetof(struct olympic_parameters_table, source_addr) + i);
-        size += sprintf(buffer+size, "%6s: %s : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
-          dev->name,
-          print_mac(mac, addr),
+        size += sprintf(buffer+size, "%6s: %pM : %04x  : %04x   : %04x   : %04x   : %04x    :     %04x     : \n",
+          dev->name, addr,
           swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_type))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, major_vector))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, lan_status))),
@@ -1709,11 +1693,11 @@ static int olympic_proc_info(char *buffer, char **start, off_t offset, int lengt
 
         for (i = 0 ; i < 6 ; i++)
                 addr[i] = readb(opt+offsetof(struct olympic_parameters_table, beacon_naun) + i);
-        size += sprintf(buffer+size, "%6s:                :  %02x  :  %02x  : %s : %02x:%02x:%02x:%02x    : \n",
+        size += sprintf(buffer+size, "%6s:                :  %02x  :  %02x  : %pM : %02x:%02x:%02x:%02x    : \n",
           dev->name,
           swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_transmit))),
           swab16(readw(opt+offsetof(struct olympic_parameters_table, beacon_receive))),
-          print_mac(mac, addr),
+          addr,
           readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)),
           readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)+1),
           readb(opt+offsetof(struct olympic_parameters_table, beacon_phys)+2),
diff --git a/drivers/net/tokenring/proteon.c b/drivers/net/tokenring/proteon.c
index 00ea94513460..cd2d62f76079 100644
--- a/drivers/net/tokenring/proteon.c
+++ b/drivers/net/tokenring/proteon.c
@@ -122,7 +122,6 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
         static int versionprinted;
         const unsigned *port;
         int j,err = 0;
-        DECLARE_MAC_BUF(mac);
 
         if (!dev)
                 return -ENOMEM;
@@ -153,8 +152,8 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
                 
         proteon_read_eeprom(dev);
 
-        printk(KERN_DEBUG "proteon.c:    Ring Station Address: %s\n",
-               print_mac(mac, dev->dev_addr));
+        printk(KERN_DEBUG "proteon.c:    Ring Station Address: %pM\n",
+               dev->dev_addr);
                 
         tp = netdev_priv(dev);
         tp->setnselout = proteon_setnselout_pins;
diff --git a/drivers/net/tokenring/skisa.c b/drivers/net/tokenring/skisa.c
index 41b6999a0f33..b578744311b0 100644
--- a/drivers/net/tokenring/skisa.c
+++ b/drivers/net/tokenring/skisa.c
@@ -139,7 +139,6 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
         static int versionprinted;
         const unsigned *port;
         int j, err = 0;
-        DECLARE_MAC_BUF(mac);
 
         if (!dev)
                 return -ENOMEM;
@@ -170,8 +169,8 @@ static int __init setup_card(struct net_device *dev, struct device *pdev)
                 
         sk_isa_read_eeprom(dev);
 
-        printk(KERN_DEBUG "skisa.c:    Ring Station Address: %s\n",
-               print_mac(mac, dev->dev_addr));
+        printk(KERN_DEBUG "skisa.c:    Ring Station Address: %pM\n",
+               dev->dev_addr);
                 
         tp = netdev_priv(dev);
         tp->setnselout = sk_isa_setnselout_pins;
diff --git a/drivers/net/tokenring/tmspci.c b/drivers/net/tokenring/tmspci.c
index 5f0ee880cfff..5f601773c260 100644
--- a/drivers/net/tokenring/tmspci.c
+++ b/drivers/net/tokenring/tmspci.c
@@ -100,7 +100,6 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
         unsigned int pci_irq_line;
         unsigned long pci_ioaddr;
         struct card_info *cardinfo = &card_info_table[ent->driver_data];
-        DECLARE_MAC_BUF(mac);
 
         if (versionprinted++ == 0)
                 printk("%s", version);
@@ -137,8 +136,8 @@ static int __devinit tms_pci_attach(struct pci_dev *pdev, const struct pci_devic
                 
         tms_pci_read_eeprom(dev);
 
-        printk("%s:    Ring Station Address: %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk("%s:    Ring Station Address: %pM\n",
+               dev->name, dev->dev_addr);
                 
         ret = tmsdev_init(dev, &pdev->dev);
         if (ret) {
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c
index eb1da6f0b086..6924805e765e 100644
--- a/drivers/net/tsi108_eth.c
+++ b/drivers/net/tsi108_eth.c
@@ -1569,7 +1569,6 @@ tsi108_init_one(struct platform_device *pdev)
         struct tsi108_prv_data *data = NULL;
         hw_info *einfo;
         int err = 0;
-        DECLARE_MAC_BUF(mac);
 
         einfo = pdev->dev.platform_data;
 
@@ -1659,8 +1658,8 @@ tsi108_init_one(struct platform_device *pdev)
         }
 
         platform_set_drvdata(pdev, dev);
-        printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: Tsi108 Gigabit Ethernet, MAC: %pM\n",
+               dev->name, dev->dev_addr);
 #ifdef DEBUG
         data->msg_enable = DEBUG;
         dump_eth_one(dev);
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c
index 124d5d690dde..08076182df7c 100644
--- a/drivers/net/tulip/de2104x.c
+++ b/drivers/net/tulip/de2104x.c
@@ -1932,7 +1932,6 @@ static int __devinit de_init_one (struct pci_dev *pdev,
         void __iomem *regs;
         unsigned long pciaddr;
         static int board_idx = -1;
-        DECLARE_MAC_BUF(mac);
 
         board_idx++;
 
@@ -2046,11 +2045,11 @@ static int __devinit de_init_one (struct pci_dev *pdev,
                 goto err_out_iomap;
 
         /* print info about board and interface just registered */
-        printk (KERN_INFO "%s: %s at 0x%lx, %s, IRQ %d\n",
+        printk (KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
                 dev->name,
                 de->de21040 ? "21040" : "21041",
                 dev->base_addr,
-                print_mac(mac, dev->dev_addr),
+                dev->dev_addr,
                 dev->irq);
 
         pci_set_drvdata(pdev, dev);
diff --git a/drivers/net/tulip/de4x5.c b/drivers/net/tulip/de4x5.c
index 6444cbec0bdc..1e7d5e29a5ae 100644
--- a/drivers/net/tulip/de4x5.c
+++ b/drivers/net/tulip/de4x5.c
@@ -1085,7 +1085,6 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
     struct de4x5_private *lp = netdev_priv(dev);
     struct pci_dev *pdev = NULL;
     int i, status=0;
-    DECLARE_MAC_BUF(mac);
 
     gendev->driver_data = dev;
 
@@ -1122,7 +1121,7 @@ de4x5_hw_init(struct net_device *dev, u_long iobase, struct device *gendev)
     printk ("%s: %s at 0x%04lx", gendev->bus_id, name, iobase);
 
     status = get_hw_addr(dev);
-    printk(", h/w address %s\n", print_mac(mac, dev->dev_addr));
+    printk(", h/w address %pM\n", dev->dev_addr);
 
     if (status != 0) {
         printk("      which has an Ethernet PROM CRC error.\n");
@@ -5401,7 +5400,6 @@ static void
 de4x5_dbg_srom(struct de4x5_srom *p)
 {
     int i;
-    DECLARE_MAC_BUF(mac);
 
     if (de4x5_debug & DEBUG_SROM) {
         printk("Sub-system Vendor ID: %04x\n", *((u_short *)p->sub_vendor_id));
@@ -5410,7 +5408,7 @@ de4x5_dbg_srom(struct de4x5_srom *p)
         printk("SROM version:         %02x\n", (u_char)(p->version));
         printk("# controllers:        %02x\n", (u_char)(p->num_controllers));
 
-        printk("Hardware Address:     %s\n", print_mac(mac, p->ieee_addr));
+        printk("Hardware Address:     %pM\n", p->ieee_addr);
         printk("CRC checksum:         %04x\n", (u_short)(p->chksum));
         for (i=0; i<64; i++) {
             printk("%3d %04x\n", i<<1, (u_short)*((u_short *)p+i));
@@ -5424,12 +5422,10 @@ static void
 de4x5_dbg_rx(struct sk_buff *skb, int len)
 {
     int i, j;
-    DECLARE_MAC_BUF(mac);
-    DECLARE_MAC_BUF(mac2);
 
     if (de4x5_debug & DEBUG_RX) {
-        printk("R: %s <- %s len/SAP:%02x%02x [%d]\n",
-               print_mac(mac, skb->data), print_mac(mac2, &skb->data[6]),
+        printk("R: %pM <- %pM len/SAP:%02x%02x [%d]\n",
+               skb->data, &skb->data[6],
                (u_char)skb->data[12],
                (u_char)skb->data[13],
                len);
diff --git a/drivers/net/tulip/dmfe.c b/drivers/net/tulip/dmfe.c
index c91852f49a48..0ec3281529f9 100644
--- a/drivers/net/tulip/dmfe.c
+++ b/drivers/net/tulip/dmfe.c
@@ -362,7 +362,6 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         struct net_device *dev;
         u32 pci_pmr;
         int i, err;
-        DECLARE_MAC_BUF(mac);
 
         DMFE_DBUG(0, "dmfe_init_one()", 0);
 
@@ -475,12 +474,11 @@ static int __devinit dmfe_init_one (struct pci_dev *pdev,
         if (err)
                 goto err_out_free_buf;
 
-        printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, "
-               "%s, irq %d.\n",
+        printk(KERN_INFO "%s: Davicom DM%04lx at pci%s, %pM, irq %d.\n",
                dev->name,
                ent->driver_data >> 16,
                pci_name(pdev),
-               print_mac(mac, dev->dev_addr),
+               dev->dev_addr,
                dev->irq);
 
         pci_set_master(pdev);
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index cafa89e60167..1c5ef230b770 100644
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -1050,13 +1050,11 @@ static void set_rx_mode(struct net_device *dev)
                                         filterbit = ether_crc(ETH_ALEN, mclist->dmi_addr) >> 26;
                                 filterbit &= 0x3f;
                                 mc_filter[filterbit >> 5] |= 1 << (filterbit & 31);
-                                if (tulip_debug > 2) {
-                                        DECLARE_MAC_BUF(mac);
-                                        printk(KERN_INFO "%s: Added filter for %s"
+                                if (tulip_debug > 2)
+                                        printk(KERN_INFO "%s: Added filter for %pM"
                                                "  %8.8x bit %d.\n",
-                                               dev->name, print_mac(mac, mclist->dmi_addr),
+                                               dev->name, mclist->dmi_addr,
                                                ether_crc(ETH_ALEN, mclist->dmi_addr), filterbit);
-                                }
                         }
                         if (mc_filter[0] == tp->mc_filter[0]  &&
                                 mc_filter[1] == tp->mc_filter[1])
@@ -1250,7 +1248,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
         const char *chip_name = tulip_tbl[chip_idx].chip_name;
         unsigned int eeprom_missing = 0;
         unsigned int force_csr0 = 0;
-        DECLARE_MAC_BUF(mac);
 
 #ifndef MODULE
         static int did_version;         /* Already printed version info. */
@@ -1635,7 +1632,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
 
         if (eeprom_missing)
                 printk(" EEPROM not present,");
-        printk(" %s", print_mac(mac, dev->dev_addr));
+        printk(" %pM", dev->dev_addr);
         printk(", IRQ %d.\n", irq);
 
         if (tp->chip_id == PNIC2)
diff --git a/drivers/net/tulip/uli526x.c b/drivers/net/tulip/uli526x.c
index e9e628621639..298649a236cb 100644
--- a/drivers/net/tulip/uli526x.c
+++ b/drivers/net/tulip/uli526x.c
@@ -261,7 +261,6 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         struct uli526x_board_info *db;  /* board information structure */
         struct net_device *dev;
         int i, err;
-        DECLARE_MAC_BUF(mac);
 
         ULI526X_DBUG(0, "uli526x_init_one()", 0);
 
@@ -379,9 +378,9 @@ static int __devinit uli526x_init_one (struct pci_dev *pdev,
         if (err)
                 goto err_out_res;
 
-        printk(KERN_INFO "%s: ULi M%04lx at pci%s, %s, irq %d.\n",
+        printk(KERN_INFO "%s: ULi M%04lx at pci%s, %pM, irq %d.\n",
                dev->name,ent->driver_data >> 16,pci_name(pdev),
-               print_mac(mac, dev->dev_addr), dev->irq);
+               dev->dev_addr, dev->irq);
 
         pci_set_master(pdev);
 
diff --git a/drivers/net/tulip/winbond-840.c b/drivers/net/tulip/winbond-840.c
index 50068194c163..e4cb408a70fe 100644
--- a/drivers/net/tulip/winbond-840.c
+++ b/drivers/net/tulip/winbond-840.c
@@ -355,7 +355,6 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
         int irq;
         int i, option = find_cnt < MAX_UNITS ? options[find_cnt] : 0;
         void __iomem *ioaddr;
-        DECLARE_MAC_BUF(mac);
 
         i = pci_enable_device(pdev);
         if (i) return i;
@@ -435,9 +434,9 @@ static int __devinit w840_probe1 (struct pci_dev *pdev,
         if (i)
                 goto err_out_cleardev;
 
-        printk(KERN_INFO "%s: %s at %p, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s at %p, %pM, IRQ %d.\n",
                dev->name, pci_id_tbl[chip_idx].name, ioaddr,
-               print_mac(mac, dev->dev_addr), irq);
+               dev->dev_addr, irq);
 
         if (np->drv_flags & CanHaveMII) {
                 int phy, phy_idx = 0;
@@ -1245,16 +1244,12 @@ static int netdev_rx(struct net_device *dev)
                         }
 #ifndef final_version                           /* Remove after testing. */
                         /* You will want this info for the initial debug. */
-                        if (debug > 5) {
-                                DECLARE_MAC_BUF(mac);
-                                DECLARE_MAC_BUF(mac2);
-
-                                printk(KERN_DEBUG "  Rx data %s %s"
+                        if (debug > 5)
+                                printk(KERN_DEBUG "  Rx data %pM %pM"
                                        " %2.2x%2.2x %d.%d.%d.%d.\n",
-                                       print_mac(mac, &skb->data[0]), print_mac(mac2, &skb->data[6]),
+                                       &skb->data[0], &skb->data[6],
                                        skb->data[12], skb->data[13],
                                        skb->data[14], skb->data[15], skb->data[16], skb->data[17]);
-                        }
 #endif
                         skb->protocol = eth_type_trans(skb, dev);
                         netif_rx(skb);
diff --git a/drivers/net/tulip/xircom_cb.c b/drivers/net/tulip/xircom_cb.c
index 6b93d0169116..3c0b96b0e925 100644
--- a/drivers/net/tulip/xircom_cb.c
+++ b/drivers/net/tulip/xircom_cb.c
@@ -1072,7 +1072,6 @@ static void read_mac_address(struct xircom_private *card)
         unsigned char j, tuple, link, data_id, data_count;
         unsigned long flags;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         enter("read_mac_address");
 
@@ -1102,7 +1101,7 @@ static void read_mac_address(struct xircom_private *card)
                 }
         }
         spin_unlock_irqrestore(&card->lock, flags);
-        pr_debug(" %s\n", print_mac(mac, card->dev->dev_addr));
+        pr_debug(" %pM\n", card->dev->dev_addr);
         leave("read_mac_address");
 }
 
diff --git a/drivers/net/tun.c b/drivers/net/tun.c
index 6daea0c91862..64c7fc7ff08d 100644
--- a/drivers/net/tun.c
+++ b/drivers/net/tun.c
@@ -883,7 +883,6 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
         void __user* argp = (void __user*)arg;
         struct ifreq ifr;
         int ret;
-        DECLARE_MAC_BUF(mac);
 
         if (cmd == TUNSETIFF || _IOC_TYPE(cmd) == 0x89)
                 if (copy_from_user(&ifr, argp, sizeof ifr))
@@ -1011,8 +1010,8 @@ static int tun_chr_ioctl(struct inode *inode, struct file *file,
 
         case SIOCSIFHWADDR:
                 /* Set hw address */
-                DBG(KERN_DEBUG "%s: set hw address: %s\n",
-                        tun->dev->name, print_mac(mac, ifr.ifr_hwaddr.sa_data));
+                DBG(KERN_DEBUG "%s: set hw address: %pM\n",
+                        tun->dev->name, ifr.ifr_hwaddr.sa_data);
 
                 rtnl_lock();
                 ret = dev_set_mac_address(tun->dev, &ifr.ifr_hwaddr);
diff --git a/drivers/net/typhoon.c b/drivers/net/typhoon.c
index 734ce0977f02..6f191e9f610b 100644
--- a/drivers/net/typhoon.c
+++ b/drivers/net/typhoon.c
@@ -2311,7 +2311,6 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
         struct cmd_desc xp_cmd;
         struct resp_desc xp_resp[3];
         int err = 0;
-        DECLARE_MAC_BUF(mac);
 
         if(!did_version++)
                 printk(KERN_INFO "%s", version);
@@ -2526,11 +2525,11 @@ typhoon_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
 
         pci_set_drvdata(pdev, dev);
 
-        printk(KERN_INFO "%s: %s at %s 0x%llx, %s\n",
+        printk(KERN_INFO "%s: %s at %s 0x%llx, %pM\n",
                dev->name, typhoon_card_info[card_id].name,
                use_mmio ? "MMIO" : "IO",
                (unsigned long long)pci_resource_start(pdev, use_mmio),
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
 
         /* xp_resp still contains the response to the READ_VERSIONS command.
          * For debugging, let the user know what version he has.
diff --git a/drivers/net/usb/pegasus.c b/drivers/net/usb/pegasus.c
index 7914867110ed..c073929c4d75 100644
--- a/drivers/net/usb/pegasus.c
+++ b/drivers/net/usb/pegasus.c
@@ -1309,7 +1309,6 @@ static int pegasus_probe(struct usb_interface *intf,
         pegasus_t *pegasus;
         int dev_index = id - pegasus_ids;
         int res = -ENOMEM;
-        DECLARE_MAC_BUF(mac);
 
         usb_get_dev(dev);
 
@@ -1386,10 +1385,10 @@ static int pegasus_probe(struct usb_interface *intf,
         queue_delayed_work(pegasus_workqueue, &pegasus->carrier_check,
                                 CARRIER_CHECK_DELAY);
 
-        dev_info(&intf->dev, "%s, %s, %s\n",
+        dev_info(&intf->dev, "%s, %s, %pM\n",
                  net->name,
                  usb_dev_id[dev_index].name,
-                 print_mac(mac, net->dev_addr));
+                 net->dev_addr);
         return 0;
 
 out3:
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
index 51e2f5d7d14e..e0d349f74642 100644
--- a/drivers/net/usb/smsc95xx.c
+++ b/drivers/net/usb/smsc95xx.c
@@ -759,7 +759,6 @@ static int smsc95xx_reset(struct usbnet *dev)
         struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
         u32 read_buf, write_buf, burst_cap;
         int ret = 0, timeout;
-        DECLARE_MAC_BUF(mac);
 
         if (netif_msg_ifup(dev))
                 devdbg(dev, "entering smsc95xx_reset");
@@ -818,8 +817,7 @@ static int smsc95xx_reset(struct usbnet *dev)
                 return ret;
 
         if (netif_msg_ifup(dev))
-                devdbg(dev, "MAC Address: %s",
-                        print_mac(mac, dev->net->dev_addr));
+                devdbg(dev, "MAC Address: %pM", dev->net->dev_addr);
 
         ret = smsc95xx_read_reg(dev, HW_CFG, &read_buf);
         if (ret < 0) {
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index 02d25c743994..aa3149078888 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1125,7 +1125,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         struct usb_device               *xdev;
         int                             status;
         const char                      *name;
-        DECLARE_MAC_BUF(mac);
 
         name = udev->dev.driver->name;
         info = (struct driver_info *) prod->driver_info;
@@ -1236,11 +1235,11 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
         if (status)
                 goto out3;
         if (netif_msg_probe (dev))
-                devinfo (dev, "register '%s' at usb-%s-%s, %s, %s",
+                devinfo (dev, "register '%s' at usb-%s-%s, %s, %pM",
                         udev->dev.driver->name,
                         xdev->bus->bus_name, xdev->devpath,
                         dev->driver_info->description,
-                        print_mac(mac, net->dev_addr));
+                        net->dev_addr);
 
         // ok, it's ready to go.
         usb_set_intfdata (udev, dev);
diff --git a/drivers/net/veth.c b/drivers/net/veth.c
index 31cd817f33f9..75b40fefc4ee 100644
--- a/drivers/net/veth.c
+++ b/drivers/net/veth.c
@@ -8,7 +8,6 @@
  *
  */
 
-#include <linux/list.h>
 #include <linux/netdevice.h>
 #include <linux/ethtool.h>
 #include <linux/etherdevice.h>
@@ -30,14 +29,10 @@ struct veth_net_stats {
 
 struct veth_priv {
         struct net_device *peer;
-        struct net_device *dev;
-        struct list_head list;
         struct veth_net_stats *stats;
         unsigned ip_summed;
 };
 
-static LIST_HEAD(veth_list);
-
 /*
  * ethtool interface
  */
@@ -420,14 +415,10 @@ static int veth_newlink(struct net_device *dev,
          */
 
         priv = netdev_priv(dev);
-        priv->dev = dev;
         priv->peer = peer;
-        list_add(&priv->list, &veth_list);
 
         priv = netdev_priv(peer);
-        priv->dev = peer;
         priv->peer = dev;
-        INIT_LIST_HEAD(&priv->list);
         return 0;
 
 err_register_dev:
@@ -449,13 +440,6 @@ static void veth_dellink(struct net_device *dev)
         priv = netdev_priv(dev);
         peer = priv->peer;
 
-        if (!list_empty(&priv->list))
-                list_del(&priv->list);
-
-        priv = netdev_priv(peer);
-        if (!list_empty(&priv->list))
-                list_del(&priv->list);
-
         unregister_netdevice(dev);
         unregister_netdevice(peer);
 }
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c
index 5b7870080c56..bb54a936a807 100644
--- a/drivers/net/via-rhine.c
+++ b/drivers/net/via-rhine.c
@@ -631,7 +631,6 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
 #else
         int bar = 0;
 #endif
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -787,14 +786,14 @@ static int __devinit rhine_init_one(struct pci_dev *pdev,
         if (rc)
                 goto err_out_unmap;
 
-        printk(KERN_INFO "%s: VIA %s at 0x%lx, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: VIA %s at 0x%lx, %pM, IRQ %d.\n",
                dev->name, name,
 #ifdef USE_MMIO
                memaddr,
 #else
                (long)ioaddr,
 #endif
-               print_mac(mac, dev->dev_addr), pdev->irq);
+               dev->dev_addr, pdev->irq);
 
         pci_set_drvdata(pdev, dev);
 
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c
index 0196a0df9021..68f908a57ac3 100644
--- a/drivers/net/virtio_net.c
+++ b/drivers/net/virtio_net.c
@@ -325,9 +325,7 @@ static int xmit_skb(struct virtnet_info *vi, struct sk_buff *skb)
 
         sg_init_table(sg, 2+MAX_SKB_FRAGS);
 
-        pr_debug("%s: xmit %p " MAC_FMT "\n", vi->dev->name, skb,
-                 dest[0], dest[1], dest[2],
-                 dest[3], dest[4], dest[5]);
+        pr_debug("%s: xmit %p %pM\n", vi->dev->name, skb, dest);
 
         /* Encode metadata header at front. */
         hdr = skb_vnet_hdr(skb);
diff --git a/drivers/net/wan/dscc4.c b/drivers/net/wan/dscc4.c
index 5f1ccb2b08b1..7d16ca3cb93c 100644
--- a/drivers/net/wan/dscc4.c
+++ b/drivers/net/wan/dscc4.c
@@ -730,8 +730,7 @@ static int __devinit dscc4_init_one(struct pci_dev *pdev,
                 goto err_free_mmio_region_1;
         }
 
-        ioaddr = ioremap(pci_resource_start(pdev, 0),
-                                        pci_resource_len(pdev, 0));
+        ioaddr = pci_ioremap_bar(pdev, 0);
         if (!ioaddr) {
                 printk(KERN_ERR "%s: cannot remap MMIO region %llx @ %llx\n",
                         DRV_NAME, (unsigned long long)pci_resource_len(pdev, 0),
diff --git a/drivers/net/wan/pc300too.c b/drivers/net/wan/pc300too.c
index bf1b01590429..222671165223 100644
--- a/drivers/net/wan/pc300too.c
+++ b/drivers/net/wan/pc300too.c
@@ -379,7 +379,7 @@ static int __devinit pc300_pci_init_one(struct pci_dev *pdev,
         card->scabase = ioremap(scaphys, PC300_SCA_SIZE);
 
         ramphys = pci_resource_start(pdev,3) & PCI_BASE_ADDRESS_MEM_MASK;
-        card->rambase = ioremap(ramphys, pci_resource_len(pdev,3));
+        card->rambase = pci_ioremap_bar(pdev, 3);
 
         if (card->plxbase == NULL ||
             card->scabase == NULL ||
diff --git a/drivers/net/wan/pci200syn.c b/drivers/net/wan/pci200syn.c
index b595b64e7538..bba111cdeebe 100644
--- a/drivers/net/wan/pci200syn.c
+++ b/drivers/net/wan/pci200syn.c
@@ -343,7 +343,7 @@ static int __devinit pci200_pci_init_one(struct pci_dev *pdev,
         card->scabase = ioremap(scaphys, PCI200SYN_SCA_SIZE);
 
         ramphys = pci_resource_start(pdev,3) & PCI_BASE_ADDRESS_MEM_MASK;
-        card->rambase = ioremap(ramphys, pci_resource_len(pdev,3));
+        card->rambase = pci_ioremap_bar(pdev, 3);
 
         if (card->plxbase == NULL ||
             card->scabase == NULL ||
diff --git a/drivers/net/wd.c b/drivers/net/wd.c
index fa14255282af..6d96ed472119 100644
--- a/drivers/net/wd.c
+++ b/drivers/net/wd.c
@@ -156,7 +156,6 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
         int word16 = 0;                         /* 0 = 8 bit, 1 = 16 bit */
         const char *model_name;
         static unsigned version_printed;
-        DECLARE_MAC_BUF(mac);
 
         for (i = 0; i < 8; i++)
                 checksum += inb(ioaddr + 8 + i);
@@ -178,8 +177,8 @@ static int __init wd_probe1(struct net_device *dev, int ioaddr)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = inb(ioaddr + 8 + i);
 
-        printk("%s: WD80x3 at %#3x, %s",
-               dev->name, ioaddr, print_mac(mac, dev->dev_addr));
+        printk("%s: WD80x3 at %#3x, %pM",
+               dev->name, ioaddr, dev->dev_addr);
 
         /* The following PureData probe code was contributed by
            Mike Jagdis <jaggy@purplet.demon.co.uk>. Puredata does software
diff --git a/drivers/net/wireless/adm8211.c b/drivers/net/wireless/adm8211.c
index b2c050b68890..6e18c9d36787 100644
--- a/drivers/net/wireless/adm8211.c
+++ b/drivers/net/wireless/adm8211.c
@@ -1791,7 +1791,6 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
         int err;
         u32 reg;
         u8 perm_addr[ETH_ALEN];
-        DECLARE_MAC_BUF(mac);
 
         err = pci_enable_device(pdev);
         if (err) {
@@ -1925,8 +1924,8 @@ static int __devinit adm8211_probe(struct pci_dev *pdev,
                 goto err_free_desc;
         }
 
-        printk(KERN_INFO "%s: hwaddr %s, Rev 0x%02x\n",
-               wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),
+        printk(KERN_INFO "%s: hwaddr %pM, Rev 0x%02x\n",
+               wiphy_name(dev->wiphy), dev->wiphy->perm_addr,
                pdev->revision);
 
         return 0;
diff --git a/drivers/net/wireless/airo.c b/drivers/net/wireless/airo.c
index 370133e492d2..7c99f5a5b332 100644
--- a/drivers/net/wireless/airo.c
+++ b/drivers/net/wireless/airo.c
@@ -2757,7 +2757,6 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
         struct net_device *dev;
         struct airo_info *ai;
         int i, rc;
-        DECLARE_MAC_BUF(mac);
 
         /* Create the network device object. */
         dev = alloc_netdev(sizeof(*ai), "", ether_setup);
@@ -2860,8 +2859,7 @@ static struct net_device *_init_airo_card( unsigned short irq, int port,
                 goto err_out_reg;
 
         set_bit(FLAG_REGISTERED,&ai->flags);
-        airo_print_info(dev->name, "MAC enabled %s",
-                        print_mac(mac, dev->dev_addr));
+        airo_print_info(dev->name, "MAC enabled %pM", dev->dev_addr);
 
         /* Allocate the transmit buffers */
         if (probe && !test_bit(FLAG_MPI,&ai->flags))
@@ -2918,7 +2916,6 @@ int reset_airo_card( struct net_device *dev )
 {
         int i;
         struct airo_info *ai = dev->priv;
-        DECLARE_MAC_BUF(mac);
 
         if (reset_card (dev, 1))
                 return -1;
@@ -2927,8 +2924,7 @@ int reset_airo_card( struct net_device *dev )
                 airo_print_err(dev->name, "MAC could not be enabled");
                 return -1;
         }
-        airo_print_info(dev->name, "MAC enabled %s",
-                        print_mac(mac, dev->dev_addr));
+        airo_print_info(dev->name, "MAC enabled %pM", dev->dev_addr);
         /* Allocate the transmit buffers if needed */
         if (!test_bit(FLAG_MPI,&ai->flags))
                 for( i = 0; i < MAX_FIDS; i++ )
@@ -5330,7 +5326,6 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
         int i;
         char *ptr;
         APListRid APList_rid;
-        DECLARE_MAC_BUF(mac);
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
@@ -5354,8 +5349,7 @@ static int proc_APList_open( struct inode *inode, struct file *file ) {
 // We end when we find a zero MAC
                 if ( !*(int*)APList_rid.ap[i] &&
                      !*(int*)&APList_rid.ap[i][2]) break;
-                ptr += sprintf(ptr, "%s\n",
-                               print_mac(mac, APList_rid.ap[i]));
+                ptr += sprintf(ptr, "%pM\n", APList_rid.ap[i]);
         }
         if (i==0) ptr += sprintf(ptr, "Not using specific APs\n");
 
@@ -5374,7 +5368,6 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
         int rc;
         /* If doLoseSync is not 1, we won't do a Lose Sync */
         int doLoseSync = -1;
-        DECLARE_MAC_BUF(mac);
 
         if ((file->private_data = kzalloc(sizeof(struct proc_data ), GFP_KERNEL)) == NULL)
                 return -ENOMEM;
@@ -5411,8 +5404,8 @@ static int proc_BSSList_open( struct inode *inode, struct file *file ) {
            we have to add a spin lock... */
         rc = readBSSListRid(ai, doLoseSync, &BSSList_rid);
         while(rc == 0 && BSSList_rid.index != cpu_to_le16(0xffff)) {
-                ptr += sprintf(ptr, "%s %*s rssi = %d",
-                               print_mac(mac, BSSList_rid.bssid),
+                ptr += sprintf(ptr, "%pM %*s rssi = %d",
+                               BSSList_rid.bssid,
                                 (int)BSSList_rid.ssidLen,
                                 BSSList_rid.ssid,
                                 le16_to_cpu(BSSList_rid.dBm));
diff --git a/drivers/net/wireless/arlan-main.c b/drivers/net/wireless/arlan-main.c
index dec5e874a54d..b608643d5fcc 100644
--- a/drivers/net/wireless/arlan-main.c
+++ b/drivers/net/wireless/arlan-main.c
@@ -1467,19 +1467,17 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                                                 else if (hw_dst_addr[1] == 0x40)
                                                         printk(KERN_ERR "%s m/bcast 0x0140 \n", dev->name);
                                         while (dmi)
-                                        {                                                       if (dmi->dmi_addrlen == 6)
-                                                {
-                                                        DECLARE_MAC_BUF(mac);
+                                        {
+                                                if (dmi->dmi_addrlen == 6) {
                                                         if (arlan_debug & ARLAN_DEBUG_HEADER_DUMP)
-                                                                printk(KERN_ERR "%s mcl %s\n",
-                                                                       dev->name, print_mac(mac, dmi->dmi_addr));
+                                                                printk(KERN_ERR "%s mcl %pM\n",
+                                                                       dev->name, dmi->dmi_addr);
                                                         for (i = 0; i < 6; i++)
                                                                 if (dmi->dmi_addr[i] != hw_dst_addr[i])
                                                                         break;
                                                         if (i == 6)
                                                                 break;
-                                                }
-                                                else
+                                                } else
                                                         printk(KERN_ERR "%s: invalid multicast address length given.\n", dev->name);
                                                 dmi = dmi->next;
                                         }
@@ -1512,18 +1510,14 @@ static void arlan_rx_interrupt(struct net_device *dev, u_char rxStatus, u_short
                         {
                                 char immedDestAddress[6];
                                 char immedSrcAddress[6];
-                                DECLARE_MAC_BUF(mac);
-                                DECLARE_MAC_BUF(mac2);
-                                DECLARE_MAC_BUF(mac3);
-                                DECLARE_MAC_BUF(mac4);
                                 memcpy_fromio(immedDestAddress, arlan->immedDestAddress, 6);
                                 memcpy_fromio(immedSrcAddress, arlan->immedSrcAddress, 6);
 
-                                printk(KERN_WARNING "%s t %s f %s imd %s ims %s\n",
-                                       dev->name, print_mac(mac, skbtmp),
-                                       print_mac(mac2, &skbtmp[6]),
-                                       print_mac(mac3, immedDestAddress),
-                                       print_mac(mac4, immedSrcAddress));
+                                printk(KERN_WARNING "%s t %pM f %pM imd %pM ims %pM\n",
+                                       dev->name, skbtmp,
+                                       &skbtmp[6],
+                                       immedDestAddress,
+                                       immedSrcAddress);
                         }
                         skb->protocol = eth_type_trans(skb, dev);
                         IFDEBUG(ARLAN_DEBUG_HEADER_DUMP)
diff --git a/drivers/net/wireless/ath9k/core.c b/drivers/net/wireless/ath9k/core.c
index c5033f6f42ac..0089e023c609 100644
--- a/drivers/net/wireless/ath9k/core.c
+++ b/drivers/net/wireless/ath9k/core.c
@@ -1325,7 +1325,6 @@ struct ath_node *ath_node_attach(struct ath_softc *sc, u8 *addr, int if_id)
 {
         struct ath_vap *avp;
         struct ath_node *an;
-        DECLARE_MAC_BUF(mac);
 
         avp = sc->sc_vaps[if_id];
         ASSERT(avp != NULL);
@@ -1355,8 +1354,6 @@ void ath_node_detach(struct ath_softc *sc, struct ath_node *an, bool bh_flag)
 {
         unsigned long flags;
 
-        DECLARE_MAC_BUF(mac);
-
         ath_chainmask_sel_timerstop(&an->an_chainmask_sel);
         an->an_flags |= ATH_NODE_CLEAN;
         ath_tx_node_cleanup(sc, an, bh_flag);
diff --git a/drivers/net/wireless/ath9k/hw.c b/drivers/net/wireless/ath9k/hw.c
index 98bc25c9b3cf..d5b513e134ab 100644
--- a/drivers/net/wireless/ath9k/hw.c
+++ b/drivers/net/wireless/ath9k/hw.c
@@ -1291,7 +1291,6 @@ static int ath9k_hw_init_macaddr(struct ath_hal *ah)
         int i;
         u16 eeval;
         struct ath_hal_5416 *ahp = AH5416(ah);
-        DECLARE_MAC_BUF(mac);
 
         sum = 0;
         for (i = 0; i < 3; i++) {
@@ -1302,8 +1301,8 @@ static int ath9k_hw_init_macaddr(struct ath_hal *ah)
         }
         if (sum == 0 || sum == 0xffff * 3) {
                 DPRINTF(ah->ah_sc, ATH_DBG_EEPROM,
-                         "%s: mac address read failed: %s\n", __func__,
-                         print_mac(mac, ahp->ah_macaddr));
+                         "%s: mac address read failed: %pM\n", __func__,
+                         ahp->ah_macaddr);
                 return -EADDRNOTAVAIL;
         }
 
diff --git a/drivers/net/wireless/ath9k/main.c b/drivers/net/wireless/ath9k/main.c
index f05f584ab7bc..186d75acb326 100644
--- a/drivers/net/wireless/ath9k/main.c
+++ b/drivers/net/wireless/ath9k/main.c
@@ -362,7 +362,6 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
         struct ieee80211_channel *curchan = hw->conf.channel;
         struct ath_vap *avp;
         int pos;
-        DECLARE_MAC_BUF(mac);
 
         if (bss_conf->assoc) {
                 DPRINTF(sc, ATH_DBG_CONFIG, "%s: Bss Info ASSOC %d\n",
@@ -397,9 +396,9 @@ static void ath9k_bss_assoc_info(struct ath_softc *sc,
                 ath_update_chainmask(sc, bss_conf->assoc_ht);
 
                 DPRINTF(sc, ATH_DBG_CONFIG,
-                        "%s: bssid %s aid 0x%x\n",
+                        "%s: bssid %pM aid 0x%x\n",
                         __func__,
-                        print_mac(mac, sc->sc_curbssid), sc->sc_curaid);
+                        sc->sc_curbssid, sc->sc_curaid);
 
                 DPRINTF(sc, ATH_DBG_CONFIG, "%s: Set channel: %d MHz\n",
                         __func__,
@@ -1278,7 +1277,6 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
         struct ath_vap *avp;
         u32 rfilt = 0;
         int error, i;
-        DECLARE_MAC_BUF(mac);
 
         avp = sc->sc_vaps[0];
         if (avp == NULL) {
@@ -1333,9 +1331,9 @@ static int ath9k_config_interface(struct ieee80211_hw *hw,
                         sc->sc_imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);
 
                         DPRINTF(sc, ATH_DBG_CONFIG,
-                                "%s: RX filter 0x%x bssid %s aid 0x%x\n",
+                                "%s: RX filter 0x%x bssid %pM aid 0x%x\n",
                                 __func__, rfilt,
-                                print_mac(mac, sc->sc_curbssid), sc->sc_curaid);
+                                sc->sc_curbssid, sc->sc_curaid);
 
                         /* need to reconfigure the beacon */
                         sc->sc_flags &= ~SC_OP_BEACONS ;
@@ -1424,7 +1422,6 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,
         struct ath_softc *sc = hw->priv;
         struct ath_node *an;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&sc->node_lock, flags);
         an = ath_node_find(sc, sta->addr);
@@ -1435,8 +1432,8 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,
                 spin_lock_irqsave(&sc->node_lock, flags);
                 if (!an) {
                         ath_node_attach(sc, sta->addr, 0);
-                        DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach a node: %s\n",
-                                __func__, print_mac(mac, sta->addr));
+                        DPRINTF(sc, ATH_DBG_CONFIG, "%s: Attach a node: %pM\n",
+                                __func__, sta->addr);
                 } else {
                         ath_node_get(sc, sta->addr);
                 }
@@ -1449,9 +1446,9 @@ static void ath9k_sta_notify(struct ieee80211_hw *hw,
                                 __func__);
                 else {
                         ath_node_put(sc, an, ATH9K_BH_STATUS_INTACT);
-                        DPRINTF(sc, ATH_DBG_CONFIG, "%s: Put a node: %s\n",
+                        DPRINTF(sc, ATH_DBG_CONFIG, "%s: Put a node: %pM\n",
                                 __func__,
-                                print_mac(mac, sta->addr));
+                                sta->addr);
                 }
                 break;
         default:
diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index cca2fc5b0765..b1e535b8ec48 100644
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -1942,7 +1942,6 @@ static void ath_get_rate(void *priv, struct ieee80211_supported_band *sband,
         s8 lowest_idx;
         __le16 fc = hdr->frame_control;
         u8 *qc, tid;
-        DECLARE_MAC_BUF(mac);
 
         DPRINTF(sc, ATH_DBG_RATE, "%s\n", __func__);
 
@@ -2003,14 +2002,14 @@ static void ath_get_rate(void *priv, struct ieee80211_supported_band *sband,
                                 if (ret)
                                         DPRINTF(sc, ATH_DBG_AGGR,
                                                 "%s: Unable to start tx "
-                                                "aggr for: %s\n",
+                                                "aggr for: %pM\n",
                                                 __func__,
-                                                print_mac(mac, hdr->addr1));
+                                                hdr->addr1);
                                 else
                                         DPRINTF(sc, ATH_DBG_AGGR,
-                                                "%s: Started tx aggr for: %s\n",
+                                                "%s: Started tx aggr for: %pM\n",
                                                 __func__,
-                                                print_mac(mac, hdr->addr1));
+                                                hdr->addr1);
                         } else if (chk == AGGR_EXCHANGE_PROGRESS)
                                 ath_tx_aggr_resp(sc, sband, sta, an, tid);
                 }
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 3a4757942b3f..13866043dec9 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -2416,7 +2416,6 @@ enum ATH_AGGR_CHECK ath_tx_aggr_check(struct ath_softc *sc,
                                       u8 tidno)
 {
         struct ath_atx_tid *txtid;
-        DECLARE_MAC_BUF(mac);
 
         if (!(sc->sc_flags & SC_OP_TXAGGR))
                 return AGGR_NOT_REQUIRED;
diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c
index ecb02bdaab5b..6e20552c1881 100644
--- a/drivers/net/wireless/atmel.c
+++ b/drivers/net/wireless/atmel.c
@@ -1479,7 +1479,6 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
         struct net_device *dev;
         struct atmel_private *priv;
         int rc;
-        DECLARE_MAC_BUF(mac);
 
         /* Create the network device object. */
         dev = alloc_etherdev(sizeof(*priv));
@@ -1591,8 +1590,8 @@ struct net_device *init_atmel_card(unsigned short irq, unsigned long port,
         if (!ent)
                 printk(KERN_WARNING "atmel: unable to create /proc entry.\n");
 
-        printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %s\n",
-               dev->name, DRIVER_MAJOR, DRIVER_MINOR, print_mac(mac, dev->dev_addr));
+        printk(KERN_INFO "%s: Atmel at76c50x. Version %d.%d. MAC %pM\n",
+               dev->name, DRIVER_MAJOR, DRIVER_MINOR, dev->dev_addr);
 
         return dev;
 
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c
index 14c44df584d0..6e773018cba0 100644
--- a/drivers/net/wireless/b43/main.c
+++ b/drivers/net/wireless/b43/main.c
@@ -3445,7 +3445,6 @@ static int b43_op_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
         u8 algorithm;
         u8 index;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         if (modparam_nohwcrypt)
                 return -ENOSPC; /* User disabled HW-crypto */
@@ -3533,9 +3532,9 @@ out_unlock:
         mutex_unlock(&wl->mutex);
         if (!err) {
                 b43dbg(wl, "%s hardware based encryption for keyidx: %d, "
-                       "mac: %s\n",
+                       "mac: %pM\n",
                        cmd == SET_KEY ? "Using" : "Disabling", key->keyidx,
-                       print_mac(mac, addr));
+                       addr);
         }
         return err;
 }
diff --git a/drivers/net/wireless/hostap/hostap_80211_rx.c b/drivers/net/wireless/hostap/hostap_80211_rx.c
index f106bc1585a4..bbb8ec6683d7 100644
--- a/drivers/net/wireless/hostap/hostap_80211_rx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_rx.c
@@ -19,7 +19,6 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
 {
         struct ieee80211_hdr_4addr *hdr;
         u16 fc;
-        DECLARE_MAC_BUF(mac);
 
         hdr = (struct ieee80211_hdr_4addr *) skb->data;
 
@@ -45,11 +44,11 @@ void hostap_dump_rx_80211(const char *name, struct sk_buff *skb,
         printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr->duration_id),
                le16_to_cpu(hdr->seq_ctl));
 
-        printk(KERN_DEBUG "   A1=%s", print_mac(mac, hdr->addr1));
-        printk(" A2=%s", print_mac(mac, hdr->addr2));
-        printk(" A3=%s", print_mac(mac, hdr->addr3));
+        printk(KERN_DEBUG "   A1=%pM", hdr->addr1);
+        printk(" A2=%pM", hdr->addr2);
+        printk(" A3=%pM", hdr->addr3);
         if (skb->len >= 30)
-                printk(" A4=%s", print_mac(mac, hdr->addr4));
+                printk(" A4=%pM", hdr->addr4);
         printk("\n");
 }
 
@@ -557,7 +556,6 @@ static int
 hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr_4addr *hdr,
                     u16 fc, struct net_device **wds)
 {
-        DECLARE_MAC_BUF(mac);
         /* FIX: is this really supposed to accept WDS frames only in Master
          * mode? What about Repeater or Managed with WDS frames? */
         if ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) !=
@@ -573,10 +571,10 @@ hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr_4addr *hdr,
              hdr->addr1[4] != 0xff || hdr->addr1[5] != 0xff)) {
                 /* RA (or BSSID) is not ours - drop */
                 PDEBUG(DEBUG_EXTRA2, "%s: received WDS frame with "
-                       "not own or broadcast %s=%s\n",
+                       "not own or broadcast %s=%pM\n",
                        local->dev->name,
                        fc & IEEE80211_FCTL_FROMDS ? "RA" : "BSSID",
-                       print_mac(mac, hdr->addr1));
+                       hdr->addr1);
                 return -1;
         }
 
@@ -589,8 +587,8 @@ hostap_rx_frame_wds(local_info_t *local, struct ieee80211_hdr_4addr *hdr,
                 /* require that WDS link has been registered with TA or the
                  * frame is from current AP when using 'AP client mode' */
                 PDEBUG(DEBUG_EXTRA, "%s: received WDS[4 addr] frame "
-                       "from unknown TA=%s\n",
-                       local->dev->name, print_mac(mac, hdr->addr2));
+                       "from unknown TA=%pM\n",
+                       local->dev->name, hdr->addr2);
                 if (local->ap && local->ap->autom_ap_wds)
                         hostap_wds_link_oper(local, hdr->addr2, WDS_ADD);
                 return -1;
@@ -667,10 +665,8 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
             strcmp(crypt->ops->name, "TKIP") == 0) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
-                               "received packet from " MAC_FMT "\n",
-                               local->dev->name,
-                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
+                               "received packet from %pM\n",
+                               local->dev->name, hdr->addr2);
                 }
                 return -1;
         }
@@ -679,12 +675,8 @@ hostap_rx_frame_decrypt(local_info_t *local, struct sk_buff *skb,
         res = crypt->ops->decrypt_mpdu(skb, hdrlen, crypt->priv);
         atomic_dec(&crypt->refcnt);
         if (res < 0) {
-                printk(KERN_DEBUG "%s: decryption failed (SA=" MAC_FMT
-                       ") res=%d\n",
-                       local->dev->name,
-                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
-                       res);
+                printk(KERN_DEBUG "%s: decryption failed (SA=%pM) res=%d\n",
+                       local->dev->name, hdr->addr2, res);
                 local->comm_tallies.rx_discards_wep_undecryptable++;
                 return -1;
         }
@@ -700,7 +692,6 @@ hostap_rx_frame_decrypt_msdu(local_info_t *local, struct sk_buff *skb,
 {
         struct ieee80211_hdr_4addr *hdr;
         int res, hdrlen;
-        DECLARE_MAC_BUF(mac);
 
         if (crypt == NULL || crypt->ops->decrypt_msdu == NULL)
                 return 0;
@@ -713,8 +704,8 @@ hostap_rx_frame_decrypt_msdu(local_info_t *local, struct sk_buff *skb,
         atomic_dec(&crypt->refcnt);
         if (res < 0) {
                 printk(KERN_DEBUG "%s: MSDU decryption/MIC verification failed"
-                       " (SA=%s keyidx=%d)\n",
-                       local->dev->name, print_mac(mac, hdr->addr2), keyidx);
+                       " (SA=%pM keyidx=%d)\n",
+                       local->dev->name, hdr->addr2, keyidx);
                 return -1;
         }
 
@@ -822,10 +813,8 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                          * frames silently instead of filling system log with
                          * these reports. */
                         printk(KERN_DEBUG "%s: WEP decryption failed (not set)"
-                               " (SA=" MAC_FMT ")\n",
-                               local->dev->name,
-                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
+                               " (SA=%pM)\n",
+                               local->dev->name, hdr->addr2);
 #endif
                         local->comm_tallies.rx_discards_wep_undecryptable++;
                         goto rx_dropped;
@@ -839,9 +828,7 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                     (keyidx = hostap_rx_frame_decrypt(local, skb, crypt)) < 0)
                 {
                         printk(KERN_DEBUG "%s: failed to decrypt mgmt::auth "
-                               "from " MAC_FMT "\n", dev->name,
-                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
+                               "from %pM\n", dev->name, hdr->addr2);
                         /* TODO: could inform hostapd about this so that it
                          * could send auth failure report */
                         goto rx_dropped;
@@ -1009,10 +996,8 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
                                "unencrypted EAPOL frame\n", local->dev->name);
                 } else {
                         printk(KERN_DEBUG "%s: encryption configured, but RX "
-                               "frame not encrypted (SA=" MAC_FMT ")\n",
-                               local->dev->name,
-                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
+                               "frame not encrypted (SA=%pM)\n",
+                               local->dev->name, hdr->addr2);
                         goto rx_dropped;
                 }
         }
@@ -1021,10 +1006,8 @@ void hostap_80211_rx(struct net_device *dev, struct sk_buff *skb,
             !hostap_is_eapol_frame(local, skb)) {
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: dropped unencrypted RX data "
-                               "frame from " MAC_FMT " (drop_unencrypted=1)\n",
-                               dev->name,
-                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
+                               "frame from %pM (drop_unencrypted=1)\n",
+                               dev->name, hdr->addr2);
                 }
                 goto rx_dropped;
         }
diff --git a/drivers/net/wireless/hostap/hostap_80211_tx.c b/drivers/net/wireless/hostap/hostap_80211_tx.c
index 921c984416f8..075247188e64 100644
--- a/drivers/net/wireless/hostap/hostap_80211_tx.c
+++ b/drivers/net/wireless/hostap/hostap_80211_tx.c
@@ -17,7 +17,6 @@ void hostap_dump_tx_80211(const char *name, struct sk_buff *skb)
 {
         struct ieee80211_hdr_4addr *hdr;
         u16 fc;
-        DECLARE_MAC_BUF(mac);
 
         hdr = (struct ieee80211_hdr_4addr *) skb->data;
 
@@ -41,11 +40,11 @@ void hostap_dump_tx_80211(const char *name, struct sk_buff *skb)
         printk(" dur=0x%04x seq=0x%04x\n", le16_to_cpu(hdr->duration_id),
                le16_to_cpu(hdr->seq_ctl));
 
-        printk(KERN_DEBUG "   A1=%s", print_mac(mac, hdr->addr1));
-        printk(" A2=%s", print_mac(mac, hdr->addr2));
-        printk(" A3=%s", print_mac(mac, hdr->addr3));
+        printk(KERN_DEBUG "   A1=%pM", hdr->addr1);
+        printk(" A2=%pM", hdr->addr2);
+        printk(" A3=%pM", hdr->addr3);
         if (skb->len >= 30)
-                printk(" A4=%s", print_mac(mac, hdr->addr4));
+                printk(" A4=%pM", hdr->addr4);
         printk("\n");
 }
 
@@ -328,10 +327,8 @@ static struct sk_buff * hostap_tx_encrypt(struct sk_buff *skb,
                 hdr = (struct ieee80211_hdr_4addr *) skb->data;
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "%s: TKIP countermeasures: dropped "
-                               "TX packet to " MAC_FMT "\n",
-                               local->dev->name,
-                               hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                               hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
+                               "TX packet to %pM\n",
+                               local->dev->name, hdr->addr1);
                 }
                 kfree_skb(skb);
                 return NULL;
diff --git a/drivers/net/wireless/hostap/hostap_ap.c b/drivers/net/wireless/hostap/hostap_ap.c
index af3d4ef2a80b..dec3dbe1bf8f 100644
--- a/drivers/net/wireless/hostap/hostap_ap.c
+++ b/drivers/net/wireless/hostap/hostap_ap.c
@@ -94,7 +94,6 @@ static void ap_sta_hash_add(struct ap_data *ap, struct sta_info *sta)
 static void ap_sta_hash_del(struct ap_data *ap, struct sta_info *sta)
 {
         struct sta_info *s;
-        DECLARE_MAC_BUF(mac);
 
         s = ap->sta_hash[STA_HASH(sta->addr)];
         if (s == NULL) return;
@@ -109,20 +108,18 @@ static void ap_sta_hash_del(struct ap_data *ap, struct sta_info *sta)
         if (s->hnext != NULL)
                 s->hnext = s->hnext->hnext;
         else
-                printk("AP: could not remove STA %s"
-                       " from hash table\n",
-                       print_mac(mac, sta->addr));
+                printk("AP: could not remove STA %pM from hash table\n",
+                       sta->addr);
 }
 
 static void ap_free_sta(struct ap_data *ap, struct sta_info *sta)
 {
-        DECLARE_MAC_BUF(mac);
         if (sta->ap && sta->local)
                 hostap_event_expired_sta(sta->local->dev, sta);
 
         if (ap->proc != NULL) {
                 char name[20];
-                sprintf(name, "%s", print_mac(mac, sta->addr));
+                sprintf(name, "%pM", sta->addr);
                 remove_proc_entry(name, ap->proc);
         }
 
@@ -185,7 +182,6 @@ static void ap_handle_timer(unsigned long data)
         struct ap_data *ap;
         unsigned long next_time = 0;
         int was_assoc;
-        DECLARE_MAC_BUF(mac);
 
         if (sta == NULL || sta->local == NULL || sta->local->ap == NULL) {
                 PDEBUG(DEBUG_AP, "ap_handle_timer() called with NULL data\n");
@@ -242,8 +238,8 @@ static void ap_handle_timer(unsigned long data)
         if (sta->ap) {
                 if (ap->autom_ap_wds) {
                         PDEBUG(DEBUG_AP, "%s: removing automatic WDS "
-                               "connection to AP %s\n",
-                               local->dev->name, print_mac(mac, sta->addr));
+                               "connection to AP %pM\n",
+                               local->dev->name, sta->addr);
                         hostap_wds_link_oper(local, sta->addr, WDS_DEL);
                 }
         } else if (sta->timeout_next == STA_NULLFUNC) {
@@ -259,11 +255,11 @@ static void ap_handle_timer(unsigned long data)
         } else {
                 int deauth = sta->timeout_next == STA_DEAUTH;
                 __le16 resp;
-                PDEBUG(DEBUG_AP, "%s: sending %s info to STA %s"
+                PDEBUG(DEBUG_AP, "%s: sending %s info to STA %pM"
                        "(last=%lu, jiffies=%lu)\n",
                        local->dev->name,
                        deauth ? "deauthentication" : "disassociation",
-                       print_mac(mac, sta->addr), sta->last_rx, jiffies);
+                       sta->addr, sta->last_rx, jiffies);
 
                 resp = cpu_to_le16(deauth ? WLAN_REASON_PREV_AUTH_NOT_VALID :
                                    WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);
@@ -275,10 +271,10 @@ static void ap_handle_timer(unsigned long data)
 
         if (sta->timeout_next == STA_DEAUTH) {
                 if (sta->flags & WLAN_STA_PERM) {
-                        PDEBUG(DEBUG_AP, "%s: STA %s"
+                        PDEBUG(DEBUG_AP, "%s: STA %pM"
                                " would have been removed, "
                                "but it has 'perm' flag\n",
-                               local->dev->name, print_mac(mac, sta->addr));
+                               local->dev->name, sta->addr);
                 } else
                         ap_free_sta(ap, sta);
                 return;
@@ -332,7 +328,6 @@ static int ap_control_proc_read(char *page, char **start, off_t off,
         struct ap_data *ap = (struct ap_data *) data;
         char *policy_txt;
         struct mac_entry *entry;
-        DECLARE_MAC_BUF(mac);
 
         if (off != 0) {
                 *eof = 1;
@@ -363,7 +358,7 @@ static int ap_control_proc_read(char *page, char **start, off_t off,
                         break;
                 }
 
-                p += sprintf(p, "%s\n", print_mac(mac, entry->addr));
+                p += sprintf(p, "%pM\n", entry->addr);
         }
         spin_unlock_bh(&ap->mac_restrictions.lock);
 
@@ -520,7 +515,6 @@ static int prism2_ap_proc_read(char *page, char **start, off_t off,
         struct ap_data *ap = (struct ap_data *) data;
         struct sta_info *sta;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         if (off > PROC_LIMIT) {
                 *eof = 1;
@@ -533,8 +527,8 @@ static int prism2_ap_proc_read(char *page, char **start, off_t off,
                 if (!sta->ap)
                         continue;
 
-                p += sprintf(p, "%s %d %d %d %d '",
-                             print_mac(mac, sta->addr),
+                p += sprintf(p, "%pM %d %d %d %d '",
+                             sta->addr,
                              sta->u.ap.channel, sta->last_rx_signal,
                              sta->last_rx_silence, sta->last_rx_rate);
                 for (i = 0; i < sta->u.ap.ssid_len; i++)
@@ -683,11 +677,9 @@ static void hostap_ap_tx_cb_auth(struct sk_buff *skb, int ok, void *data)
         if (sta)
                 atomic_dec(&sta->users);
         if (txt) {
-                PDEBUG(DEBUG_AP, "%s: " MAC_FMT " auth_cb - alg=%d "
+                PDEBUG(DEBUG_AP, "%s: %pM auth_cb - alg=%d "
                        "trans#=%d status=%d - %s\n",
-                       dev->name,
-                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
+                       dev->name, hdr->addr1,
                        auth_alg, auth_transaction, status, txt);
         }
         dev_kfree_skb(skb);
@@ -754,11 +746,8 @@ static void hostap_ap_tx_cb_assoc(struct sk_buff *skb, int ok, void *data)
         if (sta)
                 atomic_dec(&sta->users);
         if (txt) {
-                PDEBUG(DEBUG_AP, "%s: " MAC_FMT " assoc_cb - %s\n",
-                       dev->name,
-                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
-                       txt);
+                PDEBUG(DEBUG_AP, "%s: %pM assoc_cb - %s\n",
+                       dev->name, hdr->addr1, txt);
         }
         dev_kfree_skb(skb);
 }
@@ -781,11 +770,9 @@ static void hostap_ap_tx_cb_poll(struct sk_buff *skb, int ok, void *data)
                         sta->flags &= ~WLAN_STA_PENDING_POLL;
                 spin_unlock(&ap->sta_table_lock);
         } else {
-                PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
-                       " did not ACK activity poll frame\n",
-                       ap->local->dev->name,
-                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
+                PDEBUG(DEBUG_AP,
+                       "%s: STA %pM did not ACK activity poll frame\n",
+                       ap->local->dev->name, hdr->addr1);
         }
 
  fail:
@@ -1002,7 +989,6 @@ static int prism2_sta_proc_read(char *page, char **start, off_t off,
         char *p = page;
         struct sta_info *sta = (struct sta_info *) data;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         /* FIX: possible race condition.. the STA data could have just expired,
          * but proc entry was still here so that the read could have started;
@@ -1013,11 +999,11 @@ static int prism2_sta_proc_read(char *page, char **start, off_t off,
                 return 0;
         }
 
-        p += sprintf(p, "%s=%s\nusers=%d\naid=%d\n"
+        p += sprintf(p, "%s=%pM\nusers=%d\naid=%d\n"
                      "flags=0x%04x%s%s%s%s%s%s%s\n"
                      "capability=0x%02x\nlisten_interval=%d\nsupported_rates=",
                      sta->ap ? "AP" : "STA",
-                     print_mac(mac, sta->addr), atomic_read(&sta->users), sta->aid,
+                     sta->addr, atomic_read(&sta->users), sta->aid,
                      sta->flags,
                      sta->flags & WLAN_STA_AUTH ? " AUTH" : "",
                      sta->flags & WLAN_STA_ASSOC ? " ASSOC" : "",
@@ -1078,7 +1064,6 @@ static void handle_add_proc_queue(struct work_struct *work)
         struct sta_info *sta;
         char name[20];
         struct add_sta_proc_data *entry, *prev;
-        DECLARE_MAC_BUF(mac);
 
         entry = ap->add_sta_proc_entries;
         ap->add_sta_proc_entries = NULL;
@@ -1091,7 +1076,7 @@ static void handle_add_proc_queue(struct work_struct *work)
                 spin_unlock_bh(&ap->sta_table_lock);
 
                 if (sta) {
-                        sprintf(name, "%s", print_mac(mac, sta->addr));
+                        sprintf(name, "%pM", sta->addr);
                         sta->proc = create_proc_read_entry(
                                 name, 0, ap->proc,
                                 prism2_sta_proc_read, sta);
@@ -1318,9 +1303,7 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
 
         if (len < 6) {
                 PDEBUG(DEBUG_AP, "%s: handle_authen - too short payload "
-                       "(len=%d) from " MAC_FMT "\n", dev->name, len,
-                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
+                       "(len=%d) from %pM\n", dev->name, len, hdr->addr2);
                 return;
         }
 
@@ -1385,10 +1368,8 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
                 if (time_after(jiffies, sta->u.ap.last_beacon +
                                (10 * sta->listen_interval * HZ) / 1024)) {
                         PDEBUG(DEBUG_AP, "%s: no beacons received for a while,"
-                               " assuming AP " MAC_FMT " is now STA\n",
-                               dev->name,
-                               sta->addr[0], sta->addr[1], sta->addr[2],
-                               sta->addr[3], sta->addr[4], sta->addr[5]);
+                               " assuming AP %pM is now STA\n",
+                               dev->name, sta->addr);
                         sta->ap = 0;
                         sta->flags = 0;
                         sta->u.sta.challenge = NULL;
@@ -1503,11 +1484,9 @@ static void handle_authen(local_info_t *local, struct sk_buff *skb,
         }
 
         if (resp) {
-                PDEBUG(DEBUG_AP, "%s: " MAC_FMT " auth (alg=%d "
+                PDEBUG(DEBUG_AP, "%s: %pM auth (alg=%d "
                        "trans#=%d stat=%d len=%d fc=%04x) ==> %d (%s)\n",
-                       dev->name,
-                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+                       dev->name, hdr->addr2,
                        auth_alg, auth_transaction, status_code, len,
                        fc, resp, txt);
         }
@@ -1533,10 +1512,8 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
 
         if (len < (reassoc ? 10 : 4)) {
                 PDEBUG(DEBUG_AP, "%s: handle_assoc - too short payload "
-                       "(len=%d, reassoc=%d) from " MAC_FMT "\n",
-                       dev->name, len, reassoc,
-                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5]);
+                       "(len=%d, reassoc=%d) from %pM\n",
+                       dev->name, len, reassoc, hdr->addr2);
                 return;
         }
 
@@ -1613,12 +1590,9 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
                 }
 
                 if (left > 0) {
-                        PDEBUG(DEBUG_AP, "%s: assoc from " MAC_FMT
+                        PDEBUG(DEBUG_AP, "%s: assoc from %pM"
                                " with extra data (%d bytes) [",
-                               dev->name,
-                               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
-                               left);
+                               dev->name, hdr->addr2, left);
                         while (left > 0) {
                                 PDEBUG2(DEBUG_AP, "<%02x>", *u);
                                 u++; left--;
@@ -1717,14 +1691,12 @@ static void handle_assoc(local_info_t *local, struct sk_buff *skb,
         }
 
 #if 0
-        PDEBUG(DEBUG_AP, "%s: " MAC_FMT" %sassoc (len=%d "
-               "prev_ap=" MAC_FMT") => %d(%d) (%s)\n",
+        PDEBUG(DEBUG_AP, "%s: %pM %sassoc (len=%d "
+               "prev_ap=%pM) => %d(%d) (%s)\n",
                dev->name,
-               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+               hdr->addr2,
                reassoc ? "re" : "", len,
-               prev_ap[0], prev_ap[1], prev_ap[2],
-               prev_ap[3], prev_ap[4], prev_ap[5],
+               prev_ap,
                resp, send_deauth, txt);
 #endif
 }
@@ -1741,7 +1713,6 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
         u16 reason_code;
         __le16 *pos;
         struct sta_info *sta = NULL;
-        DECLARE_MAC_BUF(mac);
 
         len = skb->len - IEEE80211_MGMT_HDR_LEN;
 
@@ -1753,10 +1724,8 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
         pos = (__le16 *) body;
         reason_code = le16_to_cpu(*pos);
 
-        PDEBUG(DEBUG_AP, "%s: deauthentication: " MAC_FMT " len=%d, "
-               "reason_code=%d\n", dev->name,
-               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+        PDEBUG(DEBUG_AP, "%s: deauthentication: %pM len=%d, "
+               "reason_code=%d\n", dev->name, hdr->addr2,
                len, reason_code);
 
         spin_lock_bh(&local->ap->sta_table_lock);
@@ -1768,11 +1737,9 @@ static void handle_deauth(local_info_t *local, struct sk_buff *skb,
         }
         spin_unlock_bh(&local->ap->sta_table_lock);
         if (sta == NULL) {
-                printk("%s: deauthentication from " MAC_FMT ", "
+                printk("%s: deauthentication from %pM, "
                "reason_code=%d, but STA not authenticated\n", dev->name,
-                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
-                       reason_code);
+                       hdr->addr2, reason_code);
         }
 }
 
@@ -1799,10 +1766,8 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
         pos = (__le16 *) body;
         reason_code = le16_to_cpu(*pos);
 
-        PDEBUG(DEBUG_AP, "%s: disassociation: " MAC_FMT " len=%d, "
-               "reason_code=%d\n", dev->name,
-               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+        PDEBUG(DEBUG_AP, "%s: disassociation: %pM len=%d, "
+               "reason_code=%d\n", dev->name, hdr->addr2,
                len, reason_code);
 
         spin_lock_bh(&local->ap->sta_table_lock);
@@ -1814,12 +1779,9 @@ static void handle_disassoc(local_info_t *local, struct sk_buff *skb,
         }
         spin_unlock_bh(&local->ap->sta_table_lock);
         if (sta == NULL) {
-                printk("%s: disassociation from " MAC_FMT ", "
+                printk("%s: disassociation from %pM, "
                        "reason_code=%d, but STA not authenticated\n",
-                       dev->name,
-                       hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-                       hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
-                       reason_code);
+                       dev->name, hdr->addr2, reason_code);
         }
 }
 
@@ -1909,19 +1871,14 @@ static void handle_pspoll(local_info_t *local,
         u16 aid;
         struct sk_buff *skb;
 
-        PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=" MAC_FMT
-               ", TA=" MAC_FMT " PWRMGT=%d\n",
-               hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-               hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
-               hdr->addr2[0], hdr->addr2[1], hdr->addr2[2],
-               hdr->addr2[3], hdr->addr2[4], hdr->addr2[5],
+        PDEBUG(DEBUG_PS2, "handle_pspoll: BSSID=%pM, TA=%pM PWRMGT=%d\n",
+               hdr->addr1, hdr->addr2,
                !!(le16_to_cpu(hdr->frame_ctl) & IEEE80211_FCTL_PM));
 
         if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_pspoll - addr1(BSSID)=" MAC_FMT
-                       " not own MAC\n",
-                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
+                PDEBUG(DEBUG_AP,
+                       "handle_pspoll - addr1(BSSID)=%pM not own MAC\n",
+                       hdr->addr1);
                 return;
         }
 
@@ -2007,11 +1964,10 @@ static void handle_wds_oper_queue(struct work_struct *work)
 
         while (entry) {
                 PDEBUG(DEBUG_AP, "%s: %s automatic WDS connection "
-                       "to AP " MAC_FMT "\n",
+                       "to AP %pM\n",
                        local->dev->name,
                        entry->type == WDS_ADD ? "adding" : "removing",
-                       entry->addr[0], entry->addr[1], entry->addr[2],
-                       entry->addr[3], entry->addr[4], entry->addr[5]);
+                       entry->addr);
                 if (entry->type == WDS_ADD)
                         prism2_wds_add(local, entry->addr, 0);
                 else if (entry->type == WDS_DEL)
@@ -2215,10 +2171,8 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
                 }
 
                 if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
-                        PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)="
-                               MAC_FMT " not own MAC\n",
-                               hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                               hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
+                        PDEBUG(DEBUG_AP, "handle_ap_item - addr1(BSSID)=%pM"
+                               " not own MAC\n", hdr->addr1);
                         goto done;
                 }
 
@@ -2254,18 +2208,14 @@ static void handle_ap_item(local_info_t *local, struct sk_buff *skb,
         }
 
         if (memcmp(hdr->addr1, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=" MAC_FMT
-                       " not own MAC\n",
-                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr1(DA)=%pM"
+                       " not own MAC\n", hdr->addr1);
                 goto done;
         }
 
         if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN)) {
-                PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=" MAC_FMT
-                       " not own MAC\n",
-                       hdr->addr3[0], hdr->addr3[1], hdr->addr3[2],
-                       hdr->addr3[3], hdr->addr3[4], hdr->addr3[5]);
+                PDEBUG(DEBUG_AP, "handle_ap_item - addr3(BSSID)=%pM"
+                       " not own MAC\n", hdr->addr3);
                 goto done;
         }
 
@@ -2366,10 +2316,9 @@ static void schedule_packet_send(local_info_t *local, struct sta_info *sta)
         memcpy(hdr->addr2, sta->addr, ETH_ALEN);
         hdr->duration_id = cpu_to_le16(sta->aid | BIT(15) | BIT(14));
 
-        PDEBUG(DEBUG_PS2, "%s: Scheduling buffered packet delivery for STA "
-               MAC_FMT "\n", local->dev->name,
-               sta->addr[0], sta->addr[1], sta->addr[2],
-               sta->addr[3], sta->addr[4], sta->addr[5]);
+        PDEBUG(DEBUG_PS2,
+               "%s: Scheduling buffered packet delivery for STA %pM\n",
+               local->dev->name, sta->addr);
 
         skb->dev = local->dev;
 
@@ -2723,12 +2672,8 @@ static int ap_update_sta_tx_rate(struct sta_info *sta, struct net_device *dev)
                         case 3: sta->tx_rate = 110; break;
                         default: sta->tx_rate = 0; break;
                         }
-                        PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
-                               " TX rate raised to %d\n",
-                               dev->name,
-                               sta->addr[0], sta->addr[1], sta->addr[2],
-                               sta->addr[3], sta->addr[4], sta->addr[5],
-                               sta->tx_rate);
+                        PDEBUG(DEBUG_AP, "%s: STA %pM TX rate raised to %d\n",
+                               dev->name, sta->addr, sta->tx_rate);
                 }
                 sta->tx_since_last_failure = 0;
         }
@@ -2781,9 +2726,7 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
                  * print out any errors here. */
                 if (net_ratelimit()) {
                         printk(KERN_DEBUG "AP: drop packet to non-associated "
-                               "STA " MAC_FMT "\n",
-                               hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                               hdr->addr1[3], hdr->addr1[4], hdr->addr1[5]);
+                               "STA %pM\n", hdr->addr1);
                 }
 #endif
                 local->ap->tx_drop_nonassoc++;
@@ -2821,11 +2764,9 @@ ap_tx_ret hostap_handle_sta_tx(local_info_t *local, struct hostap_tx_data *tx)
         }
 
         if (skb_queue_len(&sta->tx_buf) >= STA_MAX_TX_BUFFER) {
-                PDEBUG(DEBUG_PS, "%s: No more space in STA (" MAC_FMT
-                       ")'s PS mode buffer\n",
-                       local->dev->name,
-                       sta->addr[0], sta->addr[1], sta->addr[2],
-                       sta->addr[3], sta->addr[4], sta->addr[5]);
+                PDEBUG(DEBUG_PS, "%s: No more space in STA (%pM)'s"
+                       "PS mode buffer\n",
+                       local->dev->name, sta->addr);
                 /* Make sure that TIM is set for the station (it might not be
                  * after AP wlan hw reset). */
                 /* FIX: should fix hw reset to restore bits based on STA
@@ -2897,12 +2838,9 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
         sta = ap_get_sta(local->ap, hdr->addr1);
         if (!sta) {
                 spin_unlock(&local->ap->sta_table_lock);
-                PDEBUG(DEBUG_AP, "%s: Could not find STA " MAC_FMT
+                PDEBUG(DEBUG_AP, "%s: Could not find STA %pM"
                        " for this TX error (@%lu)\n",
-                       local->dev->name,
-                       hdr->addr1[0], hdr->addr1[1], hdr->addr1[2],
-                       hdr->addr1[3], hdr->addr1[4], hdr->addr1[5],
-                       jiffies);
+                       local->dev->name, hdr->addr1, jiffies);
                 return;
         }
 
@@ -2929,12 +2867,9 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
                         case 3: sta->tx_rate = 110; break;
                         default: sta->tx_rate = 0; break;
                         }
-                        PDEBUG(DEBUG_AP, "%s: STA " MAC_FMT
-                               " TX rate lowered to %d\n",
-                               local->dev->name,
-                               sta->addr[0], sta->addr[1], sta->addr[2],
-                               sta->addr[3], sta->addr[4], sta->addr[5],
-                               sta->tx_rate);
+                        PDEBUG(DEBUG_AP,
+                               "%s: STA %pM TX rate lowered to %d\n",
+                               local->dev->name, sta->addr, sta->tx_rate);
                 }
                 sta->tx_consecutive_exc = 0;
         }
@@ -2945,17 +2880,16 @@ void hostap_handle_sta_tx_exc(local_info_t *local, struct sk_buff *skb)
 static void hostap_update_sta_ps2(local_info_t *local, struct sta_info *sta,
                                   int pwrmgt, int type, int stype)
 {
-        DECLARE_MAC_BUF(mac);
         if (pwrmgt && !(sta->flags & WLAN_STA_PS)) {
                 sta->flags |= WLAN_STA_PS;
-                PDEBUG(DEBUG_PS2, "STA %s changed to use PS "
+                PDEBUG(DEBUG_PS2, "STA %pM changed to use PS "
                        "mode (type=0x%02X, stype=0x%02X)\n",
-                       print_mac(mac, sta->addr), type >> 2, stype >> 4);
+                       sta->addr, type >> 2, stype >> 4);
         } else if (!pwrmgt && (sta->flags & WLAN_STA_PS)) {
                 sta->flags &= ~WLAN_STA_PS;
-                PDEBUG(DEBUG_PS2, "STA %s changed to not use "
+                PDEBUG(DEBUG_PS2, "STA %pM changed to not use "
                        "PS mode (type=0x%02X, stype=0x%02X)\n",
-                       print_mac(mac, sta->addr), type >> 2, stype >> 4);
+                       sta->addr, type >> 2, stype >> 4);
                 if (type != IEEE80211_FTYPE_CTL ||
                     stype != IEEE80211_STYPE_PSPOLL)
                         schedule_packet_send(local, sta);
@@ -3029,13 +2963,9 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
 #ifndef PRISM2_NO_KERNEL_IEEE80211_MGMT
                         } else {
                                 printk(KERN_DEBUG "%s: dropped received packet"
-                                       " from non-associated STA "
-                                       MAC_FMT
+                                       " from non-associated STA %pM"
                                        " (type=0x%02x, subtype=0x%02x)\n",
-                                       dev->name,
-                                       hdr->addr2[0], hdr->addr2[1],
-                                       hdr->addr2[2], hdr->addr2[3],
-                                       hdr->addr2[4], hdr->addr2[5],
+                                       dev->name, hdr->addr2,
                                        type >> 2, stype >> 4);
                                 hostap_rx(dev, skb, rx_stats);
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
@@ -3068,13 +2998,9 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
                          * after being unavailable for some time. Speed up
                          * re-association by informing the station about it not
                          * being associated. */
-                        printk(KERN_DEBUG "%s: rejected received nullfunc "
-                               "frame without ToDS from not associated STA "
-                               MAC_FMT "\n",
-                               dev->name,
-                               hdr->addr2[0], hdr->addr2[1],
-                               hdr->addr2[2], hdr->addr2[3],
-                               hdr->addr2[4], hdr->addr2[5]);
+                        printk(KERN_DEBUG "%s: rejected received nullfunc frame"
+                               " without ToDS from not associated STA %pM\n",
+                               dev->name, hdr->addr2);
                         hostap_rx(dev, skb, rx_stats);
 #endif /* PRISM2_NO_KERNEL_IEEE80211_MGMT */
                 }
@@ -3090,13 +3016,10 @@ ap_rx_ret hostap_handle_sta_rx(local_info_t *local, struct net_device *dev,
                  * broadcast frame from an IBSS network. Drop it silently.
                  * If BSSID is own, report the dropping of this frame. */
                 if (memcmp(hdr->addr3, dev->dev_addr, ETH_ALEN) == 0) {
-                        printk(KERN_DEBUG "%s: dropped received packet from "
-                               MAC_FMT " with no ToDS flag "
+                        printk(KERN_DEBUG "%s: dropped received packet from %pM"
+                               " with no ToDS flag "
                                "(type=0x%02x, subtype=0x%02x)\n", dev->name,
-                               hdr->addr2[0], hdr->addr2[1],
-                               hdr->addr2[2], hdr->addr2[3],
-                               hdr->addr2[4], hdr->addr2[5],
-                               type >> 2, stype >> 4);
+                               hdr->addr2, type >> 2, stype >> 4);
                         hostap_dump_rx_80211(dev->name, skb, rx_stats);
                 }
                 ret = AP_RX_DROP;
diff --git a/drivers/net/wireless/hostap/hostap_hw.c b/drivers/net/wireless/hostap/hostap_hw.c
index 3153fe9d7ce0..fd7f7ceeac46 100644
--- a/drivers/net/wireless/hostap/hostap_hw.c
+++ b/drivers/net/wireless/hostap/hostap_hw.c
@@ -2335,10 +2335,6 @@ static void prism2_txexc(local_info_t *local)
         int show_dump, res;
         char *payload = NULL;
         struct hfa384x_tx_frame txdesc;
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
-        DECLARE_MAC_BUF(mac3);
-        DECLARE_MAC_BUF(mac4);
 
         show_dump = local->frame_dump & PRISM2_DUMP_TXEXC_HDR;
         local->stats.tx_errors++;
@@ -2404,9 +2400,9 @@ static void prism2_txexc(local_info_t *local)
                WLAN_FC_GET_STYPE(fc) >> 4,
                fc & IEEE80211_FCTL_TODS ? " ToDS" : "",
                fc & IEEE80211_FCTL_FROMDS ? " FromDS" : "");
-        PDEBUG(DEBUG_EXTRA, "   A1=%s A2=%s A3=%s A4=%s\n",
-               print_mac(mac, txdesc.addr1), print_mac(mac2, txdesc.addr2),
-               print_mac(mac3, txdesc.addr3), print_mac(mac4, txdesc.addr4));
+        PDEBUG(DEBUG_EXTRA, "   A1=%pM A2=%pM A3=%pM A4=%pM\n",
+               txdesc.addr1, txdesc.addr2,
+               txdesc.addr3, txdesc.addr4);
 }
 
 
diff --git a/drivers/net/wireless/hostap/hostap_info.c b/drivers/net/wireless/hostap/hostap_info.c
index 7cd3fb79230e..99b4cf41edf2 100644
--- a/drivers/net/wireless/hostap/hostap_info.c
+++ b/drivers/net/wireless/hostap/hostap_info.c
@@ -166,7 +166,6 @@ static void prism2_host_roaming(local_info_t *local)
         struct hfa384x_hostscan_result *selected, *entry;
         int i;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         if (local->last_join_time &&
             time_before(jiffies, local->last_join_time + 10 * HZ)) {
@@ -199,9 +198,8 @@ static void prism2_host_roaming(local_info_t *local)
             local->preferred_ap[2] || local->preferred_ap[3] ||
             local->preferred_ap[4] || local->preferred_ap[5]) {
                 /* Try to find preferred AP */
-                PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID "
-                       "%s\n",
-                       dev->name, print_mac(mac, local->preferred_ap));
+                PDEBUG(DEBUG_EXTRA, "%s: Preferred AP BSSID %pM\n",
+                       dev->name, local->preferred_ap);
                 for (i = 0; i < local->last_scan_results_count; i++) {
                         entry = &local->last_scan_results[i];
                         if (memcmp(local->preferred_ap, entry->bssid, 6) == 0)
@@ -218,9 +216,9 @@ static void prism2_host_roaming(local_info_t *local)
         req.channel = selected->chid;
         spin_unlock_irqrestore(&local->lock, flags);
 
-        PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=%s"
+        PDEBUG(DEBUG_EXTRA, "%s: JoinRequest: BSSID=%pM"
                " channel=%d\n",
-               dev->name, print_mac(mac, req.bssid), le16_to_cpu(req.channel));
+               dev->name, req.bssid, le16_to_cpu(req.channel));
         if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
                                  sizeof(req))) {
                 printk(KERN_DEBUG "%s: JoinRequest failed\n", dev->name);
@@ -413,7 +411,6 @@ static void handle_info_queue_linkstatus(local_info_t *local)
         int val = local->prev_link_status;
         int connected;
         union iwreq_data wrqu;
-        DECLARE_MAC_BUF(mac);
 
         connected =
                 val == HFA384X_LINKSTATUS_CONNECTED ||
@@ -425,10 +422,9 @@ static void handle_info_queue_linkstatus(local_info_t *local)
                 printk(KERN_DEBUG "%s: could not read CURRENTBSSID after "
                        "LinkStatus event\n", local->dev->name);
         } else {
-                PDEBUG(DEBUG_EXTRA, "%s: LinkStatus: BSSID="
-                       "%s\n",
+                PDEBUG(DEBUG_EXTRA, "%s: LinkStatus: BSSID=%pM\n",
                        local->dev->name,
-                       print_mac(mac, (unsigned char *) local->bssid));
+                       (unsigned char *) local->bssid);
                 if (local->wds_type & HOSTAP_WDS_AP_CLIENT)
                         hostap_add_sta(local->ap, local->bssid);
         }
diff --git a/drivers/net/wireless/hostap/hostap_ioctl.c b/drivers/net/wireless/hostap/hostap_ioctl.c
index 3f8b1d7036e5..2318c5df7a08 100644
--- a/drivers/net/wireless/hostap/hostap_ioctl.c
+++ b/drivers/net/wireless/hostap/hostap_ioctl.c
@@ -664,7 +664,6 @@ static int hostap_join_ap(struct net_device *dev)
         unsigned long flags;
         int i;
         struct hfa384x_hostscan_result *entry;
-        DECLARE_MAC_BUF(mac);
 
         iface = netdev_priv(dev);
         local = iface->local;
@@ -686,14 +685,13 @@ static int hostap_join_ap(struct net_device *dev)
 
         if (local->func->set_rid(dev, HFA384X_RID_JOINREQUEST, &req,
                                  sizeof(req))) {
-                printk(KERN_DEBUG "%s: JoinRequest %s"
-                       " failed\n",
-                       dev->name, print_mac(mac, local->preferred_ap));
+                printk(KERN_DEBUG "%s: JoinRequest %pM failed\n",
+                       dev->name, local->preferred_ap);
                 return -1;
         }
 
-        printk(KERN_DEBUG "%s: Trying to join BSSID %s\n",
-               dev->name, print_mac(mac, local->preferred_ap));
+        printk(KERN_DEBUG "%s: Trying to join BSSID %pM\n",
+               dev->name, local->preferred_ap);
 
         return 0;
 }
@@ -3701,10 +3699,8 @@ static int prism2_ioctl_set_assoc_ap_addr(local_info_t *local,
                                           struct prism2_hostapd_param *param,
                                           int param_len)
 {
-        DECLARE_MAC_BUF(mac);
-        printk(KERN_DEBUG "%ssta: associated as client with AP "
-               "%s\n",
-               local->dev->name, print_mac(mac, param->sta_addr));
+        printk(KERN_DEBUG "%ssta: associated as client with AP %pM\n",
+               local->dev->name, param->sta_addr);
         memcpy(local->assoc_ap_addr, param->sta_addr, ETH_ALEN);
         return 0;
 }
diff --git a/drivers/net/wireless/hostap/hostap_main.c b/drivers/net/wireless/hostap/hostap_main.c
index 756ab56c1f40..4c36eb2fafd1 100644
--- a/drivers/net/wireless/hostap/hostap_main.c
+++ b/drivers/net/wireless/hostap/hostap_main.c
@@ -530,10 +530,6 @@ int hostap_set_auth_algs(local_info_t *local)
 void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
 {
         u16 status, fc;
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
-        DECLARE_MAC_BUF(mac3);
-        DECLARE_MAC_BUF(mac4);
 
         status = __le16_to_cpu(rx->status);
 
@@ -552,12 +548,11 @@ void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
                fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
                fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
 
-        printk(KERN_DEBUG "   A1=%s A2=%s A3=%s A4=%s\n",
-               print_mac(mac, rx->addr1), print_mac(mac2, rx->addr2),
-               print_mac(mac3, rx->addr3), print_mac(mac4, rx->addr4));
+        printk(KERN_DEBUG "   A1=%pM A2=%pM A3=%pM A4=%pM\n",
+               rx->addr1, rx->addr2, rx->addr3, rx->addr4);
 
-        printk(KERN_DEBUG "   dst=%s src=%s len=%d\n",
-               print_mac(mac, rx->dst_addr), print_mac(mac2, rx->src_addr),
+        printk(KERN_DEBUG "   dst=%pM src=%pM len=%d\n",
+               rx->dst_addr, rx->src_addr,
                __be16_to_cpu(rx->len));
 }
 
@@ -565,10 +560,6 @@ void hostap_dump_rx_header(const char *name, const struct hfa384x_rx_frame *rx)
 void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
 {
         u16 fc;
-        DECLARE_MAC_BUF(mac);
-        DECLARE_MAC_BUF(mac2);
-        DECLARE_MAC_BUF(mac3);
-        DECLARE_MAC_BUF(mac4);
 
         printk(KERN_DEBUG "%s: TX status=0x%04x retry_count=%d tx_rate=%d "
                "tx_control=0x%04x; jiffies=%ld\n",
@@ -584,12 +575,11 @@ void hostap_dump_tx_header(const char *name, const struct hfa384x_tx_frame *tx)
                fc & IEEE80211_FCTL_TODS ? " [ToDS]" : "",
                fc & IEEE80211_FCTL_FROMDS ? " [FromDS]" : "");
 
-        printk(KERN_DEBUG "   A1=%s A2=%s A3=%s A4=%s\n",
-               print_mac(mac, tx->addr1), print_mac(mac2, tx->addr2),
-               print_mac(mac3, tx->addr3), print_mac(mac4, tx->addr4));
+        printk(KERN_DEBUG "   A1=%pM A2=%pM A3=%pM A4=%pM\n",
+               tx->addr1, tx->addr2, tx->addr3, tx->addr4);
 
-        printk(KERN_DEBUG "   dst=%s src=%s len=%d\n",
-               print_mac(mac, tx->dst_addr), print_mac(mac2, tx->src_addr),
+        printk(KERN_DEBUG "   dst=%pM src=%pM len=%d\n",
+               tx->dst_addr, tx->src_addr,
                __be16_to_cpu(tx->len));
 }
 
diff --git a/drivers/net/wireless/hostap/hostap_pci.c b/drivers/net/wireless/hostap/hostap_pci.c
index 3a874fc621d3..8fdd41f4b4f2 100644
--- a/drivers/net/wireless/hostap/hostap_pci.c
+++ b/drivers/net/wireless/hostap/hostap_pci.c
@@ -312,7 +312,7 @@ static int prism2_pci_probe(struct pci_dev *pdev,
                 goto err_out_disable;
         }
 
-        mem = ioremap(phymem, pci_resource_len(pdev, 0));
+        mem = pci_ioremap_bar(pdev, 0);
         if (mem == NULL) {
                 printk(KERN_ERR "prism2: Cannot remap PCI memory region\n") ;
                 goto fail;
diff --git a/drivers/net/wireless/hostap/hostap_proc.c b/drivers/net/wireless/hostap/hostap_proc.c
index b03536008ad9..ae7d3caf3dae 100644
--- a/drivers/net/wireless/hostap/hostap_proc.c
+++ b/drivers/net/wireless/hostap/hostap_proc.c
@@ -106,7 +106,6 @@ static int prism2_wds_proc_read(char *page, char **start, off_t off,
         local_info_t *local = (local_info_t *) data;
         struct list_head *ptr;
         struct hostap_interface *iface;
-        DECLARE_MAC_BUF(mac);
 
         if (off > PROC_LIMIT) {
                 *eof = 1;
@@ -118,9 +117,9 @@ static int prism2_wds_proc_read(char *page, char **start, off_t off,
                 iface = list_entry(ptr, struct hostap_interface, list);
                 if (iface->type != HOSTAP_INTERFACE_WDS)
                         continue;
-                p += sprintf(p, "%s\t%s\n",
+                p += sprintf(p, "%s\t%pM\n",
                              iface->dev->name,
-                             print_mac(mac, iface->u.wds.remote_addr));
+                             iface->u.wds.remote_addr);
                 if ((p - page) > PROC_LIMIT) {
                         printk(KERN_DEBUG "%s: wds proc did not fit\n",
                                local->dev->name);
@@ -148,7 +147,6 @@ static int prism2_bss_list_proc_read(char *page, char **start, off_t off,
         struct list_head *ptr;
         struct hostap_bss_info *bss;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         if (off > PROC_LIMIT) {
                 *eof = 1;
@@ -160,8 +158,8 @@ static int prism2_bss_list_proc_read(char *page, char **start, off_t off,
         spin_lock_bh(&local->lock);
         list_for_each(ptr, &local->bss_list) {
                 bss = list_entry(ptr, struct hostap_bss_info, list);
-                p += sprintf(p, "%s\t%lu\t%u\t0x%x\t",
-                             print_mac(mac, bss->bssid), bss->last_update,
+                p += sprintf(p, "%pM\t%lu\t%u\t0x%x\t",
+                             bss->bssid, bss->last_update,
                              bss->count, bss->capab_info);
                 for (i = 0; i < bss->ssid_len; i++) {
                         p += sprintf(p, "%c",
@@ -314,7 +312,6 @@ static int prism2_scan_results_proc_read(char *page, char **start, off_t off,
         int entry, i, len, total = 0;
         struct hfa384x_hostscan_result *scanres;
         u8 *pos;
-        DECLARE_MAC_BUF(mac);
 
         p += sprintf(p, "CHID ANL SL BcnInt Capab Rate BSSID ATIM SupRates "
                      "SSID\n");
@@ -332,14 +329,14 @@ static int prism2_scan_results_proc_read(char *page, char **start, off_t off,
                 if ((p - page) > (PAGE_SIZE - 200))
                         break;
 
-                p += sprintf(p, "%d %d %d %d 0x%02x %d %s %d ",
+                p += sprintf(p, "%d %d %d %d 0x%02x %d %pM %d ",
                              le16_to_cpu(scanres->chid),
                              (s16) le16_to_cpu(scanres->anl),
                              (s16) le16_to_cpu(scanres->sl),
                              le16_to_cpu(scanres->beacon_interval),
                              le16_to_cpu(scanres->capability),
                              le16_to_cpu(scanres->rate),
-                             print_mac(mac, scanres->bssid),
+                             scanres->bssid,
                              le16_to_cpu(scanres->atim));
 
                 pos = scanres->sup_rates;
diff --git a/drivers/net/wireless/ipw2100.c b/drivers/net/wireless/ipw2100.c
index bca74811bc7f..6e988d2486a7 100644
--- a/drivers/net/wireless/ipw2100.c
+++ b/drivers/net/wireless/ipw2100.c
@@ -1914,7 +1914,6 @@ 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
@@ -1975,10 +1974,9 @@ static void isr_indicate_associated(struct ipw2100_priv *priv, u32 status)
                 break;
         }
 
-        IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID="
-                       "%s)\n",
+        IPW_DEBUG_INFO("%s: Associated with '%s' at %s, channel %d (BSSID=%pM)\n",
                        priv->net_dev->name, escape_essid(essid, essid_len),
-                       txratename, chan, print_mac(mac, bssid));
+                       txratename, chan, bssid);
 
         /* now we copy read ssid into dev */
         if (!(priv->config & CFG_STATIC_ESSID)) {
@@ -2046,12 +2044,10 @@ 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' %s \n",
+                  "disassociated: '%s' %pM \n",
                   escape_essid(priv->essid, priv->essid_len),
-                  print_mac(mac, priv->bssid));
+                  priv->bssid);
 
         priv->status &= ~(STATUS_ASSOCIATED | STATUS_ASSOCIATING);
 
@@ -4058,7 +4054,6 @@ 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;
@@ -4086,7 +4081,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:   %s\n", print_mac(mac, bssid));
+        out += sprintf(out, "BSSID:   %pM\n", bssid);
         out += sprintf(out, "Channel: %d\n", chan);
 
         return out - buf;
@@ -4662,7 +4657,6 @@ static int ipw2100_read_mac_address(struct ipw2100_priv *priv)
 {
         u32 length = ETH_ALEN;
         u8 addr[ETH_ALEN];
-        DECLARE_MAC_BUF(mac);
 
         int err;
 
@@ -4673,8 +4667,7 @@ static int ipw2100_read_mac_address(struct ipw2100_priv *priv)
         }
 
         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));
+        IPW_DEBUG_INFO("card MAC is %pM\n", priv->net_dev->dev_addr);
 
         return 0;
 }
@@ -5053,10 +5046,8 @@ 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: %s\n",
-                             print_mac(mac, bssid));
+                IPW_DEBUG_HC("MANDATORY_BSSID: %pM\n", bssid);
         else
                 IPW_DEBUG_HC("MANDATORY_BSSID: <clear>\n");
 #endif
@@ -6905,7 +6896,6 @@ 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)
@@ -6931,8 +6921,7 @@ 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 -> %s\n",
-                     print_mac(mac, wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("SET BSSID -> %pM\n", wrqu->ap_addr.sa_data);
 
       done:
         mutex_unlock(&priv->action_mutex);
@@ -6948,7 +6937,6 @@ 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 */
@@ -6958,8 +6946,7 @@ 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: %s\n",
-                     print_mac(mac, wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("Getting WAP BSSID: %pM\n", wrqu->ap_addr.sa_data);
         return 0;
 }
 
diff --git a/drivers/net/wireless/ipw2200.c b/drivers/net/wireless/ipw2200.c
index dcce3542d5a7..13633d8274a3 100644
--- a/drivers/net/wireless/ipw2200.c
+++ b/drivers/net/wireless/ipw2200.c
@@ -2265,8 +2265,8 @@ static int ipw_send_adapter_address(struct ipw_priv *priv, u8 * mac)
                 return -1;
         }
 
-        IPW_DEBUG_INFO("%s: Setting MAC to %s\n",
-                       priv->net_dev->name, print_mac(mac, mac));
+        IPW_DEBUG_INFO("%s: Setting MAC to %pM\n",
+                       priv->net_dev->name, mac);
 
         return ipw_send_cmd_pdu(priv, IPW_CMD_ADAPTER_ADDRESS, ETH_ALEN, mac);
 }
@@ -3812,7 +3812,6 @@ 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)) {
@@ -3829,7 +3828,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: %s\n", print_mac(mac, bssid));
+        IPW_DEBUG_SCAN("Adding AdHoc station: %pM\n", bssid);
 
         entry.reserved = 0;
         entry.support_mode = 0;
@@ -3856,7 +3855,6 @@ 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");
@@ -3869,9 +3867,9 @@ static void ipw_send_disassociate(struct ipw_priv *priv, int quiet)
                 return;
         }
 
-        IPW_DEBUG_ASSOC("Disassocation attempt from %s "
+        IPW_DEBUG_ASSOC("Disassocation attempt from %pM "
                         "on channel %d.\n",
-                        print_mac(mac, priv->assoc_request.bssid),
+                        priv->assoc_request.bssid,
                         priv->assoc_request.channel);
 
         priv->status &= ~(STATUS_ASSOCIATING | STATUS_ASSOCIATED);
@@ -4397,7 +4395,6 @@ static void handle_scan_event(struct ipw_priv *priv)
 static void ipw_rx_notification(struct ipw_priv *priv,
                                        struct ipw_rx_notification *notif)
 {
-        DECLARE_MAC_BUF(mac);
         u16 size = le16_to_cpu(notif->size);
         notif->size = le16_to_cpu(notif->size);
 
@@ -4411,11 +4408,10 @@ 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' %s"
-                                                  " \n",
+                                                  "associated: '%s' %pM \n",
                                                   escape_essid(priv->essid,
                                                                priv->essid_len),
-                                                  print_mac(mac, priv->bssid));
+                                                  priv->bssid);
 
                                         switch (priv->ieee->iw_mode) {
                                         case IW_MODE_INFRA:
@@ -4492,13 +4488,13 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                                           IPW_DL_STATE |
                                                           IPW_DL_ASSOC,
                                                           "deauthenticated: '%s' "
-                                                          "%s"
+                                                          "%pM"
                                                           ": (0x%04X) - %s \n",
                                                           escape_essid(priv->
                                                                        essid,
                                                                        priv->
                                                                        essid_len),
-                                                          print_mac(mac, priv->bssid),
+                                                          priv->bssid,
                                                           le16_to_cpu(auth->status),
                                                           ipw_get_status_code
                                                           (le16_to_cpu
@@ -4515,11 +4511,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
 
                                         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                   IPW_DL_ASSOC,
-                                                  "authenticated: '%s' %s"
-                                                  "\n",
+                                                  "authenticated: '%s' %pM\n",
                                                   escape_essid(priv->essid,
                                                                priv->essid_len),
-                                                  print_mac(mac, priv->bssid));
+                                                  priv->bssid);
                                         break;
                                 }
 
@@ -4544,11 +4539,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
 
                                         IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                                   IPW_DL_ASSOC,
-                                                  "disassociated: '%s' %s"
-                                                  " \n",
+                                                  "disassociated: '%s' %pM \n",
                                                   escape_essid(priv->essid,
                                                                priv->essid_len),
-                                                  print_mac(mac, priv->bssid));
+                                                  priv->bssid);
 
                                         priv->status &=
                                             ~(STATUS_DISASSOCIATING |
@@ -4583,10 +4577,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' %s \n",
+                                          "authenticated: '%s' %pM \n",
                                           escape_essid(priv->essid,
                                                        priv->essid_len),
-                                          print_mac(mac, priv->bssid));
+                                          priv->bssid);
                                 priv->status |= STATUS_AUTH;
                                 break;
 
@@ -4602,10 +4596,10 @@ static void ipw_rx_notification(struct ipw_priv *priv,
                                 }
                                 IPW_DEBUG(IPW_DL_NOTIF | IPW_DL_STATE |
                                           IPW_DL_ASSOC,
-                                          "deauthenticated: '%s' %s\n",
+                                          "deauthenticated: '%s' %pM\n",
                                           escape_essid(priv->essid,
                                                        priv->essid_len),
-                                          print_mac(mac, priv->bssid));
+                                          priv->bssid);
 
                                 priv->status &= ~(STATUS_ASSOCIATING |
                                                   STATUS_AUTH |
@@ -5429,27 +5423,25 @@ 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 (%s)' excluded due to "
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded due to "
                                 "capability mismatch.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                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 (%s)' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                 "because of hidden ESSID.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                network->bssid);
                 return 0;
         }
 
@@ -5459,11 +5451,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("Network '%s (%s)' excluded "
+                        IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                         "because of non-network ESSID.\n",
                                         escape_essid(network->ssid,
                                                      network->ssid_len),
-                                        print_mac(mac, network->bssid));
+                                        network->bssid);
                         return 0;
                 }
         } else {
@@ -5478,9 +5470,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 (%s)' excluded "
+                        IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                         "because of ESSID mismatch: '%s'.\n",
-                                        escaped, print_mac(mac, network->bssid),
+                                        escaped, network->bssid,
                                         escape_essid(priv->essid,
                                                      priv->essid_len));
                         return 0;
@@ -5507,10 +5499,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 (%s)' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                 "because of age: %ums.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid),
+                                network->bssid,
                                 jiffies_to_msecs(jiffies -
                                                  network->last_scanned));
                 return 0;
@@ -5518,10 +5510,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 (%s)' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                 "because of channel mismatch: %d != %d.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid),
+                                network->bssid,
                                 network->channel, priv->channel);
                 return 0;
         }
@@ -5529,10 +5521,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 (%s)' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                 "because of privacy mismatch: %s != %s.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid),
+                                network->bssid,
                                 priv->
                                 capability & CAP_PRIVACY_ON ? "on" : "off",
                                 network->
@@ -5542,41 +5534,41 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv,
         }
 
         if (!memcmp(network->bssid, priv->bssid, ETH_ALEN)) {
-                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
-                                "because of the same BSSID match: %s"
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
+                                "because of the same BSSID match: %pM"
                                 ".\n", escape_essid(network->ssid,
                                                     network->ssid_len),
-                                print_mac(mac, network->bssid),
-                                print_mac(mac2, priv->bssid));
+                                network->bssid,
+                                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 (%s)' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                 "because of invalid frequency/mode "
                                 "combination.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                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 (%s)' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                 "because configured rate mask excludes "
                                 "AP mandatory rate.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                network->bssid);
                 return 0;
         }
 
         if (rates.num_rates == 0) {
-                IPW_DEBUG_MERGE("Network '%s (%s)' excluded "
+                IPW_DEBUG_MERGE("Network '%s (%pM)' excluded "
                                 "because of no compatible rates.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                network->bssid);
                 return 0;
         }
 
@@ -5587,9 +5579,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 (%s)' is a viable match.\n",
+        IPW_DEBUG_MERGE("Network '%s (%pM)' is a viable match.\n",
                         escape_essid(network->ssid, network->ssid_len),
-                        print_mac(mac, network->bssid));
+                        network->bssid);
 
         return 1;
 }
@@ -5643,7 +5635,6 @@ 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) */
@@ -5651,20 +5642,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 (%s)' excluded due to "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded due to "
                                 "capability mismatch.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                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 (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because of hidden ESSID.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                network->bssid);
                 return 0;
         }
 
@@ -5674,11 +5665,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("Network '%s (%s)' excluded "
+                        IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                         "because of non-network ESSID.\n",
                                         escape_essid(network->ssid,
                                                      network->ssid_len),
-                                        print_mac(mac, network->bssid));
+                                        network->bssid);
                         return 0;
                 }
         } else {
@@ -5692,9 +5683,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 (%s)' excluded "
+                        IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                         "because of ESSID mismatch: '%s'.\n",
-                                        escaped, print_mac(mac, network->bssid),
+                                        escaped, network->bssid,
                                         escape_essid(priv->essid,
                                                      priv->essid_len));
                         return 0;
@@ -5708,12 +5699,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 (%s)' excluded because "
-                                "'%s (%s)' has a stronger signal.\n",
-                                escaped, print_mac(mac, network->bssid),
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded because "
+                                "'%s (%pM)' has a stronger signal.\n",
+                                escaped, network->bssid,
                                 escape_essid(match->network->ssid,
                                              match->network->ssid_len),
-                                print_mac(mac, match->network->bssid));
+                                match->network->bssid);
                 return 0;
         }
 
@@ -5721,11 +5712,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 (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because of storming (%ums since last "
                                 "assoc attempt).\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid),
+                                network->bssid,
                                 jiffies_to_msecs(jiffies -
                                                  network->last_associate));
                 return 0;
@@ -5734,10 +5725,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 (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because of age: %ums.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid),
+                                network->bssid,
                                 jiffies_to_msecs(jiffies -
                                                  network->last_scanned));
                 return 0;
@@ -5745,10 +5736,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 (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because of channel mismatch: %d != %d.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid),
+                                network->bssid,
                                 network->channel, priv->channel);
                 return 0;
         }
@@ -5756,10 +5747,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 (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because of privacy mismatch: %s != %s.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid),
+                                network->bssid,
                                 priv->capability & CAP_PRIVACY_ON ? "on" :
                                 "off",
                                 network->capability &
@@ -5769,48 +5760,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 (%s)' excluded "
-                                "because of BSSID mismatch: %s.\n",
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
+                                "because of BSSID mismatch: %pM.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid), print_mac(mac, priv->bssid));
+                                network->bssid, 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 (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because of invalid frequency/mode "
                                 "combination.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                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 (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because of invalid channel in current GEO\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                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 (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because configured rate mask excludes "
                                 "AP mandatory rate.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                network->bssid);
                 return 0;
         }
 
         if (rates.num_rates == 0) {
-                IPW_DEBUG_ASSOC("Network '%s (%s)' excluded "
+                IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded "
                                 "because of no compatible rates.\n",
                                 escape_essid(network->ssid, network->ssid_len),
-                                print_mac(mac, network->bssid));
+                                network->bssid);
                 return 0;
         }
 
@@ -5822,9 +5813,9 @@ static int ipw_best_network(struct ipw_priv *priv,
         ipw_copy_rates(&match->rates, &rates);
         match->network = network;
 
-        IPW_DEBUG_ASSOC("Network '%s (%s)' is a viable match.\n",
+        IPW_DEBUG_ASSOC("Network '%s (%pM)' is a viable match.\n",
                         escape_essid(network->ssid, network->ssid_len),
-                        print_mac(mac, network->bssid));
+                        network->bssid);
 
         return 1;
 }
@@ -6066,7 +6057,6 @@ 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)
@@ -6079,8 +6069,7 @@ 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 %s\n",
-                               print_mac(mac, priv->bssid));
+                IPW_DEBUG_INFO("BSSID locked to %pM\n", priv->bssid);
         else
                 IPW_DEBUG_INFO("BSSID unlocked.\n");
         if (priv->capability & CAP_PRIVACY_ON)
@@ -7295,7 +7284,6 @@ 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);
@@ -7463,9 +7451,9 @@ static int ipw_associate_network(struct ipw_priv *priv,
                 return err;
         }
 
-        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %s \n",
+        IPW_DEBUG(IPW_DL_STATE, "associating: '%s' %pM \n",
                   escape_essid(priv->essid, priv->essid_len),
-                  print_mac(mac, priv->bssid));
+                  priv->bssid);
 
         return 0;
 }
@@ -7604,7 +7592,6 @@ static int ipw_associate(void *data)
                 if (list_empty(&priv->ieee->network_free_list)) {
                         struct ieee80211_network *oldest = NULL;
                         struct ieee80211_network *target;
-                        DECLARE_MAC_BUF(mac);
 
                         list_for_each_entry(target, &priv->ieee->network_list, list) {
                                 if ((oldest == NULL) ||
@@ -7615,11 +7602,11 @@ static int ipw_associate(void *data)
                         /* If there are no more slots, expire the oldest */
                         list_del(&oldest->list);
                         target = oldest;
-                        IPW_DEBUG_ASSOC("Expired '%s' (%s) from "
+                        IPW_DEBUG_ASSOC("Expired '%s' (%pM) from "
                                         "network list.\n",
                                         escape_essid(target->ssid,
                                                      target->ssid_len),
-                                        print_mac(mac, target->bssid));
+                                        target->bssid);
                         list_add_tail(&target->list,
                                       &priv->ieee->network_free_list);
                 }
@@ -8301,9 +8288,6 @@ static void ipw_rx(struct ipw_priv *priv)
         u32 r, w, i;
         u8 network_packet;
         u8 fill_rx = 0;
-        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);
@@ -8433,18 +8417,12 @@ static void ipw_rx(struct ipw_priv *priv)
                                                                          header)))
                                         {
                                                 IPW_DEBUG_DROP("Dropping: "
-                                                               "%s, "
-                                                               "%s, "
-                                                               "%s\n",
-                                                               print_mac(mac,
-                                                                         header->
-                                                                       addr1),
-                                                               print_mac(mac2,
-                                                                         header->
-                                                                       addr2),
-                                                               print_mac(mac3,
-                                                                         header->
-                                                                       addr3));
+                                                               "%pM, "
+                                                               "%pM, "
+                                                               "%pM\n",
+                                                               header->addr1,
+                                                               header->addr2,
+                                                               header->addr3);
                                                 break;
                                         }
 
@@ -8983,7 +8961,6 @@ 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
@@ -9014,8 +8991,8 @@ static int ipw_wx_set_wap(struct net_device *dev,
                 return 0;
         }
 
-        IPW_DEBUG_WX("Setting mandatory BSSID to %s\n",
-                     print_mac(mac, wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("Setting mandatory BSSID to %pM\n",
+                     wrqu->ap_addr.sa_data);
 
         memcpy(priv->bssid, wrqu->ap_addr.sa_data, ETH_ALEN);
 
@@ -9033,7 +9010,6 @@ 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 */
@@ -9045,8 +9021,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: %s\n",
-                     print_mac(mac, wrqu->ap_addr.sa_data));
+        IPW_DEBUG_WX("Getting WAP BSSID: %pM\n",
+                     wrqu->ap_addr.sa_data);
         mutex_unlock(&priv->mutex);
         return 0;
 }
@@ -10199,10 +10175,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",
-                                            hdr->addr1[0], hdr->addr1[1],
-                                            hdr->addr1[2], hdr->addr1[3],
-                                            hdr->addr1[4], hdr->addr1[5]);
+                                            "invalid cell: %pM\n",
+                                            hdr->addr1);
                                 goto drop;
                         }
                 }
@@ -10505,15 +10479,14 @@ 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 %s\n",
-               priv->net_dev->name, print_mac(mac, priv->mac_addr));
+        printk(KERN_INFO "%s: Setting MAC to %pM\n",
+               priv->net_dev->name, priv->mac_addr);
         queue_work(priv->workqueue, &priv->adapter_restart);
         mutex_unlock(&priv->mutex);
         return 0;
@@ -11648,7 +11621,7 @@ static int __devinit ipw_pci_probe(struct pci_dev *pdev,
         length = pci_resource_len(pdev, 0);
         priv->hw_len = length;
 
-        base = ioremap_nocache(pci_resource_start(pdev, 0), length);
+        base = pci_ioremap_bar(pdev, 0);
         if (!base) {
                 err = -ENODEV;
                 goto out_pci_release_regions;
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
index 6fc5e7361f26..bb91353c443e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945-rs.c
@@ -649,7 +649,6 @@ static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband,
         struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
         u16 fc, rate_mask;
         struct iwl3945_priv *priv = (struct iwl3945_priv *)priv_r;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_RATE("enter\n");
 
@@ -675,8 +674,8 @@ static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband,
                 u8 sta_id = iwl3945_hw_find_station(priv, hdr->addr1);
 
                 if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                       print_mac(mac, hdr->addr1));
+                        IWL_DEBUG_RATE("LQ: ADD station %pm\n",
+                                       hdr->addr1);
                         sta_id = iwl3945_add_station(priv,
                                     hdr->addr1, 0, CMD_ASYNC);
                 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-3945.c b/drivers/net/wireless/iwlwifi/iwl-3945.c
index 7ca5627cc078..8a00245be51e 100644
--- a/drivers/net/wireless/iwlwifi/iwl-3945.c
+++ b/drivers/net/wireless/iwlwifi/iwl-3945.c
@@ -759,7 +759,6 @@ u8 iwl3945_hw_find_station(struct iwl3945_priv *priv, const u8 *addr)
         int i;
         int ret = IWL_INVALID_STATION;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&priv->sta_lock, flags);
         for (i = IWL_STA_ID; i < priv->hw_setting.max_stations; i++)
@@ -770,8 +769,8 @@ u8 iwl3945_hw_find_station(struct iwl3945_priv *priv, const u8 *addr)
                         goto out;
                 }
 
-        IWL_DEBUG_INFO("can not find STA %s (total %d)\n",
-                       print_mac(mac, addr), priv->num_stations);
+        IWL_DEBUG_INFO("can not find STA %pM (total %d)\n",
+                       addr, priv->num_stations);
  out:
         spin_unlock_irqrestore(&priv->sta_lock, flags);
         return ret;
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
index e2a58e477036..b497d40dc396 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
@@ -357,11 +357,9 @@ static void rs_tl_turn_on_agg_for_tid(struct iwl_priv *priv,
                                       struct iwl_lq_sta *lq_data, u8 tid,
                                       struct ieee80211_sta *sta)
 {
-        DECLARE_MAC_BUF(mac);
-
         if (rs_tl_get_load(lq_data, tid) > IWL_AGG_LOAD_THRESHOLD) {
-                IWL_DEBUG_HT("Starting Tx agg: STA: %s tid: %d\n",
-                                print_mac(mac, sta->addr), tid);
+                IWL_DEBUG_HT("Starting Tx agg: STA: %pM tid: %d\n",
+                                sta->addr, tid);
                 ieee80211_start_tx_ba_session(priv->hw, sta->addr, tid);
         }
 }
@@ -2132,11 +2130,10 @@ static void rs_get_rate(void *priv_r, struct ieee80211_supported_band *sband,
         if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) &&
             !lq_sta->ibss_sta_added) {
                 u8 sta_id = iwl_find_station(priv, hdr->addr1);
-                DECLARE_MAC_BUF(mac);
 
                 if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                       print_mac(mac, hdr->addr1));
+                        IWL_DEBUG_RATE("LQ: ADD station %pM\n",
+                                       hdr->addr1);
                         sta_id = iwl_add_station_flags(priv, hdr->addr1,
                                                         0, CMD_ASYNC, NULL);
                 }
@@ -2205,15 +2202,12 @@ static void rs_rate_init(void *priv_r, struct ieee80211_supported_band *sband,
         lq_sta->ibss_sta_added = 0;
         if (priv->iw_mode == NL80211_IFTYPE_AP) {
                 u8 sta_id = iwl_find_station(priv, sta->addr);
-                DECLARE_MAC_BUF(mac);
 
                 /* for IBSS the call are from tasklet */
-                IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                             print_mac(mac, sta->addr));
+                IWL_DEBUG_RATE("LQ: ADD station %pM\n", sta->addr);
 
                 if (sta_id == IWL_INVALID_STATION) {
-                        IWL_DEBUG_RATE("LQ: ADD station %s\n",
-                                       print_mac(mac, sta->addr));
+                        IWL_DEBUG_RATE("LQ: ADD station %pM\n", sta->addr);
                         sta_id = iwl_add_station_flags(priv, sta->addr,
                                                         0, CMD_ASYNC, NULL);
                 }
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 321dbc8c034a..fe9307424a91 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -239,7 +239,6 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
 {
         /* cast away the const for active_rxon in this function */
         struct iwl_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
-        DECLARE_MAC_BUF(mac);
         int ret;
         bool new_assoc =
                 !!(priv->staging_rxon.filter_flags & RXON_FILTER_ASSOC_MSK);
@@ -300,10 +299,10 @@ static int iwl4965_commit_rxon(struct iwl_priv *priv)
         IWL_DEBUG_INFO("Sending RXON\n"
                        "* with%s RXON_FILTER_ASSOC_MSK\n"
                        "* channel = %d\n"
-                       "* bssid = %s\n",
+                       "* bssid = %pM\n",
                        (new_assoc ? "" : "out"),
                        le16_to_cpu(priv->staging_rxon.channel),
-                       print_mac(mac, priv->staging_rxon.bssid_addr));
+                       priv->staging_rxon.bssid_addr);
 
         iwl4965_set_rxon_hwcrypto(priv, !priv->hw_params.sw_crypto);
 
@@ -1464,7 +1463,6 @@ void iwl_rx_handle(struct iwl_priv *priv)
 static void iwl4965_print_rx_config_cmd(struct iwl_priv *priv)
 {
         struct iwl_rxon_cmd *rxon = &priv->staging_rxon;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_RADIO("RX CONFIG:\n");
         iwl_print_hex_dump(priv, IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
@@ -1476,10 +1474,8 @@ static void iwl4965_print_rx_config_cmd(struct iwl_priv *priv)
         IWL_DEBUG_RADIO("u8 ofdm_basic_rates: 0x%02x\n",
                         rxon->ofdm_basic_rates);
         IWL_DEBUG_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO("u8[6] node_addr: %s\n",
-                        print_mac(mac, rxon->node_addr));
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: %s\n",
-                        print_mac(mac, rxon->bssid_addr));
+        IWL_DEBUG_RADIO("u8[6] node_addr: %pM\n", rxon->node_addr);
+        IWL_DEBUG_RADIO("u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
         IWL_DEBUG_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
 }
 #endif
@@ -2466,7 +2462,6 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
 {
         struct ieee80211_conf *conf = NULL;
         int ret = 0;
-        DECLARE_MAC_BUF(mac);
         unsigned long flags;
 
         if (priv->iw_mode == NL80211_IFTYPE_AP) {
@@ -2474,9 +2469,8 @@ static void iwl4965_post_associate(struct iwl_priv *priv)
                 return;
         }
 
-        IWL_DEBUG_ASSOC("Associated as %d to: %s\n",
-                        priv->assoc_id,
-                        print_mac(mac, priv->active_rxon.bssid_addr));
+        IWL_DEBUG_ASSOC("Associated as %d to: %pM\n",
+                        priv->assoc_id, priv->active_rxon.bssid_addr);
 
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
@@ -2722,7 +2716,6 @@ static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
 {
         struct iwl_priv *priv = hw->priv;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_MAC80211("enter: type %d\n", conf->type);
 
@@ -2739,7 +2732,7 @@ static int iwl4965_mac_add_interface(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (conf->mac_addr) {
-                IWL_DEBUG_MAC80211("Set %s\n", print_mac(mac, conf->mac_addr));
+                IWL_DEBUG_MAC80211("Set %pM\n", conf->mac_addr);
                 memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
         }
 
@@ -2948,7 +2941,6 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
                                     struct ieee80211_if_conf *conf)
 {
         struct iwl_priv *priv = hw->priv;
-        DECLARE_MAC_BUF(mac);
         unsigned long flags;
         int rc;
 
@@ -2983,8 +2975,7 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (conf->bssid)
-                IWL_DEBUG_MAC80211("bssid: %s\n",
-                                   print_mac(mac, conf->bssid));
+                IWL_DEBUG_MAC80211("bssid: %pM\n", conf->bssid);
 
 /*
  * very dubious code was here; the probe filtering flag is never set:
@@ -2997,8 +2988,8 @@ static int iwl4965_mac_config_interface(struct ieee80211_hw *hw,
                 if (!conf->bssid) {
                         conf->bssid = priv->mac_addr;
                         memcpy(priv->bssid, priv->mac_addr, ETH_ALEN);
-                        IWL_DEBUG_MAC80211("bssid was set to: %s\n",
-                                           print_mac(mac, conf->bssid));
+                        IWL_DEBUG_MAC80211("bssid was set to: %pM\n",
+                                           conf->bssid);
                 }
                 if (priv->ibss_beacon)
                         dev_kfree_skb(priv->ibss_beacon);
@@ -3241,14 +3232,13 @@ static void iwl4965_mac_update_tkip_key(struct ieee80211_hw *hw,
         unsigned long flags;
         __le16 key_flags = 0;
         int i;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_MAC80211("enter\n");
 
         sta_id = iwl_find_station(priv, addr);
         if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
-                                   print_mac(mac, addr));
+                IWL_DEBUG_MAC80211("leave - %pM not in station map.\n",
+                                   addr);
                 return;
         }
 
@@ -3285,7 +3275,6 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
                            struct ieee80211_key_conf *key)
 {
         struct iwl_priv *priv = hw->priv;
-        DECLARE_MAC_BUF(mac);
         int ret = 0;
         u8 sta_id = IWL_INVALID_STATION;
         u8 is_default_wep_key = 0;
@@ -3303,8 +3292,8 @@ static int iwl4965_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         sta_id = iwl_find_station(priv, addr);
         if (sta_id == IWL_INVALID_STATION) {
-                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
-                                   print_mac(mac, addr));
+                IWL_DEBUG_MAC80211("leave - %pM not in station map.\n",
+                                   addr);
                 return -EINVAL;
 
         }
@@ -3405,10 +3394,9 @@ static int iwl4965_mac_ampdu_action(struct ieee80211_hw *hw,
                              struct ieee80211_sta *sta, u16 tid, u16 *ssn)
 {
         struct iwl_priv *priv = hw->priv;
-        DECLARE_MAC_BUF(mac);
 
-        IWL_DEBUG_HT("A-MPDU action on addr %s tid %d\n",
-                     print_mac(mac, sta->addr), tid);
+        IWL_DEBUG_HT("A-MPDU action on addr %pM tid %d\n",
+                     sta->addr, tid);
 
         if (!(priv->cfg->sku & IWL_SKU_N))
                 return -EACCES;
@@ -4171,7 +4159,6 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         struct ieee80211_hw *hw;
         struct iwl_cfg *cfg = (struct iwl_cfg *)(ent->driver_data);
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         /************************
          * 1. Allocating HW data
@@ -4280,7 +4267,7 @@ static int iwl4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
 
         /* extract MAC Address */
         iwl_eeprom_get_mac(priv, priv->mac_addr);
-        IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr));
+        IWL_DEBUG_INFO("MAC address: %pM\n", priv->mac_addr);
         SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
 
         /************************
diff --git a/drivers/net/wireless/iwlwifi/iwl-debugfs.c b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
index 20db0eb636a8..753f9387aa68 100644
--- a/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+++ b/drivers/net/wireless/iwlwifi/iwl-debugfs.c
@@ -228,7 +228,6 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
         ssize_t ret;
         /* Add 30 for initial string */
         const size_t bufsz = 30 + sizeof(char) * 500 * (priv->num_stations);
-        DECLARE_MAC_BUF(mac);
 
         buf = kmalloc(bufsz, GFP_KERNEL);
         if (!buf)
@@ -242,7 +241,6 @@ static ssize_t iwl_dbgfs_stations_read(struct file *file, char __user *user_buf,
                 if (station->used) {
                         pos += scnprintf(buf + pos, bufsz - pos,
                                         "station %d:\ngeneral data:\n", i+1);
-                        print_mac(mac, station->sta.sta.addr);
                         pos += scnprintf(buf + pos, bufsz - pos, "id: %u\n",
                                         station->sta.sta.sta_id);
                         pos += scnprintf(buf + pos, bufsz - pos, "mode: %u\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl-sta.c b/drivers/net/wireless/iwlwifi/iwl-sta.c
index 61797f3f8d5c..e02c4717c93c 100644
--- a/drivers/net/wireless/iwlwifi/iwl-sta.c
+++ b/drivers/net/wireless/iwlwifi/iwl-sta.c
@@ -45,7 +45,6 @@ u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr)
         int start = 0;
         int ret = IWL_INVALID_STATION;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         if ((priv->iw_mode == NL80211_IFTYPE_ADHOC) ||
             (priv->iw_mode == NL80211_IFTYPE_AP))
@@ -63,8 +62,8 @@ u8 iwl_find_station(struct iwl_priv *priv, const u8 *addr)
                         goto out;
                 }
 
-        IWL_DEBUG_ASSOC_LIMIT("can not find STA %s total %d\n",
-                              print_mac(mac, addr), priv->num_stations);
+        IWL_DEBUG_ASSOC_LIMIT("can not find STA %pM total %d\n",
+                              addr, priv->num_stations);
 
  out:
         spin_unlock_irqrestore(&priv->sta_lock, flags);
@@ -86,7 +85,6 @@ EXPORT_SYMBOL(iwl_get_ra_sta_id);
 static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
 {
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&priv->sta_lock, flags);
 
@@ -94,8 +92,8 @@ static void iwl_sta_ucode_activate(struct iwl_priv *priv, u8 sta_id)
                 IWL_ERROR("ACTIVATE a non DRIVER active station %d\n", sta_id);
 
         priv->stations[sta_id].used |= IWL_STA_UCODE_ACTIVE;
-        IWL_DEBUG_ASSOC("Added STA to Ucode: %s\n",
-                        print_mac(mac, priv->stations[sta_id].sta.sta.addr));
+        IWL_DEBUG_ASSOC("Added STA to Ucode: %pM\n",
+                        priv->stations[sta_id].sta.sta.addr);
 
         spin_unlock_irqrestore(&priv->sta_lock, flags);
 }
@@ -237,7 +235,6 @@ u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap,
         int sta_id = IWL_INVALID_STATION;
         struct iwl_station_entry *station;
         unsigned long flags_spin;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&priv->sta_lock, flags_spin);
         if (is_ap)
@@ -273,8 +270,8 @@ u8 iwl_add_station_flags(struct iwl_priv *priv, const u8 *addr, int is_ap,
 
         station = &priv->stations[sta_id];
         station->used = IWL_STA_DRIVER_ACTIVE;
-        IWL_DEBUG_ASSOC("Add STA to driver ID %d: %s\n",
-                        sta_id, print_mac(mac, addr));
+        IWL_DEBUG_ASSOC("Add STA to driver ID %d: %pM\n",
+                        sta_id, addr);
         priv->num_stations++;
 
         /* Set up the REPLY_ADD_STA command to send to device */
@@ -301,14 +298,11 @@ EXPORT_SYMBOL(iwl_add_station_flags);
 static void iwl_sta_ucode_deactivate(struct iwl_priv *priv, const char *addr)
 {
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
-
         u8 sta_id = iwl_find_station(priv, addr);
 
         BUG_ON(sta_id == IWL_INVALID_STATION);
 
-        IWL_DEBUG_ASSOC("Removed STA from Ucode: %s\n",
-                        print_mac(mac, addr));
+        IWL_DEBUG_ASSOC("Removed STA from Ucode: %pM\n", addr);
 
         spin_lock_irqsave(&priv->sta_lock, flags);
 
@@ -415,7 +409,6 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
         int sta_id = IWL_INVALID_STATION;
         int i, ret = -EINVAL;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         spin_lock_irqsave(&priv->sta_lock, flags);
 
@@ -435,18 +428,18 @@ int iwl_remove_station(struct iwl_priv *priv, const u8 *addr, int is_ap)
         if (unlikely(sta_id == IWL_INVALID_STATION))
                 goto out;
 
-        IWL_DEBUG_ASSOC("Removing STA from driver:%d  %s\n",
-                sta_id, print_mac(mac, addr));
+        IWL_DEBUG_ASSOC("Removing STA from driver:%d  %pM\n",
+                sta_id, addr);
 
         if (!(priv->stations[sta_id].used & IWL_STA_DRIVER_ACTIVE)) {
-                IWL_ERROR("Removing %s but non DRIVER active\n",
-                                print_mac(mac, addr));
+                IWL_ERROR("Removing %pM but non DRIVER active\n",
+                                addr);
                 goto out;
         }
 
         if (!(priv->stations[sta_id].used & IWL_STA_UCODE_ACTIVE)) {
-                IWL_ERROR("Removing %s but non UCODE active\n",
-                                print_mac(mac, addr));
+                IWL_ERROR("Removing %pM but non UCODE active\n",
+                                addr);
                 goto out;
         }
 
@@ -927,7 +920,6 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
 {
         int sta_id;
         u16 fc = le16_to_cpu(hdr->frame_control);
-        DECLARE_MAC_BUF(mac);
 
         /* If this frame is broadcast or management, use broadcast station id */
         if (((fc & IEEE80211_FCTL_FTYPE) != IEEE80211_FTYPE_DATA) ||
@@ -962,9 +954,9 @@ int iwl_get_sta_id(struct iwl_priv *priv, struct ieee80211_hdr *hdr)
                 if (sta_id != IWL_INVALID_STATION)
                         return sta_id;
 
-                IWL_DEBUG_DROP("Station %s not in station map. "
+                IWL_DEBUG_DROP("Station %pM not in station map. "
                                "Defaulting to broadcast...\n",
-                               print_mac(mac, hdr->addr1));
+                               hdr->addr1);
                 iwl_print_hex_dump(priv, IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
                 return priv->hw_params.bcast_sta_id;
 
diff --git a/drivers/net/wireless/iwlwifi/iwl-tx.c b/drivers/net/wireless/iwlwifi/iwl-tx.c
index 907a53ebc6e4..37ebcff409e2 100644
--- a/drivers/net/wireless/iwlwifi/iwl-tx.c
+++ b/drivers/net/wireless/iwlwifi/iwl-tx.c
@@ -830,10 +830,8 @@ int iwl_tx_skb(struct iwl_priv *priv, struct sk_buff *skb)
         /* Find (or create) index into station table for destination station */
         sta_id = iwl_get_sta_id(priv, hdr);
         if (sta_id == IWL_INVALID_STATION) {
-                DECLARE_MAC_BUF(mac);
-
-                IWL_DEBUG_DROP("Dropping - INVALID STATION: %s\n",
-                               print_mac(mac, hdr->addr1));
+                IWL_DEBUG_DROP("Dropping - INVALID STATION: %pM\n",
+                               hdr->addr1);
                 goto drop;
         }
 
@@ -1248,15 +1246,14 @@ int iwl_tx_agg_start(struct iwl_priv *priv, const u8 *ra, u16 tid, u16 *ssn)
         int ret;
         unsigned long flags;
         struct iwl_tid_data *tid_data;
-        DECLARE_MAC_BUF(mac);
 
         if (likely(tid < ARRAY_SIZE(default_tid_to_tx_fifo)))
                 tx_fifo = default_tid_to_tx_fifo[tid];
         else
                 return -EINVAL;
 
-        IWL_WARNING("%s on ra = %s tid = %d\n",
-                        __func__, print_mac(mac, ra), tid);
+        IWL_WARNING("%s on ra = %pM tid = %d\n",
+                        __func__, ra, tid);
 
         sta_id = iwl_find_station(priv, ra);
         if (sta_id == IWL_INVALID_STATION)
@@ -1301,7 +1298,6 @@ int iwl_tx_agg_stop(struct iwl_priv *priv , const u8 *ra, u16 tid)
         struct iwl_tid_data *tid_data;
         int ret, write_ptr, read_ptr;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         if (!ra) {
                 IWL_ERROR("ra = NULL\n");
@@ -1467,7 +1463,6 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,
         int index;
         struct iwl_tx_queue *txq = NULL;
         struct iwl_ht_agg *agg;
-        DECLARE_MAC_BUF(mac);
 
         /* "flow" corresponds to Tx queue */
         u16 scd_flow = le16_to_cpu(ba_resp->scd_flow);
@@ -1489,10 +1484,10 @@ void iwl_rx_reply_compressed_ba(struct iwl_priv *priv,
 
         /* TODO: Need to get this copy more safely - now good for debug */
 
-        IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from %s, "
+        IWL_DEBUG_TX_REPLY("REPLY_COMPRESSED_BA [%d]Received from %pM, "
                            "sta_id = %d\n",
                            agg->wait_for_ba,
-                           print_mac(mac, (u8 *) &ba_resp->sta_addr_lo32),
+                           (u8 *) &ba_resp->sta_addr_lo32,
                            ba_resp->sta_id);
         IWL_DEBUG_TX_REPLY("TID = %d, SeqCtl = %d, bitmap = 0x%llx, scd_flow = "
                            "%d, scd_ssn = %d\n",
diff --git a/drivers/net/wireless/iwlwifi/iwl3945-base.c b/drivers/net/wireless/iwlwifi/iwl3945-base.c
index d15a2c997954..d3a2966d9181 100644
--- a/drivers/net/wireless/iwlwifi/iwl3945-base.c
+++ b/drivers/net/wireless/iwlwifi/iwl3945-base.c
@@ -446,7 +446,6 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
         int index = IWL_INVALID_STATION;
         struct iwl3945_station_entry *station;
         unsigned long flags_spin;
-        DECLARE_MAC_BUF(mac);
         u8 rate;
 
         spin_lock_irqsave(&priv->sta_lock, flags_spin);
@@ -480,7 +479,7 @@ u8 iwl3945_add_station(struct iwl3945_priv *priv, const u8 *addr, int is_ap, u8
                 return index;
         }
 
-        IWL_DEBUG_ASSOC("Add STA ID %d: %s\n", index, print_mac(mac, addr));
+        IWL_DEBUG_ASSOC("Add STA ID %d: %pM\n", index, addr);
         station = &priv->stations[index];
         station->used = 1;
         priv->num_stations++;
@@ -1063,7 +1062,6 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
         /* cast away the const for active_rxon in this function */
         struct iwl3945_rxon_cmd *active_rxon = (void *)&priv->active_rxon;
         int rc = 0;
-        DECLARE_MAC_BUF(mac);
 
         if (!iwl3945_is_alive(priv))
                 return -1;
@@ -1124,11 +1122,11 @@ static int iwl3945_commit_rxon(struct iwl3945_priv *priv)
         IWL_DEBUG_INFO("Sending RXON\n"
                        "* with%s RXON_FILTER_ASSOC_MSK\n"
                        "* channel = %d\n"
-                       "* bssid = %s\n",
+                       "* bssid = %pM\n",
                        ((priv->staging_rxon.filter_flags &
                          RXON_FILTER_ASSOC_MSK) ? "" : "out"),
                        le16_to_cpu(priv->staging_rxon.channel),
-                       print_mac(mac, priv->staging_rxon.bssid_addr));
+                       priv->staging_rxon.bssid_addr);
 
         /* Apply the new configuration */
         rc = iwl3945_send_cmd_pdu(priv, REPLY_RXON,
@@ -2482,8 +2480,6 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
         /* If this frame is going out to an IBSS network, find the station,
          * or create a new station table entry */
         case NL80211_IFTYPE_ADHOC: {
-                DECLARE_MAC_BUF(mac);
-
                 /* Create new station table entry */
                 sta_id = iwl3945_hw_find_station(priv, hdr->addr1);
                 if (sta_id != IWL_INVALID_STATION)
@@ -2494,9 +2490,9 @@ static int iwl3945_get_sta_id(struct iwl3945_priv *priv, struct ieee80211_hdr *h
                 if (sta_id != IWL_INVALID_STATION)
                         return sta_id;
 
-                IWL_DEBUG_DROP("Station %s not in station map. "
+                IWL_DEBUG_DROP("Station %pM not in station map. "
                                "Defaulting to broadcast...\n",
-                               print_mac(mac, hdr->addr1));
+                               hdr->addr1);
                 iwl3945_print_hex_dump(IWL_DL_DROP, (u8 *) hdr, sizeof(*hdr));
                 return priv->hw_setting.bcast_sta_id;
         }
@@ -2579,10 +2575,8 @@ static int iwl3945_tx_skb(struct iwl3945_priv *priv, struct sk_buff *skb)
         /* Find (or create) index into station table for destination station */
         sta_id = iwl3945_get_sta_id(priv, hdr);
         if (sta_id == IWL_INVALID_STATION) {
-                DECLARE_MAC_BUF(mac);
-
-                IWL_DEBUG_DROP("Dropping - INVALID STATION: %s\n",
-                               print_mac(mac, hdr->addr1));
+                IWL_DEBUG_DROP("Dropping - INVALID STATION: %pM\n",
+                               hdr->addr1);
                 goto drop;
         }
 
@@ -4019,8 +4013,6 @@ static int iwl3945_tx_queue_update_write_ptr(struct iwl3945_priv *priv,
 #ifdef CONFIG_IWL3945_DEBUG
 static void iwl3945_print_rx_config_cmd(struct iwl3945_rxon_cmd *rxon)
 {
-        DECLARE_MAC_BUF(mac);
-
         IWL_DEBUG_RADIO("RX CONFIG:\n");
         iwl3945_print_hex_dump(IWL_DL_RADIO, (u8 *) rxon, sizeof(*rxon));
         IWL_DEBUG_RADIO("u16 channel: 0x%x\n", le16_to_cpu(rxon->channel));
@@ -4031,10 +4023,8 @@ static void iwl3945_print_rx_config_cmd(struct iwl3945_rxon_cmd *rxon)
         IWL_DEBUG_RADIO("u8 ofdm_basic_rates: 0x%02x\n",
                         rxon->ofdm_basic_rates);
         IWL_DEBUG_RADIO("u8 cck_basic_rates: 0x%02x\n", rxon->cck_basic_rates);
-        IWL_DEBUG_RADIO("u8[6] node_addr: %s\n",
-                        print_mac(mac, rxon->node_addr));
-        IWL_DEBUG_RADIO("u8[6] bssid_addr: %s\n",
-                        print_mac(mac, rxon->bssid_addr));
+        IWL_DEBUG_RADIO("u8[6] node_addr: %pM\n", rxon->node_addr);
+        IWL_DEBUG_RADIO("u8[6] bssid_addr: %pM\n", rxon->bssid_addr);
         IWL_DEBUG_RADIO("u16 assoc_id: 0x%x\n", le16_to_cpu(rxon->assoc_id));
 }
 #endif
@@ -6321,7 +6311,6 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
 {
         int rc = 0;
         struct ieee80211_conf *conf = NULL;
-        DECLARE_MAC_BUF(mac);
 
         if (priv->iw_mode == NL80211_IFTYPE_AP) {
                 IWL_ERROR("%s Should not be called in AP mode\n", __func__);
@@ -6329,9 +6318,8 @@ static void iwl3945_post_associate(struct iwl3945_priv *priv)
         }
 
 
-        IWL_DEBUG_ASSOC("Associated as %d to: %s\n",
-                        priv->assoc_id,
-                        print_mac(mac, priv->active_rxon.bssid_addr));
+        IWL_DEBUG_ASSOC("Associated as %d to: %pM\n",
+                        priv->assoc_id, priv->active_rxon.bssid_addr);
 
         if (test_bit(STATUS_EXIT_PENDING, &priv->status))
                 return;
@@ -6592,7 +6580,6 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
 {
         struct iwl3945_priv *priv = hw->priv;
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         IWL_DEBUG_MAC80211("enter: type %d\n", conf->type);
 
@@ -6609,7 +6596,7 @@ static int iwl3945_mac_add_interface(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (conf->mac_addr) {
-                IWL_DEBUG_MAC80211("Set: %s\n", print_mac(mac, conf->mac_addr));
+                IWL_DEBUG_MAC80211("Set: %pM\n", conf->mac_addr);
                 memcpy(priv->mac_addr, conf->mac_addr, ETH_ALEN);
         }
 
@@ -6778,7 +6765,6 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
                                     struct ieee80211_if_conf *conf)
 {
         struct iwl3945_priv *priv = hw->priv;
-        DECLARE_MAC_BUF(mac);
         unsigned long flags;
         int rc;
 
@@ -6816,8 +6802,7 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
         mutex_lock(&priv->mutex);
 
         if (conf->bssid)
-                IWL_DEBUG_MAC80211("bssid: %s\n",
-                                   print_mac(mac, conf->bssid));
+                IWL_DEBUG_MAC80211("bssid: %pM\n", conf->bssid);
 
 /*
  * very dubious code was here; the probe filtering flag is never set:
@@ -6830,8 +6815,8 @@ static int iwl3945_mac_config_interface(struct ieee80211_hw *hw,
                 if (!conf->bssid) {
                         conf->bssid = priv->mac_addr;
                         memcpy(priv->bssid, priv->mac_addr, ETH_ALEN);
-                        IWL_DEBUG_MAC80211("bssid was set to: %s\n",
-                                           print_mac(mac, conf->bssid));
+                        IWL_DEBUG_MAC80211("bssid was set to: %pM\n",
+                                           conf->bssid);
                 }
                 if (priv->ibss_beacon)
                         dev_kfree_skb(priv->ibss_beacon);
@@ -7072,10 +7057,8 @@ static int iwl3945_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd,
 
         sta_id = iwl3945_hw_find_station(priv, addr);
         if (sta_id == IWL_INVALID_STATION) {
-                DECLARE_MAC_BUF(mac);
-
-                IWL_DEBUG_MAC80211("leave - %s not in station map.\n",
-                                   print_mac(mac, addr));
+                IWL_DEBUG_MAC80211("leave - %pM not in station map.\n",
+                                   addr);
                 return -EINVAL;
         }
 
@@ -7870,7 +7853,6 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         struct ieee80211_hw *hw;
         struct iwl_3945_cfg *cfg = (struct iwl_3945_cfg *)(ent->driver_data);
         unsigned long flags;
-        DECLARE_MAC_BUF(mac);
 
         /* Disabling hardware scan means that mac80211 will perform scans
          * "the hard way", rather than using device's scan. */
@@ -8045,7 +8027,7 @@ static int iwl3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *e
         }
         /* MAC Address location in EEPROM same for 3945/4965 */
         get_eeprom_mac(priv, priv->mac_addr);
-        IWL_DEBUG_INFO("MAC address: %s\n", print_mac(mac, priv->mac_addr));
+        IWL_DEBUG_INFO("MAC address: %pM\n", priv->mac_addr);
         SET_IEEE80211_PERM_ADDR(priv->hw, priv->mac_addr);
 
         err = iwl3945_init_channel_map(priv);
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 8265c7d25edc..d45b07cf6a62 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 22c4c6110521..351b3f6e5664 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);
 
diff --git a/drivers/net/wireless/libertas_tf/cmd.c b/drivers/net/wireless/libertas_tf/cmd.c
index fdbcf8ba3e8a..3d3914c83b14 100644
--- a/drivers/net/wireless/libertas_tf/cmd.c
+++ b/drivers/net/wireless/libertas_tf/cmd.c
@@ -79,7 +79,6 @@ int lbtf_update_hw_spec(struct lbtf_private *priv)
         struct cmd_ds_get_hw_spec cmd;
         int ret = -1;
         u32 i;
-        DECLARE_MAC_BUF(mac);
 
         memset(&cmd, 0, sizeof(cmd));
         cmd.hdr.size = cpu_to_le16(sizeof(cmd));
@@ -96,8 +95,8 @@ int lbtf_update_hw_spec(struct lbtf_private *priv)
         priv->fwrelease = (priv->fwrelease << 8) |
                 (priv->fwrelease >> 24 & 0xff);
 
-        printk(KERN_INFO "libertastf: %s, fw %u.%u.%up%u, cap 0x%08x\n",
-                print_mac(mac, cmd.permanentaddr),
+        printk(KERN_INFO "libertastf: %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/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c
index 1a019e98dac3..88c5eec0607c 100644
--- a/drivers/net/wireless/mac80211_hwsim.c
+++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -301,10 +301,9 @@ static void mac80211_hwsim_stop(struct ieee80211_hw *hw)
 static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw,
                                         struct ieee80211_if_init_conf *conf)
 {
-        DECLARE_MAC_BUF(mac);
-        printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%s)\n",
+        printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%pM)\n",
                wiphy_name(hw->wiphy), __func__, conf->type,
-               print_mac(mac, conf->mac_addr));
+               conf->mac_addr);
         hwsim_set_magic(conf->vif);
         return 0;
 }
@@ -313,10 +312,9 @@ static int mac80211_hwsim_add_interface(struct ieee80211_hw *hw,
 static void mac80211_hwsim_remove_interface(
         struct ieee80211_hw *hw, struct ieee80211_if_init_conf *conf)
 {
-        DECLARE_MAC_BUF(mac);
-        printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%s)\n",
+        printk(KERN_DEBUG "%s:%s (type=%d mac_addr=%pM)\n",
                wiphy_name(hw->wiphy), __func__, conf->type,
-               print_mac(mac, conf->mac_addr));
+               conf->mac_addr);
         hwsim_check_magic(conf->vif);
         hwsim_clear_magic(conf->vif);
 }
@@ -505,7 +503,6 @@ static int __init init_mac80211_hwsim(void)
         u8 addr[ETH_ALEN];
         struct mac80211_hwsim_data *data;
         struct ieee80211_hw *hw;
-        DECLARE_MAC_BUF(mac);
 
         if (radios < 1 || radios > 100)
                 return -EINVAL;
@@ -588,9 +585,9 @@ static int __init init_mac80211_hwsim(void)
                         goto failed_hw;
                 }
 
-                printk(KERN_DEBUG "%s: hwaddr %s registered\n",
+                printk(KERN_DEBUG "%s: hwaddr %pM registered\n",
                        wiphy_name(hw->wiphy),
-                       print_mac(mac, hw->wiphy->perm_addr));
+                       hw->wiphy->perm_addr);
 
                 setup_timer(&data->beacon_timer, mac80211_hwsim_beacon,
                             (unsigned long) hw);
diff --git a/drivers/net/wireless/netwave_cs.c b/drivers/net/wireless/netwave_cs.c
index a670f36b5f3f..be80c0093b79 100644
--- a/drivers/net/wireless/netwave_cs.c
+++ b/drivers/net/wireless/netwave_cs.c
@@ -737,7 +737,6 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
     win_req_t req;
     memreq_t mem;
     u_char __iomem *ramBase = NULL;
-    DECLARE_MAC_BUF(mac);
 
     DEBUG(0, "netwave_pcmcia_config(0x%p)\n", link);
 
@@ -808,12 +807,12 @@ static int netwave_pcmcia_config(struct pcmcia_device *link) {
         dev->dev_addr[i] = readb(ramBase + NETWAVE_EREG_PA + i);
 
     printk(KERN_INFO "%s: Netwave: port %#3lx, irq %d, mem %lx, "
-           "id %c%c, hw_addr %s\n",
+           "id %c%c, hw_addr %pM\n",
            dev->name, dev->base_addr, dev->irq,
            (u_long) ramBase,
            (int) readb(ramBase+NETWAVE_EREG_NI),
            (int) readb(ramBase+NETWAVE_EREG_NI+1),
-           print_mac(mac, dev->dev_addr));
+           dev->dev_addr);
 
     /* get revision words */
     printk(KERN_DEBUG "Netwave_reset: revision %04x %04x\n", 
diff --git a/drivers/net/wireless/orinoco.c b/drivers/net/wireless/orinoco.c
index e0512e49d6d3..366556fafaee 100644
--- a/drivers/net/wireless/orinoco.c
+++ b/drivers/net/wireless/orinoco.c
@@ -1477,12 +1477,11 @@ static void orinoco_rx(struct net_device *dev,
                            MICHAEL_MIC_LEN)) {
                         union iwreq_data wrqu;
                         struct iw_michaelmicfailure wxmic;
-                        DECLARE_MAC_BUF(mac);
 
                         printk(KERN_WARNING "%s: "
-                               "Invalid Michael MIC in data frame from %s, "
+                               "Invalid Michael MIC in data frame from %pM, "
                                "using key %i\n",
-                               dev->name, print_mac(mac, src), key_id);
+                               dev->name, src, key_id);
 
                         /* TODO: update stats */
 
@@ -3277,7 +3276,6 @@ static int orinoco_init(struct net_device *dev)
         struct hermes_idstring nickbuf;
         u16 reclen;
         int len;
-        DECLARE_MAC_BUF(mac);
 
         /* No need to lock, the hw_unavailable flag is already set in
          * alloc_orinocodev() */
@@ -3348,8 +3346,8 @@ static int orinoco_init(struct net_device *dev)
                 goto out;
         }
 
-        printk(KERN_DEBUG "%s: MAC address %s\n",
-               dev->name, print_mac(mac, dev->dev_addr));
+        printk(KERN_DEBUG "%s: MAC address %pM\n",
+               dev->name, dev->dev_addr);
 
         /* Get the station name */
         err = hermes_read_ltv(hw, USER_BAP, HERMES_RID_CNFOWNNAME,
diff --git a/drivers/net/wireless/p54/p54common.c b/drivers/net/wireless/p54/p54common.c
index 827ca0384a4c..6370c44c64d5 100644
--- a/drivers/net/wireless/p54/p54common.c
+++ b/drivers/net/wireless/p54/p54common.c
@@ -320,7 +320,6 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
         int err;
         u8 *end = (u8 *)eeprom + len;
         u16 synth = 0;
-        DECLARE_MAC_BUF(mac);
 
         wrap = (struct eeprom_pda_wrap *) eeprom;
         entry = (void *)wrap->data + le16_to_cpu(wrap->len);
@@ -446,9 +445,9 @@ static int p54_parse_eeprom(struct ieee80211_hw *dev, void *eeprom, int len)
                 SET_IEEE80211_PERM_ADDR(dev, perm_addr);
         }
 
-        printk(KERN_INFO "%s: hwaddr %s, MAC:isl38%02x RF:%s\n",
+        printk(KERN_INFO "%s: hwaddr %pM, MAC:isl38%02x RF:%s\n",
                 wiphy_name(dev->wiphy),
-                print_mac(mac, dev->wiphy->perm_addr),
+                dev->wiphy->perm_addr,
                 priv->version, p54_rf_chips[priv->rxhw]);
 
         return 0;
diff --git a/drivers/net/wireless/p54/p54pci.c b/drivers/net/wireless/p54/p54pci.c
index 88b3cad8b65e..bba2c90e533f 100644
--- a/drivers/net/wireless/p54/p54pci.c
+++ b/drivers/net/wireless/p54/p54pci.c
@@ -481,7 +481,6 @@ static int __devinit p54p_probe(struct pci_dev *pdev,
         struct ieee80211_hw *dev;
         unsigned long mem_addr, mem_len;
         int err;
-        DECLARE_MAC_BUF(mac);
 
         err = pci_enable_device(pdev);
         if (err) {
diff --git a/drivers/net/wireless/p54/p54usb.c b/drivers/net/wireless/p54/p54usb.c
index 75d749bccb0d..68f1b80f04d9 100644
--- a/drivers/net/wireless/p54/p54usb.c
+++ b/drivers/net/wireless/p54/p54usb.c
@@ -786,7 +786,6 @@ static int __devinit p54u_probe(struct usb_interface *intf,
         struct p54u_priv *priv;
         int err;
         unsigned int i, recognized_pipes;
-        DECLARE_MAC_BUF(mac);
 
         dev = p54_init_common(sizeof(*priv));
         if (!dev) {
diff --git a/drivers/net/wireless/prism54/isl_ioctl.c b/drivers/net/wireless/prism54/isl_ioctl.c
index 16e68f4b654a..57a150a22de5 100644
--- a/drivers/net/wireless/prism54/isl_ioctl.c
+++ b/drivers/net/wireless/prism54/isl_ioctl.c
@@ -2028,12 +2028,11 @@ static void
 format_event(islpci_private *priv, char *dest, const char *str,
              const struct obj_mlme *mlme, u16 *length, int error)
 {
-        DECLARE_MAC_BUF(mac);
         int n = snprintf(dest, IW_CUSTOM_MAX,
-                         "%s %s %s %s (%2.2X)",
+                         "%s %s %pM %s (%2.2X)",
                          str,
                          ((priv->iw_mode == IW_MODE_MASTER) ? "from" : "to"),
-                         print_mac(mac, mlme->address),
+                         mlme->address,
                          (error ? (mlme->code ? " : REJECTED " : " : ACCEPTED ")
                           : ""), mlme->code);
         BUG_ON(n > IW_CUSTOM_MAX);
@@ -2113,7 +2112,6 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
 {
         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,7 +2152,7 @@ prism54_wpa_bss_ie_add(islpci_private *priv, u8 *bssid,
                 bss->last_update = jiffies;
         } else {
                 printk(KERN_DEBUG "Failed to add BSS WPA entry for "
-                       "%s\n", print_mac(mac, bssid));
+                       "%pM\n", bssid);
         }
 
         /* expire old entries from WPA list */
@@ -2219,7 +2217,6 @@ 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;
@@ -2230,7 +2227,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 %s\n", print_mac(mac, addr));
+                               "for %pM\n", addr);
                         return;
                 }
                 if (pos[0] == WLAN_EID_GENERIC && pos[1] >= 4 &&
@@ -2269,7 +2266,6 @@ 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,8 +2354,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%s\n",
-                       print_mac(mac, mlmeex->address));
+                printk(KERN_DEBUG "Authenticate from: address:\t%pM\n",
+                       mlmeex->address);
                 confirm->id = -1; /* or mlmeex->id ? */
                 confirm->state = 0; /* not used */
                 confirm->code = 0;
@@ -2404,8 +2400,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%s\n",
-                               print_mac(mac, mlmeex->address));
+                        printk(KERN_DEBUG "No WPA IE found from address:\t%pM\n",
+                               mlmeex->address);
                         kfree(confirm);
                         break;
                 }
@@ -2441,8 +2437,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%s\n",
-                               print_mac(mac, mlmeex->address));
+                        printk(KERN_DEBUG "No WPA IE found from address:\t%pM\n",
+                               mlmeex->address);
                         kfree(confirm);
                         break;
                 }
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 1404a5717520..bf0b9299b5df 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -414,7 +414,6 @@ static int ray_config(struct pcmcia_device *link)
     memreq_t mem;
     struct net_device *dev = (struct net_device *)link->priv;
     ray_dev_t *local = netdev_priv(dev);
-    DECLARE_MAC_BUF(mac);
 
     DEBUG(1, "ray_config(0x%p)\n", link);
 
@@ -485,8 +484,8 @@ static int ray_config(struct pcmcia_device *link)
     strcpy(local->node.dev_name, dev->name);
     link->dev_node = &local->node;
 
-    printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %s\n",
-       dev->name, dev->irq, print_mac(mac, dev->dev_addr));
+    printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %pM\n",
+       dev->name, dev->irq, dev->dev_addr);
 
     return 0;
 
@@ -2595,7 +2594,6 @@ static int ray_cs_proc_show(struct seq_file *m, void *v)
     UCHAR *p;
     struct freq_hop_element *pfh;
     UCHAR c[33];
-    DECLARE_MAC_BUF(mac);
 
     link = this_device;
     if (!link)
@@ -2623,8 +2621,7 @@ static int ray_cs_proc_show(struct seq_file *m, void *v)
                    nettype[local->sparm.b5.a_network_type], c);
 
     p = local->bss_id;
-    seq_printf(m, "BSSID                = %s\n",
-                   print_mac(mac, p));
+    seq_printf(m, "BSSID                = %pM\n", p);
 
     seq_printf(m, "Country code         = %d\n",
                    local->sparm.b5.a_curr_country_code);
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 2b414899dfa0..bd059e3c7e2b 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -1276,12 +1276,11 @@ static int rndis_iw_get_bssid(struct net_device *dev,
         struct usbnet *usbdev = dev->priv;
         unsigned char bssid[ETH_ALEN];
         int ret;
-        DECLARE_MAC_BUF(mac);
 
         ret = get_bssid(usbdev, bssid);
 
         if (ret == 0)
-                devdbg(usbdev, "SIOCGIWAP: %s", print_mac(mac, bssid));
+                devdbg(usbdev, "SIOCGIWAP: %pM", bssid);
         else
                 devdbg(usbdev, "SIOCGIWAP: <not associated>");
 
@@ -1297,10 +1296,9 @@ static int rndis_iw_set_bssid(struct net_device *dev,
 {
         struct usbnet *usbdev = dev->priv;
         u8 *bssid = (u8 *)wrqu->ap_addr.sa_data;
-        DECLARE_MAC_BUF(mac);
         int ret;
 
-        devdbg(usbdev, "SIOCSIWAP: %s", print_mac(mac, bssid));
+        devdbg(usbdev, "SIOCSIWAP: %pM", bssid);
 
         ret = rndis_set_oid(usbdev, OID_802_11_BSSID, bssid, ETH_ALEN);
 
@@ -1660,11 +1658,10 @@ static char *rndis_translate_scan(struct net_device *dev,
         u32 beacon, atim;
         struct iw_event iwe;
         unsigned char sbuf[32];
-        DECLARE_MAC_BUF(mac);
 
         bssid_len = le32_to_cpu(bssid->length);
 
-        devdbg(usbdev, "BSSID %s", print_mac(mac, bssid->mac));
+        devdbg(usbdev, "BSSID %pM", bssid->mac);
         iwe.cmd = SIOCGIWAP;
         iwe.u.ap_addr.sa_family = ARPHRD_ETHER;
         memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN);
diff --git a/drivers/net/wireless/rt2x00/rt2400pci.c b/drivers/net/wireless/rt2x00/rt2400pci.c
index 08cb9eec16a6..96eaf5f4dc68 100644
--- a/drivers/net/wireless/rt2x00/rt2400pci.c
+++ b/drivers/net/wireless/rt2x00/rt2400pci.c
@@ -1313,10 +1313,8 @@ static int rt2400pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
          */
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
-                DECLARE_MAC_BUF(macbuf);
-
                 random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %s\n", print_mac(macbuf, mac));
+                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rt2x00/rt2500pci.c b/drivers/net/wireless/rt2x00/rt2500pci.c
index ef42cc04a2d7..8b772ab613e4 100644
--- a/drivers/net/wireless/rt2x00/rt2500pci.c
+++ b/drivers/net/wireless/rt2x00/rt2500pci.c
@@ -1451,11 +1451,8 @@ static int rt2500pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
          */
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
-                DECLARE_MAC_BUF(macbuf);
-
                 random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %s\n",
-                       print_mac(macbuf, mac));
+                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rt2x00/rt2500usb.c b/drivers/net/wireless/rt2x00/rt2500usb.c
index d3bf7bba611a..d19bee43861d 100644
--- a/drivers/net/wireless/rt2x00/rt2500usb.c
+++ b/drivers/net/wireless/rt2x00/rt2500usb.c
@@ -1319,10 +1319,8 @@ static int rt2500usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
          */
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
-                DECLARE_MAC_BUF(macbuf);
-
                 random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %s\n", print_mac(macbuf, mac));
+                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rt2x00/rt2x00pci.c b/drivers/net/wireless/rt2x00/rt2x00pci.c
index adf2876ed8ab..62449da577e5 100644
--- a/drivers/net/wireless/rt2x00/rt2x00pci.c
+++ b/drivers/net/wireless/rt2x00/rt2x00pci.c
@@ -222,8 +222,7 @@ static int rt2x00pci_alloc_reg(struct rt2x00_dev *rt2x00dev)
 {
         struct pci_dev *pci_dev = to_pci_dev(rt2x00dev->dev);
 
-        rt2x00dev->csr.base = ioremap(pci_resource_start(pci_dev, 0),
-                                      pci_resource_len(pci_dev, 0));
+        rt2x00dev->csr.base = pci_ioremap_bar(pci_dev, 0);
         if (!rt2x00dev->csr.base)
                 goto exit;
 
diff --git a/drivers/net/wireless/rt2x00/rt61pci.c b/drivers/net/wireless/rt2x00/rt61pci.c
index a461620b489f..45f69f83552c 100644
--- a/drivers/net/wireless/rt2x00/rt61pci.c
+++ b/drivers/net/wireless/rt2x00/rt61pci.c
@@ -2175,10 +2175,8 @@ static int rt61pci_validate_eeprom(struct rt2x00_dev *rt2x00dev)
          */
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
-                DECLARE_MAC_BUF(macbuf);
-
                 random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %s\n", print_mac(macbuf, mac));
+                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rt2x00/rt73usb.c b/drivers/net/wireless/rt2x00/rt73usb.c
index 934f8e03c5aa..336fecb04c46 100644
--- a/drivers/net/wireless/rt2x00/rt73usb.c
+++ b/drivers/net/wireless/rt2x00/rt73usb.c
@@ -1781,10 +1781,8 @@ static int rt73usb_validate_eeprom(struct rt2x00_dev *rt2x00dev)
          */
         mac = rt2x00_eeprom_addr(rt2x00dev, EEPROM_MAC_ADDR_0);
         if (!is_valid_ether_addr(mac)) {
-                DECLARE_MAC_BUF(macbuf);
-
                 random_ether_addr(mac);
-                EEPROM(rt2x00dev, "MAC: %s\n", print_mac(macbuf, mac));
+                EEPROM(rt2x00dev, "MAC: %pM\n", mac);
         }
 
         rt2x00_eeprom_read(rt2x00dev, EEPROM_ANTENNA, &word);
diff --git a/drivers/net/wireless/rtl8180_dev.c b/drivers/net/wireless/rtl8180_dev.c
index df7e78ee8a88..9de8f57486df 100644
--- a/drivers/net/wireless/rtl8180_dev.c
+++ b/drivers/net/wireless/rtl8180_dev.c
@@ -806,7 +806,6 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
         const char *chip_name, *rf_name = NULL;
         u32 reg;
         u16 eeprom_val;
-        DECLARE_MAC_BUF(mac);
 
         err = pci_enable_device(pdev);
         if (err) {
@@ -1002,8 +1001,8 @@ static int __devinit rtl8180_probe(struct pci_dev *pdev,
                 goto err_iounmap;
         }
 
-        printk(KERN_INFO "%s: hwaddr %s, %s + %s\n",
-               wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),
+        printk(KERN_INFO "%s: hwaddr %pM, %s + %s\n",
+               wiphy_name(dev->wiphy), dev->wiphy->perm_addr,
                chip_name, priv->rf->name);
 
         return 0;
diff --git a/drivers/net/wireless/rtl8187_dev.c b/drivers/net/wireless/rtl8187_dev.c
index 431e3c78bf27..9ceae9017f86 100644
--- a/drivers/net/wireless/rtl8187_dev.c
+++ b/drivers/net/wireless/rtl8187_dev.c
@@ -1026,7 +1026,6 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         const char *chip_name;
         u16 txpwr, reg;
         int err, i;
-        DECLARE_MAC_BUF(mac);
 
         dev = ieee80211_alloc_hw(sizeof(*priv), &rtl8187_ops);
         if (!dev) {
@@ -1209,8 +1208,8 @@ static int __devinit rtl8187_probe(struct usb_interface *intf,
         }
         mutex_init(&priv->conf_mutex);
 
-        printk(KERN_INFO "%s: hwaddr %s, %s V%d + %s\n",
-               wiphy_name(dev->wiphy), print_mac(mac, dev->wiphy->perm_addr),
+        printk(KERN_INFO "%s: hwaddr %pM, %s V%d + %s\n",
+               wiphy_name(dev->wiphy), dev->wiphy->perm_addr,
                chip_name, priv->asic_rev, priv->rf->name);
 
         return 0;
diff --git a/drivers/net/wireless/wavelan.c b/drivers/net/wireless/wavelan.c
index e939a73ff794..6fa3d792ae27 100644
--- a/drivers/net/wireless/wavelan.c
+++ b/drivers/net/wireless/wavelan.c
@@ -859,8 +859,6 @@ static void wv_82586_reconfig(struct net_device * dev)
  */
 static void wv_psa_show(psa_t * p)
 {
-        DECLARE_MAC_BUF(mac);
-
         printk(KERN_DEBUG "##### WaveLAN PSA contents: #####\n");
         printk(KERN_DEBUG "psa_io_base_addr_1: 0x%02X %02X %02X %02X\n",
                p->psa_io_base_addr_1,
@@ -872,13 +870,10 @@ static void wv_psa_show(psa_t * p)
         printk(KERN_DEBUG "psa_holi_params: 0x%02x, ", p->psa_holi_params);
         printk("psa_int_req_no: %d\n", p->psa_int_req_no);
 #ifdef DEBUG_SHOW_UNUSED
-        printk(KERN_DEBUG "psa_unused0[]: %s\n",
-               print_mac(mac, p->psa_unused0));
+        printk(KERN_DEBUG "psa_unused0[]: %pM\n", p->psa_unused0);
 #endif                          /* DEBUG_SHOW_UNUSED */
-        printk(KERN_DEBUG "psa_univ_mac_addr[]: %s\n",
-               print_mac(mac, p->psa_univ_mac_addr));
-        printk(KERN_DEBUG "psa_local_mac_addr[]: %s\n",
-               print_mac(mac, p->psa_local_mac_addr));
+        printk(KERN_DEBUG "psa_univ_mac_addr[]: %pM\n", p->psa_univ_mac_addr);
+        printk(KERN_DEBUG "psa_local_mac_addr[]: %pM\n", p->psa_local_mac_addr);
         printk(KERN_DEBUG "psa_univ_local_sel: %d, ",
                p->psa_univ_local_sel);
         printk("psa_comp_number: %d, ", p->psa_comp_number);
@@ -1220,14 +1215,13 @@ static inline void wv_packet_info(u8 * p,	/* Packet to dump */
 {                               /* Name of the function */
         int i;
         int maxi;
-        DECLARE_MAC_BUF(mac);
 
         printk(KERN_DEBUG
-               "%s: %s(): dest %s, length %d\n",
-               msg1, msg2, print_mac(mac, p), length);
+               "%s: %s(): dest %pM, length %d\n",
+               msg1, msg2, p, length);
         printk(KERN_DEBUG
-               "%s: %s(): src %s, type 0x%02X%02X\n",
-               msg1, msg2, print_mac(mac, &p[6]), p[12], p[13]);
+               "%s: %s(): src %pM, type 0x%02X%02X\n",
+               msg1, msg2, &p[6], p[12], p[13]);
 
 #ifdef DEBUG_PACKET_DUMP
 
@@ -1258,9 +1252,6 @@ static void wv_init_info(struct net_device * dev)
         short ioaddr = dev->base_addr;
         net_local *lp = (net_local *) dev->priv;
         psa_t psa;
-#ifdef DEBUG_BASIC_SHOW
-        DECLARE_MAC_BUF(mac);
-#endif
 
         /* Read the parameter storage area */
         psa_read(ioaddr, lp->hacr, 0, (unsigned char *) &psa, sizeof(psa));
@@ -1277,8 +1268,8 @@ static void wv_init_info(struct net_device * dev)
 
 #ifdef DEBUG_BASIC_SHOW
         /* Now, let's go for the basic stuff. */
-        printk(KERN_NOTICE "%s: WaveLAN at %#x, %s, IRQ %d",
-               dev->name, ioaddr, print_mac(mac, dev->dev_addr), dev->irq);
+        printk(KERN_NOTICE "%s: WaveLAN at %#x, %pM, IRQ %d",
+               dev->name, ioaddr, dev->dev_addr, dev->irq);
 
         /* Print current network ID. */
         if (psa.psa_nwid_select)
@@ -3565,15 +3556,11 @@ static void wv_82586_config(struct net_device * dev)
                               WAVELAN_ADDR_SIZE >> 1);
 
 #ifdef DEBUG_CONFIG_INFO
- {
-                DECLARE_MAC_BUF(mac);
                 printk(KERN_DEBUG
                        "%s: wv_82586_config(): set %d multicast addresses:\n",
                        dev->name, lp->mc_count);
                 for (dmi = dev->mc_list; dmi; dmi = dmi->next)
-                        printk(KERN_DEBUG " %s\n",
-                               print_mac(mac, dmi->dmi_addr));
- }
+                        printk(KERN_DEBUG " %pM\n", dmi->dmi_addr);
 #endif
         }
 
diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index e124b1d6267a..0a3bacc20d96 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -1020,7 +1020,6 @@ wv_82593_reconfig(struct net_device *	dev)
 static void
 wv_psa_show(psa_t *     p)
 {
-  DECLARE_MAC_BUF(mac);
   printk(KERN_DEBUG "##### wavelan psa contents: #####\n");
   printk(KERN_DEBUG "psa_io_base_addr_1: 0x%02X %02X %02X %02X\n",
          p->psa_io_base_addr_1,
@@ -1034,13 +1033,10 @@ wv_psa_show(psa_t *	p)
   printk(KERN_DEBUG "psa_holi_params: 0x%02x, ", p->psa_holi_params);
   printk("psa_int_req_no: %d\n", p->psa_int_req_no);
 #ifdef DEBUG_SHOW_UNUSED
-  printk(KERN_DEBUG "psa_unused0[]: %s\n",
-         print_mac(mac, p->psa_unused0));
+  printk(KERN_DEBUG "psa_unused0[]: %pM\n", p->psa_unused0);
 #endif  /* DEBUG_SHOW_UNUSED */
-  printk(KERN_DEBUG "psa_univ_mac_addr[]: %s\n",
-         print_mac(mac, p->psa_univ_mac_addr));
-  printk(KERN_DEBUG "psa_local_mac_addr[]: %s\n",
-         print_mac(mac, p->psa_local_mac_addr));
+  printk(KERN_DEBUG "psa_univ_mac_addr[]: %pM\n", p->psa_univ_mac_addr);
+  printk(KERN_DEBUG "psa_local_mac_addr[]: %pM\n", p->psa_local_mac_addr);
   printk(KERN_DEBUG "psa_univ_local_sel: %d, ", p->psa_univ_local_sel);
   printk("psa_comp_number: %d, ", p->psa_comp_number);
   printk("psa_thr_pre_set: 0x%02x\n", p->psa_thr_pre_set);
@@ -1238,12 +1234,11 @@ wv_packet_info(u_char *		p,		/* Packet to dump */
 {
   int           i;
   int           maxi;
-  DECLARE_MAC_BUF(mac);
 
-  printk(KERN_DEBUG "%s: %s(): dest %s, length %d\n",
-         msg1, msg2, print_mac(mac, p), length);
-  printk(KERN_DEBUG "%s: %s(): src %s, type 0x%02X%02X\n",
-         msg1, msg2, print_mac(mac, &p[6]), p[12], p[13]);
+  printk(KERN_DEBUG "%s: %s(): dest %pM, length %d\n",
+         msg1, msg2, p, length);
+  printk(KERN_DEBUG "%s: %s(): src %pM, type 0x%02X%02X\n",
+         msg1, msg2, &p[6], p[12], p[13]);
 
 #ifdef DEBUG_PACKET_DUMP
 
@@ -1274,7 +1269,6 @@ wv_init_info(struct net_device *	dev)
 {
   unsigned int  base = dev->base_addr;
   psa_t         psa;
-  DECLARE_MAC_BUF(mac);
 
   /* Read the parameter storage area */
   psa_read(dev, 0, (unsigned char *) &psa, sizeof(psa));
@@ -1291,10 +1285,8 @@ wv_init_info(struct net_device *	dev)
 
 #ifdef DEBUG_BASIC_SHOW
   /* Now, let's go for the basic stuff */
-  printk(KERN_NOTICE "%s: WaveLAN: port %#x, irq %d, "
-         "hw_addr %s",
-         dev->name, base, dev->irq,
-         print_mac(mac, dev->dev_addr));
+  printk(KERN_NOTICE "%s: WaveLAN: port %#x, irq %d, hw_addr %pM",
+         dev->name, base, dev->irq, dev->dev_addr);
 
   /* Print current network id */
   if(psa.psa_nwid_select)
@@ -2243,13 +2235,7 @@ static int wavelan_set_wap(struct net_device *dev,
                            char *extra)
 {
 #ifdef DEBUG_IOCTL_INFO
-        printk(KERN_DEBUG "Set AP to : %02X:%02X:%02X:%02X:%02X:%02X\n",
-               wrqu->ap_addr.sa_data[0],
-               wrqu->ap_addr.sa_data[1],
-               wrqu->ap_addr.sa_data[2],
-               wrqu->ap_addr.sa_data[3],
-               wrqu->ap_addr.sa_data[4],
-               wrqu->ap_addr.sa_data[5]);
+        printk(KERN_DEBUG "Set AP to : %pM\n", wrqu->ap_addr.sa_data);
 #endif  /* DEBUG_IOCTL_INFO */
 
         return -EOPNOTSUPP;
@@ -3647,12 +3633,10 @@ wv_82593_config(struct net_device *	dev)
       int                       addrs_len = WAVELAN_ADDR_SIZE * lp->mc_count;
 
 #ifdef DEBUG_CONFIG_INFO
-      DECLARE_MAC_BUF(mac);
       printk(KERN_DEBUG "%s: wv_hw_config(): set %d multicast addresses:\n",
              dev->name, lp->mc_count);
       for(dmi=dev->mc_list; dmi; dmi=dmi->next)
-        printk(KERN_DEBUG " %s\n",
-               print_mac(mac, dmi->dmi_addr));
+        printk(KERN_DEBUG " %pM\n", dmi->dmi_addr);
 #endif
 
       /* Initialize adapter's ethernet multicast addresses */
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 68789c6e1ce9..8b96f50d9c6f 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -860,10 +860,9 @@ static int wl3501_esbq_confirm(struct wl3501_card *this)
 static void wl3501_online(struct net_device *dev)
 {
         struct wl3501_card *this = netdev_priv(dev);
-        DECLARE_MAC_BUF(mac);
 
-        printk(KERN_INFO "%s: Wireless LAN online. BSSID: %s\n",
-               dev->name, print_mac(mac, this->bssid));
+        printk(KERN_INFO "%s: Wireless LAN online. BSSID: %pM\n",
+               dev->name, this->bssid);
         netif_wake_queue(dev);
 }
 
@@ -1965,7 +1964,6 @@ static int wl3501_config(struct pcmcia_device *link)
         struct net_device *dev = link->priv;
         int i = 0, j, last_fn, last_ret;
         struct wl3501_card *this;
-        DECLARE_MAC_BUF(mac);
 
         /* Try allocating IO ports.  This tries a few fixed addresses.  If you
          * want, you can also read the card's config table to pick addresses --
@@ -2024,9 +2022,9 @@ static int wl3501_config(struct pcmcia_device *link)
 
         /* print probe information */
         printk(KERN_INFO "%s: wl3501 @ 0x%3.3x, IRQ %d, "
-               "MAC addr in flash ROM:%s\n",
+               "MAC addr in flash ROM:%pM\n",
                dev->name, this->base_addr, (int)dev->irq,
-               print_mac(mac, dev->dev_addr));
+               dev->dev_addr);
         /*
          * Initialize card parameters - added by jss
          */
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index e0ac58b8ff1f..f1519143f8a6 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -378,7 +378,6 @@ int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
                 [0] = { .addr = CR_MAC_ADDR_P1 },
                 [1] = { .addr = CR_MAC_ADDR_P2 },
         };
-        DECLARE_MAC_BUF(mac);
 
         if (mac_addr) {
                 reqs[0].value = (mac_addr[3] << 24)
@@ -387,8 +386,7 @@ int zd_write_mac_addr(struct zd_chip *chip, const u8 *mac_addr)
                               |  mac_addr[0];
                 reqs[1].value = (mac_addr[5] <<  8)
                               |  mac_addr[4];
-                dev_dbg_f(zd_chip_dev(chip),
-                        "mac addr %s\n", print_mac(mac, mac_addr));
+                dev_dbg_f(zd_chip_dev(chip), "mac addr %pM\n", mac_addr);
         } else {
                 dev_dbg_f(zd_chip_dev(chip), "set NULL mac\n");
         }
diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index fe1867b25ff7..de45509d757e 100644
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -852,14 +852,12 @@ static void zd_op_configure_filter(struct ieee80211_hw *hw,
         if (*new_flags & (FIF_PROMISC_IN_BSS | FIF_ALLMULTI)) {
                 zd_mc_add_all(&hash);
         } else {
-                DECLARE_MAC_BUF(macbuf);
-
                 zd_mc_clear(&hash);
                 for (i = 0; i < mc_count; i++) {
                         if (!mclist)
                                 break;
-                        dev_dbg_f(zd_mac_dev(mac), "mc addr %s\n",
-                                  print_mac(macbuf, mclist->dmi_addr));
+                        dev_dbg_f(zd_mac_dev(mac), "mc addr %pM\n",
+                                  mclist->dmi_addr);
                         zd_mc_add_addr(&hash, mclist->dmi_addr);
                         mclist = mclist->next;
                 }
diff --git a/drivers/net/xtsonic.c b/drivers/net/xtsonic.c
index da42aa06a3ba..03a3f34e9039 100644
--- a/drivers/net/xtsonic.c
+++ b/drivers/net/xtsonic.c
@@ -239,8 +239,6 @@ int __init xtsonic_probe(struct platform_device *pdev)
         struct resource *resmem, *resirq;
         int err = 0;
 
-        DECLARE_MAC_BUF(mac);
-
         if ((resmem = platform_get_resource(pdev, IORESOURCE_MEM, 0)) == NULL)
                 return -ENODEV;
 
@@ -263,8 +261,8 @@ int __init xtsonic_probe(struct platform_device *pdev)
         if ((err = register_netdev(dev)))
                 goto out1;
 
-        printk("%s: SONIC ethernet @%08lx, MAC %s, IRQ %d\n", dev->name,
-               dev->base_addr, print_mac(mac, dev->dev_addr), dev->irq);
+        printk("%s: SONIC ethernet @%08lx, MAC %pM, IRQ %d\n", dev->name,
+               dev->base_addr, dev->dev_addr, dev->irq);
 
         return 0;
 
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c
index 57e1f495b9fc..511066688810 100644
--- a/drivers/net/yellowfin.c
+++ b/drivers/net/yellowfin.c
@@ -374,7 +374,6 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
 #else
         int bar = 1;
 #endif
-        DECLARE_MAC_BUF(mac);
 
 /* when built into the kernel, we only print version if device is found */
 #ifndef MODULE
@@ -481,10 +480,10 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev,
         if (i)
                 goto err_out_unmap_status;
 
-        printk(KERN_INFO "%s: %s type %8x at %p, %s, IRQ %d.\n",
+        printk(KERN_INFO "%s: %s type %8x at %p, %pM, IRQ %d.\n",
                    dev->name, pci_id_tbl[chip_idx].name,
                    ioread32(ioaddr + ChipRev), ioaddr,
-                   print_mac(mac, dev->dev_addr), irq);
+                   dev->dev_addr, irq);
 
         if (np->drv_flags & HasMII) {
                 int phy, phy_idx = 0;
@@ -1100,11 +1099,9 @@ static int yellowfin_rx(struct net_device *dev)
                         memcmp(le32_to_cpu(yp->rx_ring_dma +
                                 entry*sizeof(struct yellowfin_desc)),
                                 "\377\377\377\377\377\377", 6) != 0) {
-                        if (bogus_rx++ == 0) {
-                                DECLARE_MAC_BUF(mac);
-                                printk(KERN_WARNING "%s: Bad frame to %s\n",
-                                           dev->name, print_mac(mac, buf_addr));
-                        }
+                        if (bogus_rx++ == 0)
+                                printk(KERN_WARNING "%s: Bad frame to %pM\n",
+                                           dev->name, buf_addr);
 #endif
                 } else {
                         struct sk_buff *skb;
diff --git a/drivers/net/znet.c b/drivers/net/znet.c
index a86c022d6a94..fc7a8849306f 100644
--- a/drivers/net/znet.c
+++ b/drivers/net/znet.c
@@ -370,7 +370,6 @@ static int __init znet_probe (void)
         struct net_device *dev;
         char *p;
         int err = -ENOMEM;
-        DECLARE_MAC_BUF(mac);
 
         /* This code scans the region 0xf0000 to 0xfffff for a "NETIDBLK". */
         for(p = (char *)phys_to_virt(0xf0000); p < (char *)phys_to_virt(0x100000); p++)
@@ -397,9 +396,9 @@ static int __init znet_probe (void)
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = netinfo->netid[i];
 
-        printk(KERN_INFO "%s: ZNET at %#3lx, %s"
+        printk(KERN_INFO "%s: ZNET at %#3lx, %pM"
                ", using IRQ %d DMA %d and %d.\n",
-               dev->name, dev->base_addr, print_mac(mac, dev->dev_addr),
+               dev->name, dev->base_addr, dev->dev_addr,
                dev->irq, netinfo->dma1, netinfo->dma2);
 
         if (znet_debug > 1) {
diff --git a/drivers/net/zorro8390.c b/drivers/net/zorro8390.c
index 3926b2aa9cca..9c73df4a0d30 100644
--- a/drivers/net/zorro8390.c
+++ b/drivers/net/zorro8390.c
@@ -151,7 +151,6 @@ static int __devinit zorro8390_init(struct net_device *dev,
         0x00, 0x02, 0x04, 0x06, 0x08, 0x0a, 0x0c, 0x0e,
         0x10, 0x12, 0x14, 0x16, 0x18, 0x1a, 0x1c, 0x1e,
     };
-    DECLARE_MAC_BUF(mac);
 
     /* Reset card. Who knows what dain-bramaged state it was left in. */
     {
@@ -216,7 +215,7 @@ static int __devinit zorro8390_init(struct net_device *dev,
         dev->dev_addr[i] = SA_prom[i];
 
 #ifdef DEBUG
-    printk("%s", print_mac(mac, dev->dev_addr));
+    printk("%pM", dev->dev_addr);
 #endif
 
     ei_status.name = name;
@@ -244,8 +243,8 @@ static int __devinit zorro8390_init(struct net_device *dev,
         return err;
     }
 
-    printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address %s\n",
-           dev->name, name, board, print_mac(mac, dev->dev_addr));
+    printk(KERN_INFO "%s: %s at 0x%08lx, Ethernet Address %pM\n",
+           dev->name, name, board, dev->dev_addr);
 
     return 0;
 }
diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index 1b1e80336d2c..8a8fad7a8bea 100644
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -131,17 +131,13 @@ static int qeth_l2_send_setgroupmac_cb(struct qeth_card *card,
         mac = &cmd->data.setdelmac.mac[0];
         /* MAC already registered, needed in couple/uncouple case */
         if (cmd->hdr.return_code == 0x2005) {
-                QETH_DBF_MESSAGE(2, "Group MAC %02x:%02x:%02x:%02x:%02x:%02x "
-                          "already existing on %s \n",
-                          mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                          QETH_CARD_IFNAME(card));
+                QETH_DBF_MESSAGE(2, "Group MAC %pM already existing on %s \n",
+                          mac, QETH_CARD_IFNAME(card));
                 cmd->hdr.return_code = 0;
         }
         if (cmd->hdr.return_code)
-                QETH_DBF_MESSAGE(2, "Could not set group MAC "
-                          "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
-                          mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                          QETH_CARD_IFNAME(card), cmd->hdr.return_code);
+                QETH_DBF_MESSAGE(2, "Could not set group MAC %pM on %s: %x\n",
+                          mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
         return 0;
 }
 
@@ -163,10 +159,8 @@ static int qeth_l2_send_delgroupmac_cb(struct qeth_card *card,
         cmd = (struct qeth_ipa_cmd *) data;
         mac = &cmd->data.setdelmac.mac[0];
         if (cmd->hdr.return_code)
-                QETH_DBF_MESSAGE(2, "Could not delete group MAC "
-                          "%02x:%02x:%02x:%02x:%02x:%02x on %s: %x\n",
-                          mac[0], mac[1], mac[2], mac[3], mac[4], mac[5],
-                          QETH_CARD_IFNAME(card), cmd->hdr.return_code);
+                QETH_DBF_MESSAGE(2, "Could not delete group MAC %pM on %s: %x\n",
+                          mac, QETH_CARD_IFNAME(card), cmd->hdr.return_code);
         return 0;
 }
 
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c
index ed6c54cae7b1..24d09028a27f 100644
--- a/drivers/scsi/iscsi_tcp.c
+++ b/drivers/scsi/iscsi_tcp.c
@@ -1608,7 +1608,7 @@ static int iscsi_tcp_get_addr(struct iscsi_conn *conn, struct socket *sock,
         case AF_INET6:
                 sin6 = (struct sockaddr_in6 *)addr;
                 spin_lock_bh(&conn->session->lock);
-                sprintf(buf, NIP6_FMT, NIP6(sin6->sin6_addr));
+                sprintf(buf, "%pI6", &sin6->sin6_addr);
                 *port = be16_to_cpu(sin6->sin6_port);
                 spin_unlock_bh(&conn->session->lock);
                 break;
diff --git a/drivers/usb/atm/cxacru.c b/drivers/usb/atm/cxacru.c
index 9aea43a8c4ad..5ed4ae07bac1 100644
--- a/drivers/usb/atm/cxacru.c
+++ b/drivers/usb/atm/cxacru.c
@@ -286,9 +286,7 @@ static ssize_t cxacru_sysfs_show_mac_address(struct device *dev,
         struct usbatm_data *usbatm_instance = usb_get_intfdata(intf);
         struct atm_dev *atm_dev = usbatm_instance->atm_dev;
 
-        return snprintf(buf, PAGE_SIZE, "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                        atm_dev->esi[0], atm_dev->esi[1], atm_dev->esi[2],
-                        atm_dev->esi[3], atm_dev->esi[4], atm_dev->esi[5]);
+        return snprintf(buf, PAGE_SIZE, "%pM\n", atm_dev->esi);
 }
 
 static ssize_t cxacru_sysfs_show_adsl_state(struct device *dev,
diff --git a/drivers/usb/atm/usbatm.c b/drivers/usb/atm/usbatm.c
index 06dd114910d4..fbea8563df1e 100644
--- a/drivers/usb/atm/usbatm.c
+++ b/drivers/usb/atm/usbatm.c
@@ -770,10 +770,7 @@ static int usbatm_atm_proc_read(struct atm_dev *atm_dev, loff_t * pos, char *pag
                 return sprintf(page, "%s\n", instance->description);
 
         if (!left--)
-                return sprintf(page, "MAC: %02x:%02x:%02x:%02x:%02x:%02x\n",
-                               atm_dev->esi[0], atm_dev->esi[1],
-                               atm_dev->esi[2], atm_dev->esi[3],
-                               atm_dev->esi[4], atm_dev->esi[5]);
+                return sprintf(page, "MAC: %pM\n", atm_dev->esi);
 
         if (!left--)
                 return sprintf(page,
diff --git a/drivers/usb/gadget/u_ether.c b/drivers/usb/gadget/u_ether.c
index 66948b72bb9b..00fa5239879d 100644
--- a/drivers/usb/gadget/u_ether.c
+++ b/drivers/usb/gadget/u_ether.c
@@ -787,10 +787,8 @@ int __init gether_setup(struct usb_gadget *g, u8 ethaddr[ETH_ALEN])
                 dev_dbg(&g->dev, "register_netdev failed, %d\n", status);
                 free_netdev(net);
         } else {
-                DECLARE_MAC_BUF(tmp);
-
-                INFO(dev, "MAC %s\n", print_mac(tmp, net->dev_addr));
-                INFO(dev, "HOST MAC %s\n", print_mac(tmp, dev->host_mac));
+                INFO(dev, "MAC %pM\n", net->dev_addr);
+                INFO(dev, "HOST MAC %pM\n", dev->host_mac);
 
                 the_dev = dev;
         }
diff --git a/drivers/uwb/wlp/eda.c b/drivers/uwb/wlp/eda.c
index cdfe8dfc4340..10985fa233cc 100644
--- a/drivers/uwb/wlp/eda.c
+++ b/drivers/uwb/wlp/eda.c
@@ -313,12 +313,9 @@ int wlp_eda_for_virtual(struct wlp_eda *eda,
         list_for_each_entry(itr, &eda->cache, list_node) {
                 if (!memcmp(itr->virt_addr, virt_addr,
                            sizeof(itr->virt_addr))) {
-                        d_printf(6, dev, "EDA: looking for "
-                               "%02x:%02x:%02x:%02x:%02x:%02x hit %02x:%02x "
+                        d_printf(6, dev, "EDA: looking for %pM hit %02x:%02x "
                                "wss %p tag 0x%02x state %u\n",
-                               virt_addr[0], virt_addr[1],
-                               virt_addr[2], virt_addr[3],
-                               virt_addr[4], virt_addr[5],
+                               virt_addr,
                                itr->dev_addr.data[1],
                                itr->dev_addr.data[0], itr->wss,
                                itr->tag, itr->state);
@@ -327,24 +324,13 @@ int wlp_eda_for_virtual(struct wlp_eda *eda,
                         found = 1;
                         break;
                 } else
-                        d_printf(6, dev, "EDA: looking for "
-                               "%02x:%02x:%02x:%02x:%02x:%02x "
-                               "against "
-                               "%02x:%02x:%02x:%02x:%02x:%02x miss\n",
-                               virt_addr[0], virt_addr[1],
-                               virt_addr[2], virt_addr[3],
-                               virt_addr[4], virt_addr[5],
-                               itr->virt_addr[0], itr->virt_addr[1],
-                               itr->virt_addr[2], itr->virt_addr[3],
-                               itr->virt_addr[4], itr->virt_addr[5]);
+                        d_printf(6, dev, "EDA: looking for %pM against %pM miss\n",
+                                 virt_addr, itr->virt_addr);
         }
         if (!found) {
                 if (printk_ratelimit())
-                        dev_err(dev, "EDA: Eth addr %02x:%02x:%02x"
-                                ":%02x:%02x:%02x not found.\n",
-                                virt_addr[0], virt_addr[1],
-                                virt_addr[2], virt_addr[3],
-                                virt_addr[4], virt_addr[5]);
+                        dev_err(dev, "EDA: Eth addr %pM not found.\n",
+                                virt_addr);
                 result = -ENODEV;
         }
         spin_unlock_irqrestore(&eda->lock, flags);
@@ -380,19 +366,13 @@ ssize_t wlp_eda_show(struct wlp *wlp, char *buf)
                            "tag state virt_addr\n");
         list_for_each_entry(entry, &eda->cache, list_node) {
                 result += scnprintf(buf + result, PAGE_SIZE - result,
-                                    "%02x:%02x:%02x:%02x:%02x:%02x %02x:%02x "
-                                    "%p 0x%02x %s "
-                                    "%02x:%02x:%02x:%02x:%02x:%02x\n",
-                                    entry->eth_addr[0], entry->eth_addr[1],
-                                    entry->eth_addr[2], entry->eth_addr[3],
-                                    entry->eth_addr[4], entry->eth_addr[5],
+                                    "%pM %02x:%02x %p 0x%02x %s %pM\n",
+                                    entry->eth_addr,
                                     entry->dev_addr.data[1],
                                     entry->dev_addr.data[0], entry->wss,
                                     entry->tag,
                                     wlp_wss_connect_state_str(entry->state),
-                                    entry->virt_addr[0], entry->virt_addr[1],
-                                    entry->virt_addr[2], entry->virt_addr[3],
-                                    entry->virt_addr[4], entry->virt_addr[5]);
+                                    entry->virt_addr);
                 if (result >= PAGE_SIZE)
                         break;
         }