* [PATCH net-next 1/3] bnx2: Rebranding bnx2 driver.
2014-06-23 19:10 [PATCH net-next 0/3] Rebranding changes for bnx2 and cnic driver Jitendra Kalsaria
@ 2014-06-23 19:10 ` Jitendra Kalsaria
2014-06-23 19:10 ` [PATCH net-next 2/3] cnic: Rebranding cnic driver Jitendra Kalsaria
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jitendra Kalsaria @ 2014-06-23 19:10 UTC (permalink / raw)
To: davem; +Cc: netdev, sony.chacko, Dept-HSGLinuxNICDev, Jitendra Kalsaria
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
o QLogic has acquired the NetXtremeII products and drivers from Broadcom.
This patch re-brands bnx2 driver as a QLogic driver
---
drivers/net/ethernet/broadcom/Kconfig | 4 ++--
drivers/net/ethernet/broadcom/bnx2.c | 9 +++++----
drivers/net/ethernet/broadcom/bnx2.h | 5 +++--
drivers/net/ethernet/broadcom/bnx2_fw.h | 3 ++-
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 3e48809..0bde471 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -72,12 +72,12 @@ config BCMGENET
Broadcom BCM7xxx Set Top Box family chipset.
config BNX2
- tristate "Broadcom NetXtremeII support"
+ tristate "QLogic NetXtremeII support"
depends on PCI
select CRC32
select FW_LOADER
---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
will be called bnx2. This is recommended.
diff --git a/drivers/net/ethernet/broadcom/bnx2.c b/drivers/net/ethernet/broadcom/bnx2.c
index 67d2b00..e64c963 100644
--- a/drivers/net/ethernet/broadcom/bnx2.c
+++ b/drivers/net/ethernet/broadcom/bnx2.c
@@ -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
* it under the terms of the GNU General Public License as published by
@@ -71,10 +72,10 @@
#define TX_TIMEOUT (5*HZ)
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_DESCRIPTION("Broadcom NetXtreme II BCM5706/5708/5709/5716 Driver");
+MODULE_DESCRIPTION("QLogic NetXtreme II BCM5706/5708/5709/5716 Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(DRV_MODULE_VERSION);
MODULE_FIRMWARE(FW_MIPS_FILE_06);
diff --git a/drivers/net/ethernet/broadcom/bnx2.h b/drivers/net/ethernet/broadcom/bnx2.h
index e341bc3..28df35d 100644
--- a/drivers/net/ethernet/broadcom/bnx2.h
+++ b/drivers/net/ethernet/broadcom/bnx2.h
@@ -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
* 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 940eb91..7db79c2 100644
--- a/drivers/net/ethernet/broadcom/bnx2_fw.h
+++ b/drivers/net/ethernet/broadcom/bnx2_fw.h
@@ -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) 2014 QLogic Corporation
*
* 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net-next 2/3] cnic: Rebranding cnic driver.
2014-06-23 19:10 [PATCH net-next 0/3] Rebranding changes for bnx2 and cnic driver Jitendra Kalsaria
2014-06-23 19:10 ` [PATCH net-next 1/3] bnx2: Rebranding bnx2 driver Jitendra Kalsaria
@ 2014-06-23 19:10 ` Jitendra Kalsaria
2014-06-23 19:10 ` [PATCH net-next 3/3] MAINTAINERS: Update bnx2 maintainers Jitendra Kalsaria
2014-06-25 23:28 ` [PATCH net-next 0/3] Rebranding changes for bnx2 and cnic driver David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jitendra Kalsaria @ 2014-06-23 19:10 UTC (permalink / raw)
To: davem; +Cc: netdev, sony.chacko, Dept-HSGLinuxNICDev, Jitendra Kalsaria
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
o QLogic has acquired the NetXtremeII products and drivers from Broadcom.
This patch re-brands cnic driver as a QLogic driver
---
drivers/net/ethernet/broadcom/Kconfig | 4 ++--
drivers/net/ethernet/broadcom/cnic.c | 10 ++++++----
drivers/net/ethernet/broadcom/cnic.h | 3 ++-
drivers/net/ethernet/broadcom/cnic_defs.h | 3 ++-
drivers/net/ethernet/broadcom/cnic_if.h | 3 ++-
5 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ethernet/broadcom/Kconfig b/drivers/net/ethernet/broadcom/Kconfig
index 0bde471..7dcfb19 100644
--- a/drivers/net/ethernet/broadcom/Kconfig
+++ b/drivers/net/ethernet/broadcom/Kconfig
@@ -83,12 +83,12 @@ config BNX2
will be called bnx2. This is recommended.
config CNIC
- tristate "Broadcom CNIC support"
+ tristate "QLogic CNIC support"
depends on PCI
select BNX2
select UIO
---help---
- This driver supports offload features of Broadcom NetXtremeII
+ This driver supports offload features of QLogic NetXtremeII
gigabit Ethernet cards.
To compile this driver as a module, choose M here: the module
diff --git a/drivers/net/ethernet/broadcom/cnic.c b/drivers/net/ethernet/broadcom/cnic.c
index a4b25bc..aaa17b9 100644
--- a/drivers/net/ethernet/broadcom/cnic.c
+++ b/drivers/net/ethernet/broadcom/cnic.c
@@ -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) 2014 QLogic Corporation
*
* 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
* the Free Software Foundation.
*
* 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
@@ -56,11 +58,11 @@
#define CNIC_MODULE_NAME "cnic"
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) "
"Chen (zongxi@broadcom.com");
-MODULE_DESCRIPTION("Broadcom NetXtreme II CNIC Driver");
+MODULE_DESCRIPTION("QLogic NetXtreme II CNIC Driver");
MODULE_LICENSE("GPL");
MODULE_VERSION(CNIC_MODULE_VERSION);
diff --git a/drivers/net/ethernet/broadcom/cnic.h b/drivers/net/ethernet/broadcom/cnic.h
index d535ae4..4baea81 100644
--- a/drivers/net/ethernet/broadcom/cnic.h
+++ b/drivers/net/ethernet/broadcom/cnic.h
@@ -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) 2014 QLogic Corporation
*
* 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
diff --git a/drivers/net/ethernet/broadcom/cnic_defs.h b/drivers/net/ethernet/broadcom/cnic_defs.h
index dcbca69..b384997 100644
--- a/drivers/net/ethernet/broadcom/cnic_defs.h
+++ b/drivers/net/ethernet/broadcom/cnic_defs.h
@@ -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) 2014 QLogic Corporation
*
* 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
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h
index 5f4d557..8bb36c1 100644
--- a/drivers/net/ethernet/broadcom/cnic_if.h
+++ b/drivers/net/ethernet/broadcom/cnic_if.h
@@ -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) 2014 QLogic Corporation
*
* 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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH net-next 3/3] MAINTAINERS: Update bnx2 maintainers
2014-06-23 19:10 [PATCH net-next 0/3] Rebranding changes for bnx2 and cnic driver Jitendra Kalsaria
2014-06-23 19:10 ` [PATCH net-next 1/3] bnx2: Rebranding bnx2 driver Jitendra Kalsaria
2014-06-23 19:10 ` [PATCH net-next 2/3] cnic: Rebranding cnic driver Jitendra Kalsaria
@ 2014-06-23 19:10 ` Jitendra Kalsaria
2014-06-25 23:28 ` [PATCH net-next 0/3] Rebranding changes for bnx2 and cnic driver David Miller
3 siblings, 0 replies; 5+ messages in thread
From: Jitendra Kalsaria @ 2014-06-23 19:10 UTC (permalink / raw)
To: davem; +Cc: netdev, sony.chacko, Dept-HSGLinuxNICDev, Jitendra Kalsaria
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Signed-off-by: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
---
MAINTAINERS | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/MAINTAINERS b/MAINTAINERS
index 7a06ea4..f02b760 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1888,7 +1888,8 @@ S: Supported
F: drivers/net/ethernet/broadcom/genet/
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
S: Supported
F: drivers/net/ethernet/broadcom/bnx2.*
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH net-next 0/3] Rebranding changes for bnx2 and cnic driver
2014-06-23 19:10 [PATCH net-next 0/3] Rebranding changes for bnx2 and cnic driver Jitendra Kalsaria
` (2 preceding siblings ...)
2014-06-23 19:10 ` [PATCH net-next 3/3] MAINTAINERS: Update bnx2 maintainers Jitendra Kalsaria
@ 2014-06-25 23:28 ` David Miller
3 siblings, 0 replies; 5+ messages in thread
From: David Miller @ 2014-06-25 23:28 UTC (permalink / raw)
To: jitendra.kalsaria; +Cc: netdev, sony.chacko, Dept-HSGLinuxNICDev
From: Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
Date: Mon, 23 Jun 2014 15:10:32 -0400
> The following set of patches are for rebranding Broadcom bnx2 and cnic driver as QLogic drivers.
> Please apply this series to net-next.
Series applied to net-next, thanks.
^ permalink raw reply [flat|nested] 5+ messages in thread