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

Commit 4e73a54f authored by Roland Dreier's avatar Roland Dreier
Browse files

Merge branches 'cxgb4', 'ipoib' and 'qib' into for-next

parents 55e57a78 1ee9e2aa e2eed58b

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.

 *

 */

drivers/infiniband/hw/qib/qib_init.c

+4 −4
Original line number Diff line number Diff line 
/*

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

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

 * Copyright (c) 2006 - 2012 QLogic Corporation. All rights reserved.

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

 *
@@ -1138,7 +1138,7 @@ void qib_disable_after_error(struct qib_devdata *dd) 
static void qib_remove_one(struct pci_dev *);

static int qib_init_one(struct pci_dev *, const struct pci_device_id *);



#define DRIVER_LOAD_MSG "QLogic " QIB_DRV_NAME " loaded: "

#define DRIVER_LOAD_MSG "Intel " QIB_DRV_NAME " loaded: "

#define PFX QIB_DRV_NAME ": "



static DEFINE_PCI_DEVICE_TABLE(qib_pci_tbl) = {
@@ -1355,7 +1355,7 @@ static int qib_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 
		dd = qib_init_iba6120_funcs(pdev, ent);

#else

		qib_early_err(&pdev->dev,

			"QLogic PCIE device 0x%x cannot work if CONFIG_PCI_MSI is not enabled\n",

			"Intel PCIE device 0x%x cannot work if CONFIG_PCI_MSI is not enabled\n",

			ent->device);

		dd = ERR_PTR(-ENODEV);

#endif
@@ -1371,7 +1371,7 @@ static int qib_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) 


	default:

		qib_early_err(&pdev->dev,

			"Failing on unknown QLogic deviceid 0x%x\n",

			"Failing on unknown Intel deviceid 0x%x\n",

			ent->device);

		ret = -ENODEV;

	}