tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: David S. Miller <davem@davemloft.net>

David S. Miller 173d6b5f bb39b743

+130 -102
+4 -4
drivers/net/ethernet/brocade/Kconfig
··· 1 1 # 2 - # Brocade device configuration 2 + # QLogic BR-series device configuration 3 3 # 4 4 5 5 config NET_VENDOR_BROCADE 6 - bool "Brocade devices" 6 + bool "QLogic BR-series devices" 7 7 default y 8 8 depends on PCI 9 9 ---help--- ··· 13 13 14 14 Note that the answer to this question doesn't directly affect the 15 15 kernel: saying N will just cause the configurator to skip all 16 - the questions about Brocade cards. If you say Y, you will be asked for 17 - your specific card in the following questions. 16 + the questions about QLogic BR-series cards. If you say Y, you will be 17 + asked for your specific card in the following questions. 18 18 19 19 if NET_VENDOR_BROCADE 20 20
+1 -1
drivers/net/ethernet/brocade/Makefile
··· 1 1 # 2 - # Makefile for the Brocade device drivers. 2 + # Makefile for the QLogic BR-series device drivers. 3 3 # 4 4 5 5 obj-$(CONFIG_BNA) += bna/
+6 -6
drivers/net/ethernet/brocade/bna/Kconfig
··· 1 1 # 2 - # Brocade network device configuration 2 + # QLogic BR-series network device configuration 3 3 # 4 4 5 5 config BNA 6 - tristate "Brocade 1010/1020 10Gb Ethernet Driver support" 6 + tristate "QLogic BR-series 1010/1020/1860 10Gb Ethernet Driver support" 7 7 depends on PCI 8 8 ---help--- 9 - This driver supports Brocade 1010/1020 10Gb CEE capable Ethernet 10 - cards. 9 + This driver supports QLogic BR-series 1010/1020/1860 10Gb CEE capable 10 + Ethernet cards. 11 11 To compile this driver as a module, choose M here: the module 12 12 will be called bna. 13 13 14 - For general information and support, go to the Brocade support 14 + For general information and support, go to the QLogic support 15 15 website at: 16 16 17 - <http://support.brocade.com> 17 + <http://support.qlogic.com>
+2 -1
drivers/net/ethernet/brocade/bna/Makefile
··· 1 1 # 2 - # Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 2 + # Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 3 + # Copyright (c) 2014-2015 QLogic Corporation. 3 4 # All rights reserved. 4 5 # 5 6
+4 -3
drivers/net/ethernet/brocade/bna/bfa_cee.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #include "bfa_cee.h"
+4 -3
drivers/net/ethernet/brocade/bna/bfa_cee.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #ifndef __BFA_CEE_H__
+4 -3
drivers/net/ethernet/brocade/bna/bfa_cs.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 /* BFA common services */
+4 -3
drivers/net/ethernet/brocade/bna/bfa_defs.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #ifndef __BFA_DEFS_H__
+4 -3
drivers/net/ethernet/brocade/bna/bfa_defs_cna.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #ifndef __BFA_DEFS_CNA_H__ 19 20 #define __BFA_DEFS_CNA_H__
+4 -3
drivers/net/ethernet/brocade/bna/bfa_defs_mfg_comm.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #ifndef __BFA_DEFS_MFG_COMM_H__ 19 20 #define __BFA_DEFS_MFG_COMM_H__
+4 -3
drivers/net/ethernet/brocade/bna/bfa_defs_status.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #ifndef __BFA_DEFS_STATUS_H__ 19 20 #define __BFA_DEFS_STATUS_H__
+5 -4
drivers/net/ethernet/brocade/bna/bfa_ioc.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #include "bfa_ioc.h" ··· 2764 2763 list_add_tail(&notify->qe, &ioc->notify_q); 2765 2764 } 2766 2765 2767 - #define BFA_MFG_NAME "Brocade" 2766 + #define BFA_MFG_NAME "QLogic" 2768 2767 static void 2769 2768 bfa_ioc_get_adapter_attr(struct bfa_ioc *ioc, 2770 2769 struct bfa_adapter_attr *ad_attr)
+4 -3
drivers/net/ethernet/brocade/bna/bfa_ioc.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #ifndef __BFA_IOC_H__
+4 -3
drivers/net/ethernet/brocade/bna/bfa_ioc_ct.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #include "bfa_ioc.h"
+4 -3
drivers/net/ethernet/brocade/bna/bfa_msgq.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 /* MSGQ module source file. */
+4 -3
drivers/net/ethernet/brocade/bna/bfa_msgq.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #ifndef __BFA_MSGQ_H__
+4 -3
drivers/net/ethernet/brocade/bna/bfi.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #ifndef __BFI_H__ 19 20 #define __BFI_H__
+4 -3
drivers/net/ethernet/brocade/bna/bfi_cna.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #ifndef __BFI_CNA_H__ 19 20 #define __BFI_CNA_H__
+4 -3
drivers/net/ethernet/brocade/bna/bfi_enet.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 /* BNA Hardware and Firmware Interface */
+7 -6
drivers/net/ethernet/brocade/bna/bfi_reg.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 /* 20 - * bfi_reg.h ASIC register defines for all Brocade adapter ASICs 21 + * bfi_reg.h ASIC register defines for all QLogic BR-series adapter ASICs 21 22 */ 22 23 23 24 #ifndef __BFI_REG_H__ ··· 222 221 #define __PMM_1T_RESET_P 0x00000001 223 222 #define PMM_1T_RESET_REG_P1 0x00023c1c 224 223 225 - /* Brocade 1860 Adapter specific defines */ 224 + /* QLogic BR-series 1860 Adapter specific defines */ 226 225 #define CT2_PCI_CPQ_BASE 0x00030000 227 226 #define CT2_PCI_APP_BASE 0x00030100 228 227 #define CT2_PCI_ETH_BASE 0x00030400 ··· 265 264 #define CT2_HOSTFN_MSIX_VT_INDEX_MBOX_ERR (CT2_PCI_APP_BASE + 0x38) 266 265 267 266 /* 268 - * Brocade 1860 adapter CPQ block registers 267 + * QLogic BR-series 1860 adapter CPQ block registers 269 268 */ 270 269 #define CT2_HOSTFN_LPU0_MBOX0 (CT2_PCI_CPQ_BASE + 0x00) 271 270 #define CT2_HOSTFN_LPU1_MBOX0 (CT2_PCI_CPQ_BASE + 0x20)
+4 -3
drivers/net/ethernet/brocade/bna/bna.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #ifndef __BNA_H__ 19 20 #define __BNA_H__
+4 -3
drivers/net/ethernet/brocade/bna/bna_enet.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #include "bna.h" 19 20
+4 -3
drivers/net/ethernet/brocade/bna/bna_hw_defs.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 /* File for interrupt macros and functions */
+4 -3
drivers/net/ethernet/brocade/bna/bna_tx_rx.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #include "bna.h" 19 20 #include "bfi.h"
+4 -3
drivers/net/ethernet/brocade/bna/bna_types.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #ifndef __BNA_TYPES_H__ 19 20 #define __BNA_TYPES_H__
+6 -5
drivers/net/ethernet/brocade/bna/bnad.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #include <linux/bitops.h> 19 20 #include <linux/netdevice.h> ··· 3868 3867 { 3869 3868 int err; 3870 3869 3871 - pr_info("Brocade 10G Ethernet driver - version: %s\n", 3870 + pr_info("QLogic BR-series 10G Ethernet driver - version: %s\n", 3872 3871 BNAD_VERSION); 3873 3872 3874 3873 bfa_nw_ioc_auto_recover(bnad_ioc_auto_recover); ··· 3895 3894 3896 3895 MODULE_AUTHOR("Brocade"); 3897 3896 MODULE_LICENSE("GPL"); 3898 - MODULE_DESCRIPTION("Brocade 10G PCIe Ethernet driver"); 3897 + MODULE_DESCRIPTION("QLogic BR-series 10G PCIe Ethernet driver"); 3899 3898 MODULE_VERSION(BNAD_VERSION); 3900 3899 MODULE_FIRMWARE(CNA_FW_FILE_CT); 3901 3900 MODULE_FIRMWARE(CNA_FW_FILE_CT2);
+5 -4
drivers/net/ethernet/brocade/bna/bnad.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #ifndef __BNAD_H__ 19 20 #define __BNAD_H__ ··· 72 71 #define BNAD_NAME "bna" 73 72 #define BNAD_NAME_LEN 64 74 73 75 - #define BNAD_VERSION "3.2.23.0" 74 + #define BNAD_VERSION "3.2.25.1" 76 75 77 76 #define BNAD_MAILBOX_MSIX_INDEX 0 78 77 #define BNAD_MAILBOX_MSIX_VECTORS 1
+4 -3
drivers/net/ethernet/brocade/bna/bnad_debugfs.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2011 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #include <linux/debugfs.h>
+4 -3
drivers/net/ethernet/brocade/bna/bnad_ethtool.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #include "cna.h"
+6 -5
drivers/net/ethernet/brocade/bna/cna.h
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2006-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2006-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 19 20 #ifndef __CNA_H__ ··· 38 37 39 38 extern char bfa_version[]; 40 39 41 - #define CNA_FW_FILE_CT "ctfw-3.2.3.0.bin" 42 - #define CNA_FW_FILE_CT2 "ct2fw-3.2.3.0.bin" 40 + #define CNA_FW_FILE_CT "ctfw-3.2.5.1.bin" 41 + #define CNA_FW_FILE_CT2 "ct2fw-3.2.5.1.bin" 43 42 #define FC_SYMNAME_MAX 256 /*!< max name server symbolic name size */ 44 43 45 44 #pragma pack(1)
+4 -3
drivers/net/ethernet/brocade/bna/cna_fwimg.c
··· 1 1 /* 2 - * Linux network driver for Brocade Converged Network Adapter. 2 + * Linux network driver for QLogic BR-series Converged Network Adapter. 3 3 * 4 4 * This program is free software; you can redistribute it and/or modify it 5 5 * under the terms of the GNU General Public License (GPL) Version 2 as ··· 11 11 * General Public License for more details. 12 12 */ 13 13 /* 14 - * Copyright (c) 2005-2010 Brocade Communications Systems, Inc. 14 + * Copyright (c) 2005-2014 Brocade Communications Systems, Inc. 15 + * Copyright (c) 2014-2015 QLogic Corporation 15 16 * All rights reserved 16 - * www.brocade.com 17 + * www.qlogic.com 17 18 */ 18 19 #include <linux/firmware.h> 19 20 #include "bnad.h"