Commit 13ec7a6b authored by David S. Miller's avatar David S. Miller
Browse files

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: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f74714f f1d1baeb

MAINTAINERS

+2 −1
Original line number Original line Diff line number Diff line
@@ -1894,7 +1894,8 @@ S: Supported 
F:	drivers/net/ethernet/broadcom/genet/

F:	drivers/net/ethernet/broadcom/genet/





BROADCOM BNX2 GIGABIT ETHERNET DRIVER

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

L:	netdev@vger.kernel.org

S:	Supported

S:	Supported

F:	drivers/net/ethernet/broadcom/bnx2.*

F:	drivers/net/ethernet/broadcom/bnx2.*

drivers/net/ethernet/broadcom/Kconfig

+4 −4
Original line number Original line Diff line number Diff line
@@ -72,23 +72,23 @@ config BCMGENET 
	  Broadcom BCM7xxx Set Top Box family chipset.

	  Broadcom BCM7xxx Set Top Box family chipset.





config BNX2

config BNX2

	tristate "Broadcom NetXtremeII support"

	tristate "QLogic NetXtremeII support"

	depends on PCI

	depends on PCI

	select CRC32

	select CRC32

	select FW_LOADER

	select FW_LOADER

	---help---

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

	  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.





config CNIC

config CNIC

	tristate "Broadcom CNIC support"

	tristate "QLogic CNIC support"

	depends on PCI

	depends on PCI

	select BNX2

	select BNX2

	select UIO

	select UIO

	---help---

	---help---

	  This driver supports offload features of Broadcom NetXtremeII

	  This driver supports offload features of QLogic NetXtremeII

	  gigabit Ethernet cards.

	  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

drivers/net/ethernet/broadcom/bnx2.c

+5 −4
Original line number Original line Diff line number Diff line 
/* 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

 * 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
@@ -71,10 +72,10 @@ 
#define TX_TIMEOUT  (5*HZ)

#define TX_TIMEOUT  (5*HZ)





static char version[] =

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_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_LICENSE("GPL");

MODULE_VERSION(DRV_MODULE_VERSION);

MODULE_VERSION(DRV_MODULE_VERSION);

MODULE_FIRMWARE(FW_MIPS_FILE_06);

MODULE_FIRMWARE(FW_MIPS_FILE_06);

drivers/net/ethernet/broadcom/bnx2.h

+3 −2
Original line number Original line Diff line number Diff line 
/* 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

 * 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

drivers/net/ethernet/broadcom/bnx2_fw.h

+2 −1
Original line number Original line Diff line number Diff line 
/* bnx2_fw.h: Broadcom NX2 network driver.

/* bnx2_fw.h: QLogic NX2 network driver.

 *

 *

 * Copyright (c) 2004, 2005, 2006, 2007 Broadcom Corporation

 * 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

 * 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