Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

15 files changed, 89 insertions, 191 deletions

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/amso1100/c2_provider.c b/drivers/infiniband/hw/amso1100/c2_provider.c
index 69580e282af0..5119d6508181 100644
--- a/drivers/infiniband/hw/amso1100/c2_provider.c
+++ b/drivers/infiniband/hw/amso1100/c2_provider.c
@@ -653,7 +653,7 @@ static int c2_service_destroy(struct iw_cm_id *cm_id)
 static int c2_pseudo_up(struct net_device *netdev)
 {
         struct in_device *ind;
-        struct c2_dev *c2dev = netdev->priv;
+        struct c2_dev *c2dev = netdev->ml_priv;
 
         ind = in_dev_get(netdev);
         if (!ind)
@@ -678,7 +678,7 @@ static int c2_pseudo_up(struct net_device *netdev)
 static int c2_pseudo_down(struct net_device *netdev)
 {
         struct in_device *ind;
-        struct c2_dev *c2dev = netdev->priv;
+        struct c2_dev *c2dev = netdev->ml_priv;
 
         ind = in_dev_get(netdev);
         if (!ind)
@@ -746,14 +746,14 @@ static struct net_device *c2_pseudo_netdev_init(struct c2_dev *c2dev)
         /* change ethxxx to iwxxx */
         strcpy(name, "iw");
         strcat(name, &c2dev->netdev->name[3]);
-        netdev = alloc_netdev(sizeof(*netdev), name, setup);
+        netdev = alloc_netdev(0, name, setup);
         if (!netdev) {
                 printk(KERN_ERR PFX "%s -  etherdev alloc failed",
                         __func__);
                 return NULL;
         }
 
-        netdev->priv = c2dev;
+        netdev->ml_priv = c2dev;
 
         SET_NETDEV_DEV(netdev, &c2dev->pcidev->dev);
 
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 aa1dc41f04c8..b9611ade9eab 100644
--- a/drivers/infiniband/hw/nes/nes.c
+++ b/drivers/infiniband/hw/nes/nes.c
@@ -142,14 +142,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);
@@ -360,10 +355,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 cb48041bed69..a812db243477 100644
--- a/drivers/infiniband/hw/nes/nes_cm.c
+++ b/drivers/infiniband/hw/nes/nes_cm.c
@@ -782,8 +782,8 @@ static struct nes_cm_node *find_node(struct nes_cm_core *cm_core,
         /* get a handle on the hte */
         hte = &cm_core->connected_nodes;
 
-        nes_debug(NES_DBG_CM, "Searching for an owner node: " NIPQUAD_FMT ":%x from core %p->%p\n",
-                  HIPQUAD(loc_addr), loc_port, cm_core, hte);
+        nes_debug(NES_DBG_CM, "Searching for an owner node: %pI4:%x from core %p->%p\n",
+                  &loc_addr, loc_port, cm_core, hte);
 
         /* walk list and find cm_node associated with this session ID */
         spin_lock_irqsave(&cm_core->ht_lock, flags);
@@ -832,8 +832,8 @@ static struct nes_cm_listener *find_listener(struct nes_cm_core *cm_core,
         }
         spin_unlock_irqrestore(&cm_core->listen_list_lock, flags);
 
-        nes_debug(NES_DBG_CM, "Unable to find listener for " NIPQUAD_FMT ":%x\n",
-                  HIPQUAD(dst_addr), dst_port);
+        nes_debug(NES_DBG_CM, "Unable to find listener for %pI4:%x\n",
+                  &dst_addr, dst_port);
 
         /* no listener */
         return NULL;
@@ -988,7 +988,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);
@@ -1002,8 +1001,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,
@@ -1032,7 +1031,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);
@@ -1045,10 +1043,9 @@ static struct nes_cm_node *make_cm_node(struct nes_cm_core *cm_core,
         cm_node->loc_port = cm_info->loc_port;
         cm_node->rem_port = cm_info->rem_port;
         cm_node->send_write0 = send_first;
-        nes_debug(NES_DBG_CM, "Make node addresses : loc = " NIPQUAD_FMT
-                        ":%x, rem = " NIPQUAD_FMT ":%x\n",
-                        HIPQUAD(cm_node->loc_addr), cm_node->loc_port,
-                        HIPQUAD(cm_node->rem_addr), cm_node->rem_port);
+        nes_debug(NES_DBG_CM, "Make node addresses : loc = %pI4:%x, rem = %pI4:%x\n",
+                  &cm_node->loc_addr, cm_node->loc_port,
+                  &cm_node->rem_addr, cm_node->rem_port);
         cm_node->listener = listener;
         cm_node->netdev = nesvnic->netdev;
         cm_node->cm_id = cm_info->cm_id;
@@ -1101,8 +1098,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);
@@ -2077,10 +2074,8 @@ static int mini_cm_recv_pkt(struct nes_cm_core *cm_core,
         nfo.rem_addr = ntohl(iph->saddr);
         nfo.rem_port = ntohs(tcph->source);
 
-        nes_debug(NES_DBG_CM, "Received packet: dest=" NIPQUAD_FMT
-                  ":0x%04X src=" NIPQUAD_FMT ":0x%04X\n",
-                  NIPQUAD(iph->daddr), tcph->dest,
-                  NIPQUAD(iph->saddr), tcph->source);
+        nes_debug(NES_DBG_CM, "Received packet: dest=%pI4:0x%04X src=%pI4:0x%04X\n",
+                  &iph->daddr, tcph->dest, &iph->saddr, tcph->source);
 
         do {
                 cm_node = find_node(cm_core,
diff --git a/drivers/infiniband/hw/nes/nes_hw.c b/drivers/infiniband/hw/nes/nes_hw.c
index 8f70ff2dcc58..5d139db1b771 100644
--- a/drivers/infiniband/hw/nes/nes_hw.c
+++ b/drivers/infiniband/hw/nes/nes_hw.c
@@ -2541,7 +2541,7 @@ static void nes_nic_napi_ce_handler(struct nes_device *nesdev, struct nes_hw_nic
 {
         struct nes_vnic *nesvnic = container_of(cq, struct nes_vnic, nic_cq);
 
-        netif_rx_schedule(nesdev->netdev[nesvnic->netdev_index], &nesvnic->napi);
+        netif_rx_schedule(&nesvnic->napi);
 }
 
 
diff --git a/drivers/infiniband/hw/nes/nes_nic.c b/drivers/infiniband/hw/nes/nes_nic.c
index 730358637bb6..57a47cf7e513 100644
--- a/drivers/infiniband/hw/nes/nes_nic.c
+++ b/drivers/infiniband/hw/nes/nes_nic.c
@@ -99,7 +99,6 @@ static int nics_per_function = 1;
 static int nes_netdev_poll(struct napi_struct *napi, int budget)
 {
         struct nes_vnic *nesvnic = container_of(napi, struct nes_vnic, napi);
-        struct net_device *netdev = nesvnic->netdev;
         struct nes_device *nesdev = nesvnic->nesdev;
         struct nes_hw_nic_cq *nescq = &nesvnic->nic_cq;
 
@@ -112,7 +111,7 @@ static int nes_netdev_poll(struct napi_struct *napi, int budget)
         nes_nic_ce_handler(nesdev, nescq);
 
         if (nescq->cqes_pending == 0) {
-                netif_rx_complete(netdev, napi);
+                netif_rx_complete(napi);
                 /* clear out completed cqes and arm */
                 nes_write32(nesdev->regs+NES_CQE_ALLOC, NES_CQE_ALLOC_NOTIFY_NEXT |
                                 nescq->cq_number | (nescq->cqe_allocs_pending << 16));
@@ -797,14 +796,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 +907,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/hw/nes/nes_utils.c b/drivers/infiniband/hw/nes/nes_utils.c
index 5611a73d5831..aa9b7348c728 100644
--- a/drivers/infiniband/hw/nes/nes_utils.c
+++ b/drivers/infiniband/hw/nes/nes_utils.c
@@ -682,9 +682,8 @@ int nes_arp_table(struct nes_device *nesdev, u32 ip_addr, u8 *mac_addr, u32 acti
 
         /* DELETE or RESOLVE */
         if (arp_index == nesadapter->arp_table_size) {
-                nes_debug(NES_DBG_NETDEV, "MAC for " NIPQUAD_FMT " not in ARP table - cannot %s\n",
-                          HIPQUAD(ip_addr),
-                          action == NES_ARP_RESOLVE ? "resolve" : "delete");
+                nes_debug(NES_DBG_NETDEV, "MAC for %pI4 not in ARP table - cannot %s\n",
+                          &ip_addr, action == NES_ARP_RESOLVE ? "resolve" : "delete");
                 return -1;
         }
 
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_ib.c b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
index 28eb6f03c588..a1925810be3c 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_ib.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_ib.c
@@ -446,11 +446,11 @@ poll_more:
                 if (dev->features & NETIF_F_LRO)
                         lro_flush_all(&priv->lro.lro_mgr);
 
-                netif_rx_complete(dev, napi);
+                netif_rx_complete(napi);
                 if (unlikely(ib_req_notify_cq(priv->recv_cq,
                                               IB_CQ_NEXT_COMP |
                                               IB_CQ_REPORT_MISSED_EVENTS)) &&
-                    netif_rx_reschedule(dev, napi))
+                    netif_rx_reschedule(napi))
                         goto poll_more;
         }
 
@@ -462,7 +462,7 @@ void ipoib_ib_completion(struct ib_cq *cq, void *dev_ptr)
         struct net_device *dev = dev_ptr;
         struct ipoib_dev_priv *priv = netdev_priv(dev);
 
-        netif_rx_schedule(dev, &priv->napi);
+        netif_rx_schedule(&priv->napi);
 }
 
 static void drain_tx_cq(struct net_device *dev)
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index 85257f6b9576..19e06bc38b39 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -360,9 +360,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;
         }
 
@@ -414,11 +414,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);
 
@@ -528,8 +528,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);
 
@@ -766,12 +766,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;
@@ -847,9 +846,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/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index 6dc6b174cdd4..319b188145be 100644
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -516,14 +516,14 @@ int iser_connect(struct iser_conn   *ib_conn,
         struct sockaddr *src, *dst;
         int err = 0;
 
-        sprintf(ib_conn->name,"%d.%d.%d.%d:%d",
-                NIPQUAD(dst_addr->sin_addr.s_addr), dst_addr->sin_port);
+        sprintf(ib_conn->name, "%pI4:%d",
+                &dst_addr->sin_addr.s_addr, dst_addr->sin_port);
 
         /* the device is known only --after-- address resolution */
         ib_conn->device = NULL;
 
-        iser_err("connecting to: %d.%d.%d.%d, port 0x%x\n",
-                 NIPQUAD(dst_addr->sin_addr), dst_addr->sin_port);
+        iser_err("connecting to: %pI4, port 0x%x\n",
+                 &dst_addr->sin_addr, dst_addr->sin_port);
 
         ib_conn->state = ISER_CONN_PENDING;
 
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)