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).

7 files changed, 56 insertions, 115 deletions

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)