evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'broadcom_rebranding'

Browse source 
Jitendra Kalsaria says:

====================
Rebranding changes for bnx2 and cnic driver

The following set of patches are for rebranding Broadcom bnx2 and cnic driver as QLogic drivers.
Please apply this series to net-next.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2014-06-25 16:28:01 -07:00
commit 13ec7a6b9d
9 changed files with 28 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
MAINTAINERS
View file

@ -1894,7 +1894,8 @@ S: Supported
F: drivers/net/ethernet/broadcom/genet/ F: drivers/net/ethernet/broadcom/genet/
BROADCOM BNX2 GIGABIT ETHERNET DRIVER BROADCOM BNX2 GIGABIT ETHERNET DRIVER
M: Michael Chan <mchan@broadcom.com> M: Sony Chacko <sony.chacko@qlogic.com>
M: Dept-HSGLinuxNICDev@qlogic.com
L: netdev@vger.kernel.org L: netdev@vger.kernel.org
S: Supported S: Supported
F: drivers/net/ethernet/broadcom/bnx2.* F: drivers/net/ethernet/broadcom/bnx2.*

8
drivers/net/ethernet/broadcom/Kconfig
View file

@ -72,23 +72,23 @@ config BCMGENET
Broadcom BCM7xxx Set Top Box family chipset. Broadcom BCM7xxx Set Top Box family chipset.
config BNX2 config BNX2
tristate "Broadcom NetXtremeII support" tristate "QLogic NetXtremeII support"
depends on PCI depends on PCI
select CRC32 select CRC32
select FW_LOADER select FW_LOADER
---help--- ---help---
This driver supports Broadcom NetXtremeII gigabit Ethernet cards. This driver supports QLogic NetXtremeII gigabit Ethernet cards.
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module
will be called bnx2. This is recommended. will be called bnx2. This is recommended.
config CNIC config CNIC
tristate "Broadcom CNIC support" tristate "QLogic CNIC support"
depends on PCI depends on PCI
select BNX2 select BNX2
select UIO select UIO
---help--- ---help---
This driver supports offload features of Broadcom NetXtremeII This driver supports offload features of QLogic NetXtremeII
gigabit Ethernet cards. gigabit Ethernet cards.
To compile this driver as a module, choose M here: the module To compile this driver as a module, choose M here: the module

9
drivers/net/ethernet/broadcom/bnx2.c
View file

@ -1,6 +1,7 @@
/* bnx2.c: Broadcom NX2 network driver. /* bnx2.c: QLogic NX2 network driver.
* *
* Copyright (c) 2004-2013 Broadcom Corporation * Copyright (c) 2004-2014 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -71,10 +72,10 @@
#define TX_TIMEOUT (5*HZ) #define TX_TIMEOUT (5*HZ)
static char version[] = static char version[] =
"Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; "QLogic NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/5716 Driver"); MODULE_DESCRIPTION("QLogic NetXtreme II BCM5706/5708/5709/5716 Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_MODULE_VERSION); MODULE_VERSION(DRV_MODULE_VERSION);
MODULE_FIRMWARE(FW_MIPS_FILE_06); MODULE_FIRMWARE(FW_MIPS_FILE_06);

5
drivers/net/ethernet/broadcom/bnx2.h
View file

@ -1,6 +1,7 @@
/* bnx2.h: Broadcom NX2 network driver. /* bnx2.h: QLogic NX2 network driver.
* *
* Copyright (c) 2004-2013 Broadcom Corporation * Copyright (c) 2004-2014 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

3
drivers/net/ethernet/broadcom/bnx2_fw.h
View file

@ -1,6 +1,7 @@
/* bnx2_fw.h: Broadcom NX2 network driver. /* bnx2_fw.h: QLogic NX2 network driver.
* *
* Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation * Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

10
drivers/net/ethernet/broadcom/cnic.c
View file

@ -1,13 +1,15 @@
/* cnic.c: Broadcom CNIC core network driver. /* cnic.c: QLogic CNIC core network driver.
* *
* Copyright (c) 2006-2014 Broadcom Corporation * Copyright (c) 2006-2014 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
* the Free Software Foundation. * the Free Software Foundation.
* *
* Original skeleton written by: John(Zongxi) Chen (zongxi@broadcom.com) * Original skeleton written by: John(Zongxi) Chen (zongxi@broadcom.com)
* Modified and maintained by: Michael Chan <mchan@broadcom.com> * Previously modified and maintained by: Michael Chan <mchan@broadcom.com>
* Maintained By: Dept-HSGLinuxNICDev@qlogic.com
*/ */
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@ -56,11 +58,11 @@
#define CNIC_MODULE_NAME "cnic" #define CNIC_MODULE_NAME "cnic"
static char version[] = static char version[] =
"Broadcom NetXtreme II CNIC Driver " CNIC_MODULE_NAME " v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n"; "QLogic NetXtreme II CNIC Driver " CNIC_MODULE_NAME " v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n";
MODULE_AUTHOR("Michael Chan <mchan@broadcom.com> and John(Zongxi) " MODULE_AUTHOR("Michael Chan <mchan@broadcom.com> and John(Zongxi) "
"Chen (zongxi@broadcom.com"); "Chen (zongxi@broadcom.com");
MODULE_DESCRIPTION("Broadcom NetXtreme II CNIC Driver"); MODULE_DESCRIPTION("QLogic NetXtreme II CNIC Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(CNIC_MODULE_VERSION); MODULE_VERSION(CNIC_MODULE_VERSION);

3
drivers/net/ethernet/broadcom/cnic.h
View file

@ -1,6 +1,7 @@
/* cnic.h: Broadcom CNIC core network driver. /* cnic.h: QLogic CNIC core network driver.
* *
* Copyright (c) 2006-2014 Broadcom Corporation * Copyright (c) 2006-2014 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

3
drivers/net/ethernet/broadcom/cnic_defs.h
View file

@ -1,7 +1,8 @@
/* cnic.c: Broadcom CNIC core network driver. /* cnic.c: QLogic CNIC core network driver.
* *
* Copyright (c) 2006-2014 Broadcom Corporation * Copyright (c) 2006-2014 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by

3
drivers/net/ethernet/broadcom/cnic_if.h
View file

@ -1,6 +1,7 @@
/* cnic_if.h: Broadcom CNIC core network driver. /* cnic_if.h: QLogic CNIC core network driver.
* *
* Copyright (c) 2006-2014 Broadcom Corporation * Copyright (c) 2006-2014 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by