diff options
author | David S. Miller <davem@davemloft.net> | 2015-02-22 04:05:30 +0100 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-02-22 04:05:30 +0100 |
commit | 173d6b5fdbe65dbdb8be2f7ce481f0c55d78c2b2 (patch) | |
tree | 64fb50ac117be600ce2b0bb9b0a0823a999f20ef /drivers/net/ethernet/brocade/bna/bnad.h | |
parent | sunvnet: failed trigger should not cause BUG_ON() (diff) | |
parent | bna: Update the Driver and Firmware Version (diff) | |
download | linux-173d6b5fdbe65dbdb8be2f7ce481f0c55d78c2b2.tar.xz linux-173d6b5fdbe65dbdb8be2f7ce481f0c55d78c2b2.zip |
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>
Diffstat (limited to 'drivers/net/ethernet/brocade/bna/bnad.h')
-rw-r--r-- | drivers/net/ethernet/brocade/bna/bnad.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bnad.h b/drivers/net/ethernet/brocade/bna/bnad.h index 2842c188e0da..7ead6c23edb6 100644 --- a/drivers/net/ethernet/brocade/bna/bnad.h +++ b/drivers/net/ethernet/brocade/bna/bnad.h @@ -1,5 +1,5 @@ /* - * 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 * under the terms of the GNU General Public License (GPL) Version 2 as @@ -11,9 +11,10 @@ * 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 - * www.brocade.com + * www.qlogic.com */ #ifndef __BNAD_H__ #define __BNAD_H__ @@ -71,7 +72,7 @@ struct bnad_rx_ctrl { #define BNAD_NAME "bna" #define BNAD_NAME_LEN 64 -#define BNAD_VERSION "3.2.23.0" +#define BNAD_VERSION "3.2.25.1" #define BNAD_MAILBOX_MSIX_INDEX 0 #define BNAD_MAILBOX_MSIX_VECTORS 1 |