Merge branches 'cxgb3', 'endian', 'ipath', 'ipoib', 'iser', 'mad', 'misc', 'mlx4...

diff --combined drivers/infiniband/hw/cxgb3/iwch_qp.c
index 0e18f6f,48e2b0b,19661b2,19661b2,19661b2,19661b2,19661b2,19661b2,19661b2,19661b2,19661b2..c758fbd
--- 1/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 2/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 3/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 4/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 5/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 6/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 7/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 8/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 9/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 10/drivers/infiniband/hw/cxgb3/iwch_qp.c
--- 11/drivers/infiniband/hw/cxgb3/iwch_qp.c
+++ b/drivers/infiniband/hw/cxgb3/iwch_qp.c
@@@@@@@@@@@@ -99,8 -99,8 -99,8 -99,8 -99,8 -99,8 -99,8 -99,8 -99,8 -99,8 -99,8 +99,8 @@@@@@@@@@@@ static int build_rdma_write(union t3_w
                if (wr->opcode == IB_WR_RDMA_WRITE_WITH_IMM) {
                        plen = 4;
                        wqe->write.sgl[0].stag = wr->ex.imm_data;
- ---------             wqe->write.sgl[0].len = __constant_cpu_to_be32(0);
- ---------             wqe->write.num_sgle = __constant_cpu_to_be32(0);
+ +++++++++             wqe->write.sgl[0].len = cpu_to_be32(0);
+ +++++++++             wqe->write.num_sgle = cpu_to_be32(0);
                        *flit_cnt = 6;
                } else {
                        plen = 0;
@@@@@@@@@@@@ -195,12 -195,15 -195,15 -195,15 -195,15 -195,15 -195,15 -195,15 -195,15 -195,15 -195,15 +195,12 @@@@@@@@@@@@ static int build_inv_stag(union t3_wr *
                return 0;
           }
           
 ----------/*
 ---------- * TBD: this is going to be moved to firmware. Missing pdid/qpid check for now.
 ---------- */
           static int iwch_sgl2pbl_map(struct iwch_dev *rhp, struct ib_sge *sg_list,
                                    u32 num_sgle, u32 * pbl_addr, u8 * page_size)
           {
                int i;
                struct iwch_mr *mhp;
 ----------     u32 offset;
 ++++++++++     u64 offset;
                for (i = 0; i < num_sgle; i++) {
           
                        mhp = get_mhp(rhp, (sg_list[i].lkey) >> 8);
@@@@@@@@@@@@ -232,8 -235,8 -235,8 -235,8 -235,8 -235,8 -235,8 -235,8 -235,8 -235,8 -235,8 +232,8 @@@@@@@@@@@@
                                return -EINVAL;
                        }
                        offset = sg_list[i].addr - mhp->attr.va_fbo;
 ----------             offset += ((u32) mhp->attr.va_fbo) %
 ----------                       (1UL << (12 + mhp->attr.page_size));
 ++++++++++             offset += mhp->attr.va_fbo &
 ++++++++++                       ((1UL << (12 + mhp->attr.page_size)) - 1);
                        pbl_addr[i] = ((mhp->attr.pbl_addr -
                                        rhp->rdev.rnic_info.pbl_base) >> 3) +
                                      (offset >> (12 + mhp->attr.page_size));
@@@@@@@@@@@@ -263,8 -266,8 -266,8 -266,8 -266,8 -266,8 -266,8 -266,8 -266,8 -266,8 -266,8 +263,8 @@@@@@@@@@@@ static int build_rdma_recv(struct iwch_
                        wqe->recv.sgl[i].len = cpu_to_be32(wr->sg_list[i].length);
           
                        /* to in the WQE == the offset into the page */
 ----------             wqe->recv.sgl[i].to = cpu_to_be64(((u32) wr->sg_list[i].addr) %
 ----------                             (1UL << (12 + page_size[i])));
 ++++++++++             wqe->recv.sgl[i].to = cpu_to_be64(((u32)wr->sg_list[i].addr) &
 ++++++++++                             ((1UL << (12 + page_size[i])) - 1));
           
                        /* pbl_addr is the adapters address in the PBL */
                        wqe->recv.pbl_addr[i] = cpu_to_be32(pbl_addr[i]);

diff --combined include/rdma/ib_mad.h
index 5f6c40f,8cc71a1,5f6c40f,5f6c40f,5f6c40f,1a0f409,5f6c40f,5f6c40f,5f6c40f,5f6c40f,5f6c40f..d3b9401
--- 1/include/rdma/ib_mad.h
--- 2/include/rdma/ib_mad.h
--- 3/include/rdma/ib_mad.h
--- 4/include/rdma/ib_mad.h
--- 5/include/rdma/ib_mad.h
--- 6/include/rdma/ib_mad.h
--- 7/include/rdma/ib_mad.h
--- 8/include/rdma/ib_mad.h
--- 9/include/rdma/ib_mad.h
--- 10/include/rdma/ib_mad.h
--- 11/include/rdma/ib_mad.h
+++ b/include/rdma/ib_mad.h
@@@@@@@@@@@@ -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 -107,7 +107,7 @@@@@@@@@@@@
           #define      IB_MGMT_RMPP_STATUS_ABORT_MAX           127
           
           #define IB_QP0               0
- ---------#define IB_QP1               __constant_htonl(1)
+ +++++++++#define IB_QP1               cpu_to_be32(1)
           #define IB_QP1_QKEY  0x80010000
           #define IB_QP_SET_QKEY       0x80000000
           
@@@@@@@@@@@@ -290,7 -290,7 -290,7 -290,7 -290,7 -290,7 -290,7 -290,7 -290,7 -290,7 -290,7 +290,7 @@@@@@@@@@@@ static inline void ib_set_rmpp_resptime
            */
           static inline void ib_set_rmpp_flags(struct ib_rmpp_hdr *rmpp_hdr, u8 flags)
           {
----- -----     rmpp_hdr->rmpp_rtime_flags = (rmpp_hdr->rmpp_rtime_flags & 0xF1) |
+++++ +++++     rmpp_hdr->rmpp_rtime_flags = (rmpp_hdr->rmpp_rtime_flags & 0xF8) |
                                             (flags & 0x7);
           }