diff options
| author | David S. Miller <davem@davemloft.net> | 2015-02-20 23:46:55 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-02-20 23:46:55 +0300 |
| commit | 931c471af51565a6290d9fabbe14ed7c8fa4a317 (patch) | |
| tree | 8adff655442ccf25229cc7c4098b9700356d7de2 /drivers/net/ethernet/broadcom/cnic_if.h | |
| parent | 959d10f6bbf6ab5b8813c4e37540a2e43ca2ae96 (diff) | |
| parent | 85fe7cd21f99fed1842275ef86c88de5ecc998b4 (diff) | |
| download | linux-931c471af51565a6290d9fabbe14ed7c8fa4a317.tar.xz | |
Merge branch 'bnx2x-next'
Rasesh Mody says:
====================
bnx2-cnic: Driver Version Upgrades
This patch set includes bnx2 and cnic drivers' re-branding changes, fix for a
chip initialization issue and updates the bnx2 driver version to 2.2.6 and
cnic driver version to 2.5.21.
Please apply these patches to net-next.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/broadcom/cnic_if.h')
| -rw-r--r-- | drivers/net/ethernet/broadcom/cnic_if.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/ethernet/broadcom/cnic_if.h b/drivers/net/ethernet/broadcom/cnic_if.h index 8bb36c1c4d68..ef6125b0ee3e 100644 --- a/drivers/net/ethernet/broadcom/cnic_if.h +++ b/drivers/net/ethernet/broadcom/cnic_if.h @@ -1,7 +1,7 @@ -/* cnic_if.h: QLogic CNIC core network driver. +/* cnic_if.h: QLogic cnic core network driver. * * Copyright (c) 2006-2014 Broadcom Corporation - * Copyright (c) 2014 QLogic Corporation + * Copyright (c) 2014-2015 QLogic Corporation * * 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 @@ -15,8 +15,8 @@ #include "bnx2x/bnx2x_mfw_req.h" -#define CNIC_MODULE_VERSION "2.5.20" -#define CNIC_MODULE_RELDATE "March 14, 2014" +#define CNIC_MODULE_VERSION "2.5.21" +#define CNIC_MODULE_RELDATE "January 29, 2015" #define CNIC_ULP_RDMA 0 #define CNIC_ULP_ISCSI 1 |