Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

1 files changed, 20 insertions, 16 deletions

diff --git a/drivers/infiniband/hw/mthca/mthca_mcg.c b/drivers/infiniband/hw/mthca/mthca_mcg.c
index 5be7d949dbf6..a2707605f4c8 100644
--- a/drivers/infiniband/hw/mthca/mthca_mcg.c
+++ b/drivers/infiniband/hw/mthca/mthca_mcg.c
@@ -42,10 +42,10 @@ enum {
 };
 
 struct mthca_mgm {
-        u32 next_gid_index;
-        u32 reserved[3];
-        u8  gid[16];
-        u32 qp[MTHCA_QP_PER_MGM];
+        __be32 next_gid_index;
+        u32    reserved[3];
+        u8     gid[16];
+        __be32 qp[MTHCA_QP_PER_MGM];
 };
 
 static const u8 zero_gid[16];   /* automatically initialized to 0 */
@@ -94,10 +94,14 @@ 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(((u16 *) gid)[0]), be16_to_cpu(((u16 *) gid)[1]),
-                          be16_to_cpu(((u16 *) gid)[2]), be16_to_cpu(((u16 *) gid)[3]),
-                          be16_to_cpu(((u16 *) gid)[4]), be16_to_cpu(((u16 *) gid)[5]),
-                          be16_to_cpu(((u16 *) gid)[6]), be16_to_cpu(((u16 *) gid)[7]),
+                          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);
 
         *index = *hash;
@@ -258,14 +262,14 @@ int mthca_multicast_detach(struct ib_qp *ibqp, union ib_gid *gid, u16 lid)
         if (index == -1) {
                 mthca_err(dev, "MGID %04x:%04x:%04x:%04x:%04x:%04x:%04x:%04x "
                           "not found\n",
-                          be16_to_cpu(((u16 *) gid->raw)[0]),
-                          be16_to_cpu(((u16 *) gid->raw)[1]),
-                          be16_to_cpu(((u16 *) gid->raw)[2]),
-                          be16_to_cpu(((u16 *) gid->raw)[3]),
-                          be16_to_cpu(((u16 *) gid->raw)[4]),
-                          be16_to_cpu(((u16 *) gid->raw)[5]),
-                          be16_to_cpu(((u16 *) gid->raw)[6]),
-                          be16_to_cpu(((u16 *) gid->raw)[7]));
+                          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]));
                 err = -EINVAL;
                 goto out;
         }