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

Commit 759d5768 authored by Bryan O'Sullivan's avatar Bryan O'Sullivan Committed by Linus Torvalds
Browse files

[PATCH] IB/ipath: update copyrights and other strings to reflect new company name 



Signed-off-by: default avatarBryan O'Sullivan <bryan.osullivan@qlogic.com>
Cc: "Michael S. Tsirkin" <mst@mellanox.co.il>
Cc: Roland Dreier <rolandd@cisco.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 443a64ab

drivers/infiniband/hw/ipath/Kconfig

+4 −4
Original line number Diff line number Diff line 
config IPATH_CORE

	tristate "PathScale InfiniPath Driver"

	tristate "QLogic InfiniPath Driver"

	depends on 64BIT && PCI_MSI && NET

	---help---

	This is a low-level driver for PathScale InfiniPath host channel

	This is a low-level driver for QLogic InfiniPath host channel

	adapters (HCAs) based on the HT-400 and PE-800 chips.



config INFINIBAND_IPATH

	tristate "PathScale InfiniPath Verbs Driver"

	tristate "QLogic InfiniPath Verbs Driver"

	depends on IPATH_CORE && INFINIBAND

	---help---

	This is a driver that provides InfiniBand verbs support for

	PathScale InfiniPath host channel adapters (HCAs).  This

	QLogic InfiniPath host channel adapters (HCAs).  This

	allows these devices to be used with both kernel upper level

	protocols such as IP-over-InfiniBand as well as with userspace

	applications (in conjunction with InfiniBand userspace access).

drivers/infiniband/hw/ipath/Makefile

+1 −1
Original line number Diff line number Diff line 
EXTRA_CFLAGS += -DIPATH_IDSTR='"PathScale kernel.org driver"' \

EXTRA_CFLAGS += -DIPATH_IDSTR='"QLogic kernel.org driver"' \

	-DIPATH_KERN_TYPE=0



obj-$(CONFIG_IPATH_CORE) += ipath_core.o

drivers/infiniband/hw/ipath/ipath_common.h

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

 * Copyright (c) 2006 QLogic, Inc. All rights reserved.

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

 *

 * This software is available to you under a choice of one of two
@@ -38,7 +39,7 @@ 
 * to communicate between kernel and user code.

 */



/* This is the IEEE-assigned OUI for PathScale, Inc. */

/* This is the IEEE-assigned OUI for QLogic, Inc. InfiniPath */

#define IPATH_SRC_OUI_1 0x00

#define IPATH_SRC_OUI_2 0x11

#define IPATH_SRC_OUI_3 0x75
@@ -342,9 +343,9 @@ struct ipath_base_info { 
/*

 * Similarly, this is the kernel version going back to the user.  It's

 * slightly different, in that we want to tell if the driver was built as

 * part of a PathScale release, or from the driver from OpenIB, kernel.org,

 * part of a QLogic release, or from the driver from OpenIB, kernel.org,

 * or a standard distribution, for support reasons.  The high bit is 0 for

 * non-PathScale, and 1 for PathScale-built/supplied.

 * non-QLogic, and 1 for QLogic-built/supplied.

 *

 * It's returned by the driver to the user code during initialization in the

 * spi_sw_version field of ipath_base_info, so the user code can in turn

drivers/infiniband/hw/ipath/ipath_cq.c

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

 * Copyright (c) 2006 QLogic, Inc. All rights reserved.

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

 *

 * This software is available to you under a choice of one of two

drivers/infiniband/hw/ipath/ipath_debug.h

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

 * Copyright (c) 2006 QLogic, Inc. All rights reserved.

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

 *

 * This software is available to you under a choice of one of two