diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-04-02 09:26:51 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-04-02 09:26:51 +0300 |
| commit | b916693a7731670429609854c32de1a71775d070 (patch) | |
| tree | 1007e5aedd88f94bdb6a55e0f7b4b8e3aee7c29d /drivers/net/ethernet/brocade/bna/bfa_cs.h | |
| parent | 21023b1e7f9862015fd8c91d5619217da8d9a06a (diff) | |
| parent | 2c44be81f0fc147eed9dc63e2601318b2c007aeb (diff) | |
Merge tag 'mac80211-next-for-davem-2015-03-30' into iwlwifi-next
Lots of updates for net-next; along with the usual flurry
of small fixes, cleanups and internal features we have:
* VHT support for TDLS and IBSS (conditional on drivers though)
* first TX performance improvements (the biggest will come later)
* many suspend/resume (race) fixes
* name_assign_type support from Tom Gundersen
Diffstat (limited to 'drivers/net/ethernet/brocade/bna/bfa_cs.h')
| -rw-r--r-- | drivers/net/ethernet/brocade/bna/bfa_cs.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/ethernet/brocade/bna/bfa_cs.h b/drivers/net/ethernet/brocade/bna/bfa_cs.h index ad004a4c3897..af25d8e8fae0 100644 --- a/drivers/net/ethernet/brocade/bna/bfa_cs.h +++ b/drivers/net/ethernet/brocade/bna/bfa_cs.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-2011 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 */ /* BFA common services */ |