Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 173d6b5f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'bna-next' 



Rasesh Mody says:

====================
bna: Update the Driver and Firmware Version

These patches re-brands the BNA driver to QLogic. The patches update the BNA
driver version to 3.2.25.1 and firmware version to 3.2.5.1.

The patches are tested against 3.19.0.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bb39b743 3f307c3d

drivers/net/ethernet/brocade/Kconfig

+4 −4
Original line number Original line Diff line number Diff line 
#

#

# Brocade device configuration

# QLogic BR-series device configuration

#

#





config NET_VENDOR_BROCADE

config NET_VENDOR_BROCADE

	bool "Brocade devices"

	bool "QLogic BR-series devices"

	default y

	default y

	depends on PCI

	depends on PCI

	---help---

	---help---
@@ -13,8 +13,8 @@ config NET_VENDOR_BROCADE 




	  Note that the answer to this question doesn't directly affect the

	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  kernel: saying N will just cause the configurator to skip all

	  the questions about Brocade cards. If you say Y, you will be asked for

	  the questions about QLogic BR-series cards. If you say Y, you will be

	  your specific card in the following questions.

	  asked for your specific card in the following questions.





if NET_VENDOR_BROCADE

if NET_VENDOR_BROCADE

drivers/net/ethernet/brocade/Makefile

+1 −1
Original line number Original line Diff line number Diff line 
#

#

# Makefile for the Brocade device drivers.

# Makefile for the QLogic BR-series device drivers.

#

#





obj-$(CONFIG_BNA) += bna/
 
obj-$(CONFIG_BNA) += bna/

drivers/net/ethernet/brocade/bna/Kconfig

+6 −6
Original line number Original line Diff line number Diff line 
#

#

# Brocade network device configuration

# QLogic BR-series network device configuration

#

#





config BNA

config BNA

	tristate "Brocade 1010/1020 10Gb Ethernet Driver support"

	tristate "QLogic BR-series 1010/1020/1860 10Gb Ethernet Driver support"

	depends on PCI

	depends on PCI

	---help---

	---help---

	  This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet

	  This driver supports QLogic BR-series 1010/1020/1860 10Gb CEE capable

	  cards.

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

	  will be called bna.





	  For general information and support, go to the Brocade support

	  For general information and support, go to the QLogic support

	  website at:

	  website at:





	  <http://support.brocade.com>
 
	  <http://support.qlogic.com>

drivers/net/ethernet/brocade/bna/Makefile

+2 −1
Original line number Original line Diff line number Diff line 
#

#

# Copyright (c) 2005-2010 Brocade Communications Systems, Inc.

# Copyright (c) 2005-2014 Brocade Communications Systems, Inc.

# Copyright (c) 2014-2015 QLogic Corporation.

# All rights reserved.

# All rights reserved.

#

#

drivers/net/ethernet/brocade/bna/bfa_cee.c

+4 −3
Original line number Original line Diff line number Diff line 
/*

/*

 * Linux network driver for Brocade Converged Network Adapter.

 * Linux network driver for QLogic BR-series Converged Network Adapter.

 *

 *

 * This program is free software; you can redistribute it and/or modify it

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License (GPL) Version 2 as

 * under the terms of the GNU General Public License (GPL) Version 2 as
@@ -11,9 +11,10 @@ 
 * General Public License for more details.

 * General Public License for more details.

 */

 */

/*

/*

 * Copyright (c) 2005-2010 Brocade Communications Systems, Inc.

 * Copyright (c) 2005-2014 Brocade Communications Systems, Inc.

 * Copyright (c) 2014-2015 QLogic Corporation

 * All rights reserved

 * All rights reserved

 * www.brocade.com

 * www.qlogic.com

 */

 */





#include "bfa_cee.h"

#include "bfa_cee.h"