bnx2x: Rebrand from 'broadcom' into 'qlogic'

bnx2x still appears as a Broadcom driver even though the devices it
utilizes belong to Qlogic for more than a year.

This patch changes the various headers and the device strings to indicate
the correct ownership of the device.

Signed-off-by: Yuval Mintz <Yuval.Mintz@qlogic.com>
Signed-off-by: Ariel Elior <Ariel.Elior@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
index cd4ae76bbff2f8acda89154e65cf699e141553e5..a59f0b95203830243d86892785fa757daf3f1007 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x.h
@@ -1,6 +1,8 @@
-/* bnx2x.h: Broadcom Everest network driver.
+/* bnx2x.h: QLogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
index fc32821c2e4d41fff60a703691de3e322a08daa3..e395ae994307840e04fcc9d6a3b42aec0ec66257 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -1,6 +1,8 @@
-/* bnx2x_cmn.c: Broadcom Everest network driver.
+/* bnx2x_cmn.c: QLogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_cmn.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
index ec50d12d3198e92abf4bc19839e71d3845e5f1a6..77693d34acc98d6aaacd123f401a76560200af42 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.h
@@ -1,6 +1,8 @@
-/* bnx2x_cmn.h: Broadcom Everest network driver.
+/* bnx2x_cmn.h: QLogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_dcb.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
index b50f15496427e9d3266c4317fd15a8bf2b0ec0ff..7ccf6684e0a32d3b4a6caa78fa1fbff8dbbef460 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c
@@ -1,15 +1,17 @@
-/* bnx2x_dcb.c: Broadcom Everest network driver.
+/* bnx2x_dcb.c: QLogic Everest network driver.

  *
  * Copyright 2009-2013 Broadcom Corporation
  *
  * Copyright 2009-2013 Broadcom Corporation

+ * Copyright 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and QLogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other QLogic software provided under a
+ * license other than the GPL, without QLogic's express prior written

  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
index c6939ecb02c572fd41fa5d2c814ed5ad932c26e7..9a9517c0f703f756beb7df5522250f9b802c3ad1 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.h
@@ -1,15 +1,17 @@
-/* bnx2x_dcb.h: Broadcom Everest network driver.
+/* bnx2x_dcb.h: QLogic Everest network driver.

  *
  * Copyright 2009-2013 Broadcom Corporation
  *
  * Copyright 2009-2013 Broadcom Corporation

+ * Copyright 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and QLogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other QLogic software provided under a
+ * license other than the GPL, without QLogic's express prior written

  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
index 741aa130c19f4efb4df2e2b64b166f24bd4b6b3e..eccfa13b0f2d5c43132e581ac15c32f752903404 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_dump.h
@@ -1,15 +1,17 @@
-/* bnx2x_dump.h: Broadcom Everest network driver.
+/* bnx2x_dump.h: QLogic Everest network driver.

  *
  * Copyright (c) 2012-2013 Broadcom Corporation
  *
  * Copyright (c) 2012-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and QLogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other QLogic software provided under a
+ * license other than the GPL, without QLogic's express prior written

  * consent.
  */
 
  * consent.
  */
 

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
index c783b57b2c9b82df376a4b1d7c029e5717cb3632..fd3631b1a3781a41f7adc188988f4fb4b17f0c38 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
@@ -1,6 +1,8 @@
-/* bnx2x_ethtool.c: Broadcom Everest network driver.
+/* bnx2x_ethtool.c: QLogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_fw_defs.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
index bfda526ffeee663aa51cc04c2c009321505d56f7..226ab29f4cb6a4d10a9d41b501701bf953040c17 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_defs.h
@@ -1,6 +1,8 @@
-/* bnx2x_fw_defs.h: Broadcom Everest network driver.
+/* bnx2x_fw_defs.h: Qlogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_fw_file_hdr.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
index 8aafd9b5d6a2b107f67a8cce344b4bb479ccc85c..9e3b5a1e9f4f490bec6f74d1cb1f5c949289d67d 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_fw_file_hdr.h
@@ -1,6 +1,8 @@
 /* bnx2x_fw_file_hdr.h: FW binary file header structure.
  *
  * Copyright (c) 2007-2013 Broadcom Corporation
 /* bnx2x_fw_file_hdr.h: FW binary file header structure.
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_hsi.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
index 2b6f97bc780bd989d73edc0fd1bc2cafd908e62a..a838b6e8f159191d855af3f59ebe7ee7d7366e91 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h
@@ -1,6 +1,8 @@
-/* bnx2x_hsi.h: Broadcom Everest network driver.
+/* bnx2x_hsi.h: Qlogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_init.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
index d6e1975b7b691ab51ab536a7c9ec413601f24b6c..46ee2c01f4c5167209c23f3e1440b82630327cea 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init.h
@@ -1,7 +1,9 @@
-/* bnx2x_init.h: Broadcom Everest network driver.
+/* bnx2x_init.h: Qlogic Everest network driver.

  *               Structures and macroes needed during the initialization.
  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *               Structures and macroes needed during the initialization.
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_init_ops.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
index 5669ed2e87d0039ab02c3bc70636359e49c811e6..1835d2e451c0139e272e400774b0d6d19487df98 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h
@@ -1,8 +1,10 @@
-/* bnx2x_init_ops.h: Broadcom Everest network driver.
+/* bnx2x_init_ops.h: Qlogic Everest network driver.

  *               Static functions needed during the initialization.
  *               This file is "included" in bnx2x_main.c.
  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *               Static functions needed during the initialization.
  *               This file is "included" in bnx2x_main.c.
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
index a0b03c27e0a302c08fd1a78c5dbd2dd7606ae16a..7f9ec51cfe69f26737daf7bf46086645ed5f2b8a 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -1,13 +1,15 @@
 /* Copyright 2008-2013 Broadcom Corporation
 /* Copyright 2008-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and QLogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available

- * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
+ * at http://www.gnu.org/licenses/gpl-2.0.html (the "GPL").

  *
  * Notwithstanding the above, under no circumstances may you combine this
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other Qlogic software provided under a
+ * license other than the GPL, without Qlogic's express prior written

  * consent.
  *
  * Written by Yaniv Rosner
  * consent.
  *
  * Written by Yaniv Rosner

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
index d9cce4c3899b7b9d388cf28a6f4bf0feece3c4b2..b7d251108c19f56345304d88097619a58b08b8e4 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.h
@@ -1,13 +1,15 @@
 /* Copyright 2008-2013 Broadcom Corporation
 /* Copyright 2008-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and QLogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available

- * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
+ * at http://www.gnu.org/licenses/gpl-2.0.html (the "GPL").

  *
  * Notwithstanding the above, under no circumstances may you combine this
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other Qlogic software provided under a
+ * license other than the GPL, without Qlogic's express prior written

  * consent.
  *
  * Written by Yaniv Rosner
  * consent.
  *
  * Written by Yaniv Rosner

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 845471b6093f4b97d42ea2e0378085a1d98d9012..e85e6ffa4e61b2c02be85bf4a23c616e73402cfa 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -1,6 +1,8 @@
-/* bnx2x_main.c: Broadcom Everest network driver.
+/* bnx2x_main.c: QLogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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


@@ -81,11 +83,11 @@
 #define TX_TIMEOUT             (5*HZ)
 
 static char version[] =
 #define TX_TIMEOUT             (5*HZ)
 
 static char version[] =

-       "Broadcom NetXtreme II 5771x/578xx 10/20-Gigabit Ethernet Driver "
+       "QLogic 5771x/578xx 10/20-Gigabit Ethernet Driver "

        DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("Eliezer Tamir");
        DRV_MODULE_NAME " " DRV_MODULE_VERSION " (" DRV_MODULE_RELDATE ")\n";
 
 MODULE_AUTHOR("Eliezer Tamir");

-MODULE_DESCRIPTION("Broadcom NetXtreme II "
+MODULE_DESCRIPTION("QLogic "

                   "BCM57710/57711/57711E/"
                   "57712/57712_MF/57800/57800_MF/57810/57810_MF/"
                   "57840/57840_MF Driver");
                   "BCM57710/57711/57711E/"
                   "57712/57712_MF/57800/57800_MF/57810/57810_MF/"
                   "57840/57840_MF Driver");


@@ -163,27 +165,27 @@ enum bnx2x_board_type {
 static struct {
        char *name;
 } board_info[] = {
 static struct {
        char *name;
 } board_info[] = {

-       [BCM57710]      = { "Broadcom NetXtreme II BCM57710 10 Gigabit PCIe [Everest]" },
-       [BCM57711]      = { "Broadcom NetXtreme II BCM57711 10 Gigabit PCIe" },
-       [BCM57711E]     = { "Broadcom NetXtreme II BCM57711E 10 Gigabit PCIe" },
-       [BCM57712]      = { "Broadcom NetXtreme II BCM57712 10 Gigabit Ethernet" },
-       [BCM57712_MF]   = { "Broadcom NetXtreme II BCM57712 10 Gigabit Ethernet Multi Function" },
-       [BCM57712_VF]   = { "Broadcom NetXtreme II BCM57712 10 Gigabit Ethernet Virtual Function" },
-       [BCM57800]      = { "Broadcom NetXtreme II BCM57800 10 Gigabit Ethernet" },
-       [BCM57800_MF]   = { "Broadcom NetXtreme II BCM57800 10 Gigabit Ethernet Multi Function" },
-       [BCM57800_VF]   = { "Broadcom NetXtreme II BCM57800 10 Gigabit Ethernet Virtual Function" },
-       [BCM57810]      = { "Broadcom NetXtreme II BCM57810 10 Gigabit Ethernet" },
-       [BCM57810_MF]   = { "Broadcom NetXtreme II BCM57810 10 Gigabit Ethernet Multi Function" },
-       [BCM57810_VF]   = { "Broadcom NetXtreme II BCM57810 10 Gigabit Ethernet Virtual Function" },
-       [BCM57840_4_10] = { "Broadcom NetXtreme II BCM57840 10 Gigabit Ethernet" },
-       [BCM57840_2_20] = { "Broadcom NetXtreme II BCM57840 20 Gigabit Ethernet" },
-       [BCM57840_MF]   = { "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet Multi Function" },
-       [BCM57840_VF]   = { "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet Virtual Function" },
-       [BCM57811]      = { "Broadcom NetXtreme II BCM57811 10 Gigabit Ethernet" },
-       [BCM57811_MF]   = { "Broadcom NetXtreme II BCM57811 10 Gigabit Ethernet Multi Function" },
-       [BCM57840_O]    = { "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet" },
-       [BCM57840_MFO]  = { "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet Multi Function" },
-       [BCM57811_VF]   = { "Broadcom NetXtreme II BCM57840 10/20 Gigabit Ethernet Virtual Function" }
+       [BCM57710]      = { "QLogic BCM57710 10 Gigabit PCIe [Everest]" },
+       [BCM57711]      = { "QLogic BCM57711 10 Gigabit PCIe" },
+       [BCM57711E]     = { "QLogic BCM57711E 10 Gigabit PCIe" },
+       [BCM57712]      = { "QLogic BCM57712 10 Gigabit Ethernet" },
+       [BCM57712_MF]   = { "QLogic BCM57712 10 Gigabit Ethernet Multi Function" },
+       [BCM57712_VF]   = { "QLogic BCM57712 10 Gigabit Ethernet Virtual Function" },
+       [BCM57800]      = { "QLogic BCM57800 10 Gigabit Ethernet" },
+       [BCM57800_MF]   = { "QLogic BCM57800 10 Gigabit Ethernet Multi Function" },
+       [BCM57800_VF]   = { "QLogic BCM57800 10 Gigabit Ethernet Virtual Function" },
+       [BCM57810]      = { "QLogic BCM57810 10 Gigabit Ethernet" },
+       [BCM57810_MF]   = { "QLogic BCM57810 10 Gigabit Ethernet Multi Function" },
+       [BCM57810_VF]   = { "QLogic BCM57810 10 Gigabit Ethernet Virtual Function" },
+       [BCM57840_4_10] = { "QLogic BCM57840 10 Gigabit Ethernet" },
+       [BCM57840_2_20] = { "QLogic BCM57840 20 Gigabit Ethernet" },
+       [BCM57840_MF]   = { "QLogic BCM57840 10/20 Gigabit Ethernet Multi Function" },
+       [BCM57840_VF]   = { "QLogic BCM57840 10/20 Gigabit Ethernet Virtual Function" },
+       [BCM57811]      = { "QLogic BCM57811 10 Gigabit Ethernet" },
+       [BCM57811_MF]   = { "QLogic BCM57811 10 Gigabit Ethernet Multi Function" },
+       [BCM57840_O]    = { "QLogic BCM57840 10/20 Gigabit Ethernet" },
+       [BCM57840_MFO]  = { "QLogic BCM57840 10/20 Gigabit Ethernet Multi Function" },
+       [BCM57811_VF]   = { "QLogic BCM57840 10/20 Gigabit Ethernet Virtual Function" }

 };
 
 #ifndef PCI_DEVICE_ID_NX2_57710
 };
 
 #ifndef PCI_DEVICE_ID_NX2_57710

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h
index caf1aef651eb0bd38081887b68315597c2a5dc16..a91ccbf363451585bfd51e4203180fa45b9f8bcd 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_mfw_req.h
@@ -1,6 +1,8 @@
-/* bnx2x_mfw_req.h: Broadcom Everest network driver.
+/* bnx2x_mfw_req.h: Qlogic Everest network driver.

  *
  * Copyright (c) 2012-2013 Broadcom Corporation
  *
  * Copyright (c) 2012-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_reg.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
index 49d511092c82fc514832fc4aa30078a08a6f19ad..b7d33a1deb77bb3409c1f2e89b7a0ebd23fa9c77 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h
@@ -1,6 +1,8 @@
-/* bnx2x_reg.h: Broadcom Everest network driver.
+/* bnx2x_reg.h: Qlogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_sp.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
index 7d3f85eee63f18e00f58c83f84db72a405061fbf..265fe0a90adc07112e2cd985c96460c2204732d6 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
@@ -1,15 +1,17 @@
-/* bnx2x_sp.c: Broadcom Everest network driver.
+/* bnx2x_sp.c: Qlogic Everest network driver.

  *
  *

- * Copyright (c) 2011-2013 Broadcom Corporation
+ * Copyright 2011-2013 Broadcom Corporation
+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and Qlogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available

- * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
+ * at http://www.gnu.org/licenses/gpl-2.0.html (the "GPL").

  *
  * Notwithstanding the above, under no circumstances may you combine this
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other Qlogic software provided under a
+ * license other than the GPL, without Qlogic's express prior written

  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
index df27bb8dce182ad7a6a6c1aee08ca7bedb265acc..324e9f986314c86fe6f7e8e37f5c5ccac806cb22 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
@@ -1,15 +1,17 @@
-/* bnx2x_sp.h: Broadcom Everest network driver.
+/* bnx2x_sp.h: Qlogic Everest network driver.

  *
  *

- * Copyright (c) 2011-2013 Broadcom Corporation
+ * Copyright 2011-2013 Broadcom Corporation
+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and Qlogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available

- * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
+ * at http://www.gnu.org/licenses/gpl-2.0.html (the "GPL").

  *
  * Notwithstanding the above, under no circumstances may you combine this
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other Qlogic software provided under a
+ * license other than the GPL, without Qlogic's express prior written

  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
index f67348d169667376d47f082fc2da1eaf58843f1e..4d5c7b3d3a327f42ded41e6a65a026bbb412ae25 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -1,15 +1,17 @@
-/* bnx2x_sriov.c: Broadcom Everest network driver.
+/* bnx2x_sriov.c: QLogic Everest network driver.

  *
  * Copyright 2009-2013 Broadcom Corporation
  *
  * Copyright 2009-2013 Broadcom Corporation

+ * Copyright 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and QLogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other QLogic software provided under a
+ * license other than the GPL, without QLogic's express prior written

  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
index 66ee62a0401a86c9e44db1afdb9ebac0b7ebf49e..2011205ec8d467afc048dda44bcc72b6a191b452 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
@@ -1,15 +1,17 @@
-/* bnx2x_sriov.h: Broadcom Everest network driver.
+/* bnx2x_sriov.h: QLogic Everest network driver.

  *
  * Copyright 2009-2013 Broadcom Corporation
  *
  * Copyright 2009-2013 Broadcom Corporation

+ * Copyright 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and QLogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other QLogic software provided under a
+ * license other than the GPL, without QLogic's express prior written

  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
index 69d699f0730a3bd4d8980607e0a36cd8da461f1e..7e0919aa450e754d444bc7fb54ec4d2375fabcb8 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.c
@@ -1,6 +1,8 @@
-/* bnx2x_stats.c: Broadcom Everest network driver.
+/* bnx2x_stats.c: QLogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_stats.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
index 965539a9dabe7e4702e1ba6b382aefc69fb26fac..b2644ed13d064eacc3b34cf59d48b156bedac16b 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_stats.h
@@ -1,6 +1,8 @@
-/* bnx2x_stats.h: Broadcom Everest network driver.
+/* bnx2x_stats.h: QLogic Everest network driver.

  *
  * Copyright (c) 2007-2013 Broadcom Corporation
  *
  * Copyright (c) 2007-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  * 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
  *
  * 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/bnx2x/bnx2x_vfpf.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
index 06b8c0d8fd3b12ab4e864c8c0971cc52380c007c..31b79bd13292d75e6093f5033593972b92c3781e 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.c
@@ -1,15 +1,17 @@
-/* bnx2x_vfpf.c: Broadcom Everest network driver.
+/* bnx2x_vfpf.c: QLogic Everest network driver.

  *
  * Copyright 2009-2013 Broadcom Corporation
  *
  * Copyright 2009-2013 Broadcom Corporation

+ * Copyright 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and QLogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this
  * agreement governing use of this software, this software is licensed to you
  * under the terms of the GNU General Public License version 2, available
  * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
  *
  * Notwithstanding the above, under no circumstances may you combine this

- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
+ * software in any way with any other QLogic software provided under a
+ * license other than the GPL, without QLogic's express prior written

  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * consent.
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
index b86479fc0d2f80adc9a066da4e26ee9b50d80bc9..f0110f4bd0a34e889008b977b423159682c28a0a 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_vfpf.h
@@ -1,16 +1,22 @@
-/* bnx2x_vfpf.h: Broadcom Everest network driver.
+/* bnx2x_vfpf.h: Qlogic Everest network driver.

  *
  * Copyright (c) 2011-2013 Broadcom Corporation
  *
  * Copyright (c) 2011-2013 Broadcom Corporation

+ * Copyright (c) 2014 QLogic Corporation
+ * All rights reserved

  *
  *

- * Unless you and Broadcom execute a separate written software license
+ * Unless you and Qlogic execute a separate written software license

  * agreement governing use of this software, this software is licensed to you
  * agreement governing use of this software, this software is licensed to you

- * under the terms of the GNU General Public License version 2, available
- * at http://www.gnu.org/licenses/old-licenses/gpl-2.0.html (the "GPL").
+ * under the terms of the GNU General Public License version 2 (the “GPL”),
+ * available at http://www.gnu.org/licenses/gpl-2.0.html, with the following
+ * added to such license:

  *
  *

- * Notwithstanding the above, under no circumstances may you combine this
- * software in any way with any other Broadcom software provided under a
- * license other than the GPL, without Broadcom's express prior written
- * consent.
+ * As a special exception, the copyright holders of this software give you
+ * permission to link this software with independent modules, and to copy and
+ * distribute the resulting executable under terms of your choice, provided that
+ * you also meet, for each linked independent module, the terms and conditions
+ * of the license of that module.  An independent module is a module which is
+ * not derived from this software.  The special exception does not apply to any
+ * modifications of the software.

  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * Written by: Ariel Elior <ariel.elior@qlogic.com>
  *
  * Maintained by: Ariel Elior <ariel.elior@qlogic.com>
  * Written by: Ariel Elior <ariel.elior@qlogic.com>