android/android_kernel_asus_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bnx2-cnic: Driver Rebranding Changes

Browse Source 
This patch provides additional changes as a part of BNX2 and CNIC driver
re-branding effort.

Signed-off-by: Rasesh Mody <rasesh.mody@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rasesh Mody
2015-02-17 19:26:18 -05:00
committed by David S. Miller
parent 959d10f6bb
commit 2e0bf125ac
6 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,12 +71,12 @@ config BCMGENET
Broadcom BCM7xxx Set Top Box family chipset. Broadcom BCM7xxx Set Top Box family chipset.
config BNX2 config BNX2
tristate "QLogic NetXtremeII support" tristate "QLogic bnx2 support"
depends on PCI depends on PCI
select CRC32 select CRC32
select FW_LOADER select FW_LOADER
---help--- ---help---
This driver supports QLogic NetXtremeII gigabit Ethernet cards. This driver supports QLogic bnx2 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.
@ -87,8 +87,8 @@ config CNIC
select BNX2 select BNX2
select UIO select UIO
---help--- ---help---
This driver supports offload features of QLogic NetXtremeII This driver supports offload features of QLogic bnx2 gigabit
gigabit Ethernet cards. 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 cnic. This is recommended. will be called cnic. This is recommended.

8
drivers/net/ethernet/broadcom/bnx2.c
View File

@ -1,7 +1,7 @@
/* bnx2.c: QLogic NX2 network driver. /* bnx2.c: QLogic bnx2 network driver.
* *
* Copyright (c) 2004-2014 Broadcom Corporation * Copyright (c) 2004-2014 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation * Copyright (c) 2014-2015 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
@ -72,10 +72,10 @@
#define TX_TIMEOUT (5*HZ) #define TX_TIMEOUT (5*HZ)
static char version[] = static char version[] =
"QLogic NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n"; "QLogic " DRV_MODULE_NAME " Gigabit Ethernet Driver v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
MODULE_DESCRIPTION("QLogic NetXtreme II BCM5706/5708/5709/5716 Driver"); MODULE_DESCRIPTION("QLogic 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);

4
drivers/net/ethernet/broadcom/bnx2.h
View File

@ -1,7 +1,7 @@
/* bnx2.h: QLogic NX2 network driver. /* bnx2.h: QLogic bnx2 network driver.
* *
* Copyright (c) 2004-2014 Broadcom Corporation * Copyright (c) 2004-2014 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation * Copyright (c) 2014-2015 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

4
drivers/net/ethernet/broadcom/bnx2_fw.h
View File

@ -1,7 +1,7 @@
/* bnx2_fw.h: QLogic NX2 network driver. /* bnx2_fw.h: QLogic bnx2 network driver.
* *
* Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation * Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation
* Copyright (c) 2014 QLogic Corporation * Copyright (c) 2014-2015 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

6
drivers/net/ethernet/broadcom/cnic.c
View File

@ -1,7 +1,7 @@
/* cnic.c: QLogic 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 * Copyright (c) 2014-2015 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
@ -58,11 +58,11 @@
#define CNIC_MODULE_NAME "cnic" #define CNIC_MODULE_NAME "cnic"
static char version[] = static char version[] =
"QLogic NetXtreme II CNIC Driver " CNIC_MODULE_NAME " v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n"; "QLogic " CNIC_MODULE_NAME "Driver 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("QLogic NetXtreme II CNIC Driver"); MODULE_DESCRIPTION("QLogic cnic Driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_VERSION(CNIC_MODULE_VERSION); MODULE_VERSION(CNIC_MODULE_VERSION);

4
drivers/net/ethernet/broadcom/cnic_if.h
View File

@ -1,7 +1,7 @@
/* cnic_if.h: QLogic 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 * Copyright (c) 2014-2015 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