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

Commit c2448278 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/mad: Fix kernel crash when .process_mad() returns SUCCESS|CONSUMED
  IPoIB: Test for NULL broadcast object in ipiob_mcast_join_finish()
  MAINTAINERS: Add cxgb3 and iw_cxgb3 NIC and iWARP driver entries
  IB/mlx4: Fix creation of kernel QP with max number of send s/g entries
  IB/mthca: Fix max_sge value returned by query_device
  RDMA/cxgb3: Fix uninitialized variable warning in iwch_post_send()
  IB/mlx4: Fix uninitialized-var warning in mlx4_ib_post_send()
  IB/ipath: Fix UC receive completion opcode for RDMA WRITE with immediate
  IB/ipath: Fix printk format for ipath_sdma_status
parents e6b027a3 5a4f2b67

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -1240,6 +1240,20 @@ L: video4linux-list@redhat.com 
W:	http://linuxtv.org

S:	Maintained



CXGB3 ETHERNET DRIVER (CXGB3)

P:	Divy Le Ray

M:	divy@chelsio.com

L:	netdev@vger.kernel.org

W:	http://www.chelsio.com

S:	Supported



CXGB3 IWARP RNIC DRIVER (IW_CXGB3)

P:	Steve Wise

M:	swise@chelsio.com

L:	general@lists.openfabrics.org

W:	http://www.openfabrics.org

S:	Supported



CYBERPRO FB DRIVER

P:	Russell King

M:	rmk@arm.linux.org.uk

drivers/infiniband/core/mad.c

+3 −1
Original line number Diff line number Diff line
@@ -747,7 +747,9 @@ static int handle_outgoing_dr_smp(struct ib_mad_agent_private *mad_agent_priv, 
		break;

	case IB_MAD_RESULT_SUCCESS | IB_MAD_RESULT_CONSUMED:

		kmem_cache_free(ib_mad_cache, mad_priv);

		break;

		kfree(local);

		ret = 1;

		goto out;

	case IB_MAD_RESULT_SUCCESS:

		/* Treat like an incoming receive MAD */

		port_priv = ib_get_mad_port(mad_agent_priv->agent.device,

drivers/infiniband/hw/cxgb3/iwch_qp.c

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ int iwch_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, 
		      struct ib_send_wr **bad_wr)

{

	int err = 0;

	u8 t3_wr_flit_cnt;

	u8 uninitialized_var(t3_wr_flit_cnt);

	enum t3_wr_opcode t3_wr_opcode = 0;

	enum t3_wr_flags t3_wr_flags;

	struct iwch_qp *qhp;

drivers/infiniband/hw/ipath/ipath_sdma.c

+2 −2
Original line number Diff line number Diff line
@@ -345,7 +345,7 @@ static void sdma_abort_task(unsigned long opaque) 
	 * state change

	 */

	if (jiffies > dd->ipath_sdma_abort_jiffies) {

		ipath_dbg("looping with status 0x%016llx\n",

		ipath_dbg("looping with status 0x%08lx\n",

			  dd->ipath_sdma_status);

		dd->ipath_sdma_abort_jiffies = jiffies + 5 * HZ;

	}
@@ -615,7 +615,7 @@ void ipath_restart_sdma(struct ipath_devdata *dd) 
	}

	spin_unlock_irqrestore(&dd->ipath_sdma_lock, flags);

	if (!needed) {

		ipath_dbg("invalid attempt to restart SDMA, status 0x%016llx\n",

		ipath_dbg("invalid attempt to restart SDMA, status 0x%08lx\n",

			dd->ipath_sdma_status);

		goto bail;

	}

drivers/infiniband/hw/ipath/ipath_uc.c

+2 −2
Original line number Diff line number Diff line
@@ -407,12 +407,11 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, 
			dev->n_pkt_drops++;

			goto done;

		}

		/* XXX Need to free SGEs */

		wc.opcode = IB_WC_RECV;

	last_imm:

		ipath_copy_sge(&qp->r_sge, data, tlen);

		wc.wr_id = qp->r_wr_id;

		wc.status = IB_WC_SUCCESS;

		wc.opcode = IB_WC_RECV;

		wc.qp = &qp->ibqp;

		wc.src_qp = qp->remote_qpn;

		wc.slid = qp->remote_ah_attr.dlid;
@@ -514,6 +513,7 @@ void ipath_uc_rcv(struct ipath_ibdev *dev, struct ipath_ib_header *hdr, 
			goto done;

		}

		wc.byte_len = qp->r_len;

		wc.opcode = IB_WC_RECV_RDMA_WITH_IMM;

		goto last_imm;



	case OP(RDMA_WRITE_LAST):