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

Commit 53b68092 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull infiniband/rdma fixes from Roland Dreier:
 "Small batch of InfiniBand/RDMA fixes for 3.9:

   - Fix for TX lockup in IPoIB
   - QLogic -> Intel update for qib driver
   - Small static checker fix for qib
   - Fix error path return value in cxgb4"

* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  IB/qib: change QLogic to Intel
  IB/ipath: Silence a static checker warning
  IPoIB: Fix send lockup due to missed TX completion
  RDMA/cxgb4: Fix error return code in create_qp()
parents fb9bb182 4e73a54f

drivers/infiniband/hw/cxgb4/qp.c

+3 −1
Original line number Diff line number Diff line
@@ -186,8 +186,10 @@ static int create_qp(struct c4iw_rdev *rdev, struct t4_wq *wq, 
	wq->rq.queue = dma_alloc_coherent(&(rdev->lldi.pdev->dev),

					  wq->rq.memsize, &(wq->rq.dma_addr),

					  GFP_KERNEL);

	if (!wq->rq.queue)

	if (!wq->rq.queue) {

		ret = -ENOMEM;

		goto free_sq;

	}

	PDBG("%s sq base va 0x%p pa 0x%llx rq base va 0x%p pa 0x%llx\n",

		__func__, wq->sq.queue,

		(unsigned long long)virt_to_phys(wq->sq.queue),

drivers/infiniband/hw/ipath/ipath_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -620,7 +620,7 @@ void ipath_ib_rcv(struct ipath_ibdev *dev, void *rhdr, void *data, 
		goto bail;

	}



	opcode = be32_to_cpu(ohdr->bth[0]) >> 24;

	opcode = (be32_to_cpu(ohdr->bth[0]) >> 24) & 0x7f;

	dev->opstats[opcode].n_bytes += tlen;

	dev->opstats[opcode].n_packets++;

drivers/infiniband/hw/qib/Kconfig

+3 −3
Original line number Diff line number Diff line 
config INFINIBAND_QIB

	tristate "QLogic PCIe HCA support"

	tristate "Intel PCIe HCA support"

	depends on 64BIT

	---help---

	This is a low-level driver for QLogic PCIe QLE InfiniBand host

	channel adapters.  This driver does not support the QLogic

	This is a low-level driver for Intel PCIe QLE InfiniBand host

	channel adapters.  This driver does not support the Intel

	HyperTransport card (model QHT7140).

drivers/infiniband/hw/qib/qib_driver.c

+3 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013 Intel Corporation. All rights reserved.

 * Copyright (c) 2006, 2007, 2008, 2009 QLogic Corporation. All rights reserved.

 * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.

 *
@@ -63,8 +64,8 @@ MODULE_PARM_DESC(compat_ddr_negotiate, 
		 "Attempt pre-IBTA 1.2 DDR speed negotiation");



MODULE_LICENSE("Dual BSD/GPL");

MODULE_AUTHOR("QLogic <support@qlogic.com>");

MODULE_DESCRIPTION("QLogic IB driver");

MODULE_AUTHOR("Intel <ibsupport@intel.com>");

MODULE_DESCRIPTION("Intel IB driver");

MODULE_VERSION(QIB_DRIVER_VERSION);



/*

drivers/infiniband/hw/qib/qib_iba6120.c

+2 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2013 Intel Corporation. All rights reserved.

 * Copyright (c) 2006, 2007, 2008, 2009, 2010 QLogic Corporation.

 * All rights reserved.

 * Copyright (c) 2003, 2004, 2005, 2006 PathScale, Inc. All rights reserved.
@@ -51,7 +52,7 @@ static u32 qib_6120_iblink_state(u64); 


/*

 * This file contains all the chip-specific register information and

 * access functions for the QLogic QLogic_IB PCI-Express chip.

 * access functions for the Intel Intel_IB PCI-Express chip.

 *

 */