Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

3 files changed, 8 insertions, 2 deletions

diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c
index fbdd73106000..cc9b5940fa97 100644
--- a/drivers/infiniband/core/cma.c
+++ b/drivers/infiniband/core/cma.c
@@ -2083,7 +2083,7 @@ static int cma_get_port(struct rdma_id_private *id_priv)
 static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,
                                struct sockaddr *addr)
 {
-#if defined(CONFIG_IPv6) || defined(CONFIG_IPV6_MODULE)
+#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
         struct sockaddr_in6 *sin6;
 
         if (addr->sa_family != AF_INET6)
diff --git a/drivers/infiniband/hw/mlx4/qp.c b/drivers/infiniband/hw/mlx4/qp.c
index 989555cee883..2a97c964b9ef 100644
--- a/drivers/infiniband/hw/mlx4/qp.c
+++ b/drivers/infiniband/hw/mlx4/qp.c
@@ -1752,7 +1752,7 @@ int mlx4_ib_post_recv(struct ib_qp *ibqp, struct ib_recv_wr *wr,
         ind = qp->rq.head & (qp->rq.wqe_cnt - 1);
 
         for (nreq = 0; wr; ++nreq, wr = wr->next) {
-                if (mlx4_wq_overflow(&qp->rq, nreq, qp->ibqp.send_cq)) {
+                if (mlx4_wq_overflow(&qp->rq, nreq, qp->ibqp.recv_cq)) {
                         err = -ENOMEM;
                         *bad_wr = wr;
                         goto out;
diff --git a/drivers/infiniband/hw/mlx4/srq.c b/drivers/infiniband/hw/mlx4/srq.c
index d42565258fb7..cf8085bcbd6d 100644
--- a/drivers/infiniband/hw/mlx4/srq.c
+++ b/drivers/infiniband/hw/mlx4/srq.c
@@ -74,6 +74,7 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
         struct mlx4_ib_dev *dev = to_mdev(pd->device);
         struct mlx4_ib_srq *srq;
         struct mlx4_wqe_srq_next_seg *next;
+        struct mlx4_wqe_data_seg *scatter;
         int desc_size;
         int buf_size;
         int err;
@@ -149,6 +150,11 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd,
                         next = get_wqe(srq, i);
                         next->next_wqe_index =
                                 cpu_to_be16((i + 1) & (srq->msrq.max - 1));
+
+                        for (scatter = (void *) (next + 1);
+                             (void *) scatter < (void *) next + desc_size;
+                             ++scatter)
+                                scatter->lkey = cpu_to_be32(MLX4_INVALID_LKEY);
                 }
 
                 err = mlx4_mtt_init(dev->dev, srq->buf.npages, srq->buf.page_shift,