Skip to content

Commit 13ec7a6

Browse files
davem330davem330
committed
Merge branch 'broadcom_rebranding'
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 <[email protected]>
2 parents 1f74714 + f1d1bae commit 13ec7a6

File tree

9 files changed

+28
-19
lines changed

9 files changed

+28
-19
lines changed

‎MAINTAINERS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1894,7 +1894,8 @@ S: Supported
18941894
F: drivers/net/ethernet/broadcom/genet/
18951895

18961896
BROADCOM BNX2 GIGABIT ETHERNET DRIVER
1897-
M: Michael Chan <[email protected]>
1897+
M: Sony Chacko <[email protected]>
1898+
M: [email protected]
18981899
L: [email protected]
18991900
S: Supported
19001901
F: drivers/net/ethernet/broadcom/bnx2.*

‎drivers/net/ethernet/broadcom/Kconfig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,23 +72,23 @@ config BCMGENET
7272
Broadcom BCM7xxx Set Top Box family chipset.
7373

7474
config BNX2
75-
tristate "Broadcom NetXtremeII support"
75+
tristate "QLogic NetXtremeII support"
7676
depends on PCI
7777
select CRC32
7878
select FW_LOADER
7979
---help---
80-
This driver supports Broadcom NetXtremeII gigabit Ethernet cards.
80+
This driver supports QLogic NetXtremeII gigabit Ethernet cards.
8181

8282
To compile this driver as a module, choose M here: the module
8383
will be called bnx2. This is recommended.
8484

8585
config CNIC
86-
tristate "Broadcom CNIC support"
86+
tristate "QLogic CNIC support"
8787
depends on PCI
8888
select BNX2
8989
select UIO
9090
---help---
91-
This driver supports offload features of Broadcom NetXtremeII
91+
This driver supports offload features of QLogic NetXtremeII
9292
gigabit Ethernet cards.
9393

9494
To compile this driver as a module, choose M here: the module

‎drivers/net/ethernet/broadcom/bnx2.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* bnx2.c: Broadcom NX2 network driver.
1+
/* bnx2.c: QLogic NX2 network driver.
22
*
3-
* Copyright (c) 2004-2013 Broadcom Corporation
3+
* Copyright (c) 2004-2014 Broadcom Corporation
4+
* Copyright (c) 2014 QLogic Corporation
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
@@ -71,10 +72,10 @@
7172
#define TX_TIMEOUT (5*HZ)
7273

7374
static char version[] =
74-
"Broadcom NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
75+
"QLogic NetXtreme II Gigabit Ethernet Driver " DRV_MODULE_NAME " v" DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
7576

7677
MODULE_AUTHOR("Michael Chan <[email protected]>");
77-
MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/5716 Driver");
78+
MODULE_DESCRIPTION("QLogic NetXtreme II BCM5706/5708/5709/5716 Driver");
7879
MODULE_LICENSE("GPL");
7980
MODULE_VERSION(DRV_MODULE_VERSION);
8081
MODULE_FIRMWARE(FW_MIPS_FILE_06);

‎drivers/net/ethernet/broadcom/bnx2.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* bnx2.h: Broadcom NX2 network driver.
1+
/* bnx2.h: QLogic NX2 network driver.
22
*
3-
* Copyright (c) 2004-2013 Broadcom Corporation
3+
* Copyright (c) 2004-2014 Broadcom Corporation
4+
* Copyright (c) 2014 QLogic Corporation
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by

‎drivers/net/ethernet/broadcom/bnx2_fw.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* bnx2_fw.h: Broadcom NX2 network driver.
1+
/* bnx2_fw.h: QLogic NX2 network driver.
22
*
33
* Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation
4+
* Copyright (c) 2014 QLogic Corporation
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by

‎drivers/net/ethernet/broadcom/cnic.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
/* cnic.c: Broadcom CNIC core network driver.
1+
/* cnic.c: QLogic CNIC core network driver.
22
*
33
* Copyright (c) 2006-2014 Broadcom Corporation
4+
* Copyright (c) 2014 QLogic Corporation
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by
78
* the Free Software Foundation.
89
*
910
* Original skeleton written by: John(Zongxi) Chen ([email protected])
10-
* Modified and maintained by: Michael Chan <[email protected]>
11+
* Previously modified and maintained by: Michael Chan <[email protected]>
12+
* Maintained By: [email protected]
1113
*/
1214

1315
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -56,11 +58,11 @@
5658
#define CNIC_MODULE_NAME "cnic"
5759

5860
static char version[] =
59-
"Broadcom NetXtreme II CNIC Driver " CNIC_MODULE_NAME " v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n";
61+
"QLogic NetXtreme II CNIC Driver " CNIC_MODULE_NAME " v" CNIC_MODULE_VERSION " (" CNIC_MODULE_RELDATE ")\n";
6062

6163
MODULE_AUTHOR("Michael Chan <[email protected]> and John(Zongxi) "
6264
"Chen ([email protected]");
63-
MODULE_DESCRIPTION("Broadcom NetXtreme II CNIC Driver");
65+
MODULE_DESCRIPTION("QLogic NetXtreme II CNIC Driver");
6466
MODULE_LICENSE("GPL");
6567
MODULE_VERSION(CNIC_MODULE_VERSION);
6668

‎drivers/net/ethernet/broadcom/cnic.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* cnic.h: Broadcom CNIC core network driver.
1+
/* cnic.h: QLogic CNIC core network driver.
22
*
33
* Copyright (c) 2006-2014 Broadcom Corporation
4+
* Copyright (c) 2014 QLogic Corporation
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by

‎drivers/net/ethernet/broadcom/cnic_defs.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11

2-
/* cnic.c: Broadcom CNIC core network driver.
2+
/* cnic.c: QLogic CNIC core network driver.
33
*
44
* Copyright (c) 2006-2014 Broadcom Corporation
5+
* Copyright (c) 2014 QLogic Corporation
56
*
67
* This program is free software; you can redistribute it and/or modify
78
* it under the terms of the GNU General Public License as published by

‎drivers/net/ethernet/broadcom/cnic_if.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
/* cnic_if.h: Broadcom CNIC core network driver.
1+
/* cnic_if.h: QLogic CNIC core network driver.
22
*
33
* Copyright (c) 2006-2014 Broadcom Corporation
4+
* Copyright (c) 2014 QLogic Corporation
45
*
56
* This program is free software; you can redistribute it and/or modify
67
* it under the terms of the GNU General Public License as published by

0 commit comments

Comments
 (0)