[PATCH] IB: sparse endianness cleanup

Fix sparse warnings.  Use __be* where appropriate.

Signed-off-by: Sean Hefty <sean.hefty@intel.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>

4 files changed, 8 insertions, 8 deletions

diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h
index b91d3ef01b92..e23041c7be8f 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib.h
+++ b/drivers/infiniband/ulp/ipoib/ipoib.h
@@ -90,8 +90,8 @@ enum {
 /* structs */
 
 struct ipoib_header {
-        u16 proto;
-        u16 reserved;
+        __be16  proto;
+        u16     reserved;
 };
 
 struct ipoib_pseudoheader {
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_fs.c b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
index a84e5fe0f193..38b150f775e7 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_fs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_fs.c
@@ -97,7 +97,7 @@ static int ipoib_mcg_seq_show(struct seq_file *file, void *iter_ptr)
 
                 for (n = 0, i = 0; i < sizeof mgid / 2; ++i) {
                         n += sprintf(gid_buf + n, "%x",
-                                     be16_to_cpu(((u16 *)mgid.raw)[i]));
+                                     be16_to_cpu(((__be16 *) mgid.raw)[i]));
                         if (i < sizeof mgid / 2 - 1)
                                 gid_buf[n++] = ':';
                 }
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
index d4300e4a36d8..7f349693b40a 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -609,8 +609,8 @@ static int ipoib_start_xmit(struct sk_buff *skb, struct net_device *dev)
                                 ipoib_warn(priv, "Unicast, no %s: type %04x, QPN %06x "
                                            IPOIB_GID_FMT "\n",
                                            skb->dst ? "neigh" : "dst",
-                                           be16_to_cpup((u16 *) skb->data),
-                                           be32_to_cpup((u32 *) phdr->hwaddr),
+                                           be16_to_cpup((__be16 *) skb->data),
+                                           be32_to_cpup((__be32 *) phdr->hwaddr),
                                            IPOIB_GID_ARG(*(union ib_gid *) (phdr->hwaddr + 4)));
                                 dev_kfree_skb_any(skb);
                                 ++priv->stats.tx_dropped;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
index e03b070d5222..aca7aea18a69 100644
--- a/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_multicast.c
@@ -359,7 +359,7 @@ static int ipoib_mcast_sendonly_join(struct ipoib_mcast *mcast)
 
         rec.mgid     = mcast->mcmember.mgid;
         rec.port_gid = priv->local_gid;
-        rec.pkey     = be16_to_cpu(priv->pkey);
+        rec.pkey     = cpu_to_be16(priv->pkey);
 
         ret = ib_sa_mcmember_rec_set(priv->ca, priv->port, &rec,
                                      IB_SA_MCMEMBER_REC_MGID            |
@@ -459,7 +459,7 @@ static void ipoib_mcast_join(struct net_device *dev, struct ipoib_mcast *mcast,
 
         rec.mgid     = mcast->mcmember.mgid;
         rec.port_gid = priv->local_gid;
-        rec.pkey     = be16_to_cpu(priv->pkey);
+        rec.pkey     = cpu_to_be16(priv->pkey);
 
         comp_mask =
                 IB_SA_MCMEMBER_REC_MGID         |
@@ -648,7 +648,7 @@ static int ipoib_mcast_leave(struct net_device *dev, struct ipoib_mcast *mcast)
 
         rec.mgid     = mcast->mcmember.mgid;
         rec.port_gid = priv->local_gid;
-        rec.pkey     = be16_to_cpu(priv->pkey);
+        rec.pkey     = cpu_to_be16(priv->pkey);
 
         /* Remove ourselves from the multicast group */
         ret = ipoib_mcast_detach(dev, be16_to_cpu(mcast->mcmember.mlid),