Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3c8ad49b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/addr: Correct CONFIG_IPv6 to CONFIG_IPV6
  mlx4_core: Fix cleanup in __mlx4_init_one() error path
  IB/mlx4: Fix queue overflow check in post_recv
  IB/mlx4: Initialize SRQ scatter entries when creating an SRQ
parents 9993b364 0139fd7c

drivers/infiniband/core/cma.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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,

static int cma_check_linklocal(struct rdma_dev_addr *dev_addr,

			       struct sockaddr *addr)

			       struct sockaddr *addr)

{

{

#if defined(CONFIG_IPv6) || defined(CONFIG_IPV6_MODULE)

#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)

	struct sockaddr_in6 *sin6;

	struct sockaddr_in6 *sin6;





	if (addr->sa_family != AF_INET6)

	if (addr->sa_family != AF_INET6)

drivers/infiniband/hw/mlx4/qp.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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);

	ind = qp->rq.head & (qp->rq.wqe_cnt - 1);





	for (nreq = 0; wr; ++nreq, wr = wr->next) {

	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;

			err = -ENOMEM;

			*bad_wr = wr;

			*bad_wr = wr;

			goto out;

			goto out;

drivers/infiniband/hw/mlx4/srq.c

+6 −0
Original line number Original line Diff line number Diff line
@@ -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_dev *dev = to_mdev(pd->device);

	struct mlx4_ib_srq *srq;

	struct mlx4_ib_srq *srq;

	struct mlx4_wqe_srq_next_seg *next;

	struct mlx4_wqe_srq_next_seg *next;

	struct mlx4_wqe_data_seg *scatter;

	int desc_size;

	int desc_size;

	int buf_size;

	int buf_size;

	int err;

	int err;
@@ -149,6 +150,11 @@ struct ib_srq *mlx4_ib_create_srq(struct ib_pd *pd, 
			next = get_wqe(srq, i);

			next = get_wqe(srq, i);

			next->next_wqe_index =

			next->next_wqe_index =

				cpu_to_be16((i + 1) & (srq->msrq.max - 1));

				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,

		err = mlx4_mtt_init(dev->dev, srq->buf.npages, srq->buf.page_shift,

drivers/net/mlx4/main.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1174,7 +1174,7 @@ static int __mlx4_init_one(struct pci_dev *pdev, const struct pci_device_id *id) 
	return 0;

	return 0;





err_port:

err_port:

	for (port = 1; port <= dev->caps.num_ports; port++)

	for (--port; port >= 1; --port)

		mlx4_cleanup_port_info(&priv->port[port]);

		mlx4_cleanup_port_info(&priv->port[port]);





	mlx4_cleanup_mcg_table(dev);

	mlx4_cleanup_mcg_table(dev);