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

Commit 2b76c057 authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cxgb4', 'ipath', 'ipoib', 'mlx4', 'mthca', 'nes', 'qib' and 'srp' into for-next

parents db8b1016 1eba27e8 8ae31e5b 13974909 d0444f15 601d87b0 4db62d47 9af76271

drivers/infiniband/hw/ipath/ipath_driver.c

+2 −3
Original line number Diff line number Diff line
@@ -530,9 +530,8 @@ static int __devinit ipath_init_one(struct pci_dev *pdev, 
	for (j = 0; j < 6; j++) {

		if (!pdev->resource[j].start)

			continue;

		ipath_cdbg(VERBOSE, "BAR %d start %llx, end %llx, len %llx\n",

			   j, (unsigned long long)pdev->resource[j].start,

			   (unsigned long long)pdev->resource[j].end,

		ipath_cdbg(VERBOSE, "BAR %d %pR, len %llx\n",

			   j, &pdev->resource[j],

			   (unsigned long long)pci_resource_len(pdev, j));

	}

drivers/infiniband/hw/mlx4/cq.c

+8 −1
Original line number Diff line number Diff line
@@ -397,10 +397,14 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) 
		cq->resize_buf = NULL;

		cq->resize_umem = NULL;

	} else {

		struct mlx4_ib_cq_buf tmp_buf;

		int tmp_cqe = 0;



		spin_lock_irq(&cq->lock);

		if (cq->resize_buf) {

			mlx4_ib_cq_resize_copy_cqes(cq);

			mlx4_ib_free_cq_buf(dev, &cq->buf, cq->ibcq.cqe);

			tmp_buf = cq->buf;

			tmp_cqe = cq->ibcq.cqe;

			cq->buf      = cq->resize_buf->buf;

			cq->ibcq.cqe = cq->resize_buf->cqe;
@@ -408,6 +412,9 @@ int mlx4_ib_resize_cq(struct ib_cq *ibcq, int entries, struct ib_udata *udata) 
			cq->resize_buf = NULL;

		}

		spin_unlock_irq(&cq->lock);



		if (tmp_cqe)

			mlx4_ib_free_cq_buf(dev, &tmp_buf, tmp_cqe);

	}



	goto out;

drivers/infiniband/hw/mlx4/mad.c

+2 −0
Original line number Diff line number Diff line
@@ -211,6 +211,8 @@ static void forward_trap(struct mlx4_ib_dev *dev, u8 port_num, struct ib_mad *ma 
	if (agent) {

		send_buf = ib_create_send_mad(agent, qpn, 0, 0, IB_MGMT_MAD_HDR,

					      IB_MGMT_MAD_DATA, GFP_ATOMIC);

		if (IS_ERR(send_buf))

			return;

		/*

		 * We rely here on the fact that MLX QPs don't use the

		 * address handle after the send is posted (this is

drivers/infiniband/hw/mthca/mthca_mad.c

+2 −0
Original line number Diff line number Diff line
@@ -171,6 +171,8 @@ static void forward_trap(struct mthca_dev *dev, 
	if (agent) {

		send_buf = ib_create_send_mad(agent, qpn, 0, 0, IB_MGMT_MAD_HDR,

					      IB_MGMT_MAD_DATA, GFP_ATOMIC);

		if (IS_ERR(send_buf))

			return;

		/*

		 * We rely here on the fact that MLX QPs don't use the

		 * address handle after the send is posted (this is

drivers/infiniband/hw/nes/nes_nic.c

+2 −2
Original line number Diff line number Diff line
@@ -908,8 +908,8 @@ static void nes_netdev_set_multicast_list(struct net_device *netdev) 
					nesvnic->nic_index &&

					mc_index < max_pft_entries_avaiable) {

						nes_debug(NES_DBG_NIC_RX,

					"mc_index=%d skipping nic_index=%d,\

					used for=%d \n", mc_index,

					"mc_index=%d skipping nic_index=%d, "

					"used for=%d \n", mc_index,

					nesvnic->nic_index,

					nesadapter->pft_mcast_map[mc_index]);

				mc_index++;