Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

bnx2i: Rebranding bnx2i driver

QLogic has acquired the NetXtremeII products and drivers from Broadcom.
This patch re-brands bnx2i driver as a QLogic driver

Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
Acked-by: Eddie Wai <eddie.wai@broadcom.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

authored by

Vikas Chaudhary and committed by
Christoph Hellwig
f39a7757 91b265bf

+33 -19
+4 -2
drivers/scsi/bnx2i/57xx_iscsi_constants.h
··· 1 - /* 57xx_iscsi_constants.h: Broadcom NetXtreme II iSCSI HSI 1 + /* 57xx_iscsi_constants.h: QLogic NetXtreme II iSCSI HSI 2 2 * 3 3 * Copyright (c) 2006 - 2013 Broadcom Corporation 4 + * Copyright (c) 2014, QLogic Corporation 4 5 * 5 6 * This program is free software; you can redistribute it and/or modify 6 7 * it under the terms of the GNU General Public License as published by 7 8 * the Free Software Foundation. 8 9 * 9 10 * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) 10 - * Maintained by: Eddie Wai (eddie.wai@broadcom.com) 11 + * Previously Maintained by: Eddie Wai (eddie.wai@broadcom.com) 12 + * Maintained by: QLogic-Storage-Upstream@qlogic.com 11 13 */ 12 14 #ifndef __57XX_ISCSI_CONSTANTS_H_ 13 15 #define __57XX_ISCSI_CONSTANTS_H_
+4 -2
drivers/scsi/bnx2i/57xx_iscsi_hsi.h
··· 1 - /* 57xx_iscsi_hsi.h: Broadcom NetXtreme II iSCSI HSI. 1 + /* 57xx_iscsi_hsi.h: QLogic NetXtreme II iSCSI HSI. 2 2 * 3 3 * Copyright (c) 2006 - 2013 Broadcom Corporation 4 + * Copyright (c) 2014, QLogic Corporation 4 5 * 5 6 * This program is free software; you can redistribute it and/or modify 6 7 * it under the terms of the GNU General Public License as published by 7 8 * the Free Software Foundation. 8 9 * 9 10 * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) 10 - * Maintained by: Eddie Wai (eddie.wai@broadcom.com) 11 + * Previously Maintained by: Eddie Wai (eddie.wai@broadcom.com) 12 + * Maintained by: QLogic-Storage-Upstream@qlogic.com 11 13 */ 12 14 #ifndef __57XX_ISCSI_HSI_LINUX_LE__ 13 15 #define __57XX_ISCSI_HSI_LINUX_LE__
+2 -2
drivers/scsi/bnx2i/Kconfig
··· 1 1 config SCSI_BNX2_ISCSI 2 - tristate "Broadcom NetXtreme II iSCSI support" 2 + tristate "QLogic NetXtreme II iSCSI support" 3 3 depends on NET 4 4 depends on PCI 5 5 select SCSI_ISCSI_ATTRS ··· 8 8 select NET_VENDOR_BROADCOM 9 9 select CNIC 10 10 ---help--- 11 - This driver supports iSCSI offload for the Broadcom NetXtreme II 11 + This driver supports iSCSI offload for the QLogic NetXtreme II 12 12 devices.
+4 -2
drivers/scsi/bnx2i/bnx2i.h
··· 1 - /* bnx2i.h: Broadcom NetXtreme II iSCSI driver. 1 + /* bnx2i.h: QLogic NetXtreme II iSCSI driver. 2 2 * 3 3 * Copyright (c) 2006 - 2013 Broadcom Corporation 4 4 * Copyright (c) 2007, 2008 Red Hat, Inc. All rights reserved. 5 5 * Copyright (c) 2007, 2008 Mike Christie 6 + * Copyright (c) 2014, QLogic Corporation 6 7 * 7 8 * This program is free software; you can redistribute it and/or modify 8 9 * it under the terms of the GNU General Public License as published by 9 10 * the Free Software Foundation. 10 11 * 11 12 * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) 12 - * Maintained by: Eddie Wai (eddie.wai@broadcom.com) 13 + * Previously Maintained by: Eddie Wai (eddie.wai@broadcom.com) 14 + * Maintained by: QLogic-Storage-Upstream@qlogic.com 13 15 */ 14 16 15 17 #ifndef _BNX2I_H_
+4 -2
drivers/scsi/bnx2i/bnx2i_hwi.c
··· 1 - /* bnx2i_hwi.c: Broadcom NetXtreme II iSCSI driver. 1 + /* bnx2i_hwi.c: QLogic NetXtreme II iSCSI driver. 2 2 * 3 3 * Copyright (c) 2006 - 2013 Broadcom Corporation 4 4 * Copyright (c) 2007, 2008 Red Hat, Inc. All rights reserved. 5 5 * Copyright (c) 2007, 2008 Mike Christie 6 + * Copyright (c) 2014, QLogic Corporation 6 7 * 7 8 * This program is free software; you can redistribute it and/or modify 8 9 * it under the terms of the GNU General Public License as published by 9 10 * the Free Software Foundation. 10 11 * 11 12 * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) 12 - * Maintained by: Eddie Wai (eddie.wai@broadcom.com) 13 + * Previously Maintained by: Eddie Wai (eddie.wai@broadcom.com) 14 + * Maintained by: QLogic-Storage-Upstream@qlogic.com 13 15 */ 14 16 15 17 #include <linux/gfp.h>
+6 -4
drivers/scsi/bnx2i/bnx2i_init.c
··· 1 - /* bnx2i.c: Broadcom NetXtreme II iSCSI driver. 1 + /* bnx2i.c: QLogic NetXtreme II iSCSI driver. 2 2 * 3 3 * Copyright (c) 2006 - 2013 Broadcom Corporation 4 4 * Copyright (c) 2007, 2008 Red Hat, Inc. All rights reserved. 5 5 * Copyright (c) 2007, 2008 Mike Christie 6 + * Copyright (c) 2014, QLogic Corporation 6 7 * 7 8 * This program is free software; you can redistribute it and/or modify 8 9 * it under the terms of the GNU General Public License as published by 9 10 * the Free Software Foundation. 10 11 * 11 12 * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) 12 - * Maintained by: Eddie Wai (eddie.wai@broadcom.com) 13 + * Previously Maintained by: Eddie Wai (eddie.wai@broadcom.com) 14 + * Maintained by: QLogic-Storage-Upstream@qlogic.com 13 15 */ 14 16 15 17 #include "bnx2i.h" ··· 24 22 #define DRV_MODULE_RELDATE "Jun 06, 2013" 25 23 26 24 static char version[] = 27 - "Broadcom NetXtreme II iSCSI Driver " DRV_MODULE_NAME \ 25 + "QLogic NetXtreme II iSCSI Driver " DRV_MODULE_NAME \ 28 26 " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; 29 27 30 28 31 29 MODULE_AUTHOR("Anil Veerabhadrappa <anilgv@broadcom.com> and " 32 30 "Eddie Wai <eddie.wai@broadcom.com>"); 33 31 34 - MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/57710/57711/57712" 32 + MODULE_DESCRIPTION("QLogic NetXtreme II BCM5706/5708/5709/57710/57711/57712" 35 33 "/57800/57810/57840 iSCSI Driver"); 36 34 MODULE_LICENSE("GPL"); 37 35 MODULE_VERSION(DRV_MODULE_VERSION);
+5 -3
drivers/scsi/bnx2i/bnx2i_iscsi.c
··· 1 1 /* 2 - * bnx2i_iscsi.c: Broadcom NetXtreme II iSCSI driver. 2 + * bnx2i_iscsi.c: QLogic NetXtreme II iSCSI driver. 3 3 * 4 4 * Copyright (c) 2006 - 2013 Broadcom Corporation 5 5 * Copyright (c) 2007, 2008 Red Hat, Inc. All rights reserved. 6 6 * Copyright (c) 2007, 2008 Mike Christie 7 + * Copyright (c) 2014, QLogic Corporation 7 8 * 8 9 * This program is free software; you can redistribute it and/or modify 9 10 * it under the terms of the GNU General Public License as published by 10 11 * the Free Software Foundation. 11 12 * 12 13 * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) 13 - * Maintained by: Eddie Wai (eddie.wai@broadcom.com) 14 + * Previously Maintained by: Eddie Wai (eddie.wai@broadcom.com) 15 + * Maintained by: QLogic-Storage-Upstream@qlogic.com 14 16 */ 15 17 16 18 #include <linux/slab.h> ··· 2250 2248 */ 2251 2249 static struct scsi_host_template bnx2i_host_template = { 2252 2250 .module = THIS_MODULE, 2253 - .name = "Broadcom Offload iSCSI Initiator", 2251 + .name = "QLogic Offload iSCSI Initiator", 2254 2252 .proc_name = "bnx2i", 2255 2253 .queuecommand = iscsi_queuecommand, 2256 2254 .eh_abort_handler = iscsi_eh_abort,
+4 -2
drivers/scsi/bnx2i/bnx2i_sysfs.c
··· 1 - /* bnx2i_sysfs.c: Broadcom NetXtreme II iSCSI driver. 1 + /* bnx2i_sysfs.c: QLogic NetXtreme II iSCSI driver. 2 2 * 3 3 * Copyright (c) 2004 - 2013 Broadcom Corporation 4 + * Copyright (c) 2014, QLogic Corporation 4 5 * 5 6 * This program is free software; you can redistribute it and/or modify 6 7 * it under the terms of the GNU General Public License as published by 7 8 * the Free Software Foundation. 8 9 * 9 10 * Written by: Anil Veerabhadrappa (anilgv@broadcom.com) 10 - * Maintained by: Eddie Wai (eddie.wai@broadcom.com) 11 + * Previously Maintained by: Eddie Wai (eddie.wai@broadcom.com) 12 + * Maintained by: QLogic-Storage-Upstream@qlogic.com 11 13 */ 12 14 13 15 #include "bnx2i.h"