aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJitendra Kalsaria <jitendra.kalsaria@qlogic.com>2014-06-23 15:10:33 -0400
committerDavid S. Miller <davem@davemloft.net>2014-06-25 19:27:27 -0400
commit28c4ec0df60c8162c2da48c1df5e1cb2f04cdaa5 (patch)
treeab5d8cd0e184b274e994ce914966059301b89616
parent1f74714f1e34a84fe4ef2a6d9b76c20794fb5dcf (diff)
bnx2: Rebranding bnx2 driver.
o QLogic has acquired the NetXtremeII products and drivers from Broadcom. This patch re-brands bnx2 driver as a QLogic driver Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/broadcom/Kconfig4
-rw-r--r--drivers/net/ethernet/broadcom/bnx2.c9
-rw-r--r--drivers/net/ethernet/broadcom/bnx2.h5
-rw-r--r--drivers/net/ethernet/broadcom/bnx2_fw.h3
4 files changed, 12 insertions, 9 deletions
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 3e488094b073..0bde4710158a 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -72,12 +72,12 @@ config BCMGENET
72 Broadcom BCM7xxx Set Top Box family chipset. 72 Broadcom BCM7xxx Set Top Box family chipset.
73 73
74config BNX2 74config BNX2
75 tristate "Broadcom NetXtremeII support" 75 tristate "QLogic NetXtremeII support"
76 depends on PCI 76 depends on PCI
77 select CRC32 77 select CRC32
78 select FW_LOADER 78 select FW_LOADER
79 ---help--- 79 ---help---
80 This driver supports Broadcom NetXtremeII gigabit Ethernet cards. 80 This driver supports QLogic NetXtremeII gigabit Ethernet cards.
81 81
82 To compile this driver as a module, choose M here: the module 82 To compile this driver as a module, choose M here: the module
83 will be called bnx2. This is recommended. 83 will be called bnx2. This is recommended.
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 67d2b0047371..e64c963fe775 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -1,6 +1,7 @@
1/* bnx2.c: Broadcom NX2 network driver. 1/* bnx2.c: QLogic NX2 network driver.
2 * 2 *
3 * Copyright (c) 2004-2013 Broadcom Corporation 3 * Copyright (c) 2004-2014 Broadcom Corporation
4 * Copyright (c) 2014 QLogic Corporation
4 * 5 *
5 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
@@ -71,10 +72,10 @@
71#define TX_TIMEOUT (5*HZ) 72#define TX_TIMEOUT (5*HZ)
72 73
73static char version[] = 74static 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";
75 76
76MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>"); 77MODULE_AUTHOR("Michael Chan <mchan@broadcom.com>");
77MODULE_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/5716 Driver"); 78MODULE_DESCRIPTION("QLogic NetXtreme II BCM5706/5708/5709/5716 Driver");
78MODULE_LICENSE("GPL"); 79MODULE_LICENSE("GPL");
79MODULE_VERSION(DRV_MODULE_VERSION); 80MODULE_VERSION(DRV_MODULE_VERSION);
80MODULE_FIRMWARE(FW_MIPS_FILE_06); 81MODULE_FIRMWARE(FW_MIPS_FILE_06);
diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h
index e341bc366fa5..28df35d35893 100644
--- a/drivers/net/ethernet/broadcom/bnx2.h
+++ b/drivers/net/ethernet/broadcom/bnx2.h
@@ -1,6 +1,7 @@
1/* bnx2.h: Broadcom NX2 network driver. 1/* bnx2.h: QLogic NX2 network driver.
2 * 2 *
3 * Copyright (c) 2004-2013 Broadcom Corporation 3 * Copyright (c) 2004-2014 Broadcom Corporation
4 * Copyright (c) 2014 QLogic Corporation
4 * 5 *
5 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
diff --git a/drivers/net/ethernet/broadcom/bnx2_fw.h b/drivers/net/ethernet/broadcom/bnx2_fw.h
index 940eb91f209d..7db79c28b5ff 100644
--- a/drivers/net/ethernet/broadcom/bnx2_fw.h
+++ b/drivers/net/ethernet/broadcom/bnx2_fw.h
@@ -1,6 +1,7 @@
1/* bnx2_fw.h: Broadcom NX2 network driver. 1/* bnx2_fw.h: QLogic NX2 network driver.
2 * 2 *
3 * Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation 3 * Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation
4 * Copyright (c) 2014 QLogic Corporation
4 * 5 *
5 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by