summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVladislav Zolotarov <vladz@broadcom.com>2010-12-13 05:44:35 +0000
committerDavid S. Miller <davem@davemloft.net>2010-12-16 13:15:57 -0800
commit5928c8baf67a36f553fe23a1b7820c7745e8bb2e (patch)
tree3827c7d746086c5fa8d876eff79dbce67e5f3a07
parent40392d4e49c29bf5e939803d804dc8c7b600f297 (diff)
downloadlinux-stable-5928c8baf67a36f553fe23a1b7820c7745e8bb2e.tar.gz
linux-stable-5928c8baf67a36f553fe23a1b7820c7745e8bb2e.tar.bz2
linux-stable-5928c8baf67a36f553fe23a1b7820c7745e8bb2e.zip
bnx2x: replace FW to 6.2.5
Includes FCoE releated fixes in FW flows Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com> Signed-off-by: Eilon Greenstein <eilong@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/bnx2x/bnx2x_hsi.h4
-rw-r--r--firmware/Makefile6
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/bnx2x/bnx2x_hsi.h b/drivers/net/bnx2x/bnx2x_hsi.h
index ed90ec831fe0..6238d4f63989 100644
--- a/drivers/net/bnx2x/bnx2x_hsi.h
+++ b/drivers/net/bnx2x/bnx2x_hsi.h
@@ -1832,8 +1832,8 @@ struct host_func_stats {
#define BCM_5710_FW_MAJOR_VERSION 6
-#define BCM_5710_FW_MINOR_VERSION 0
-#define BCM_5710_FW_REVISION_VERSION 34
+#define BCM_5710_FW_MINOR_VERSION 2
+#define BCM_5710_FW_REVISION_VERSION 5
#define BCM_5710_FW_ENGINEERING_VERSION 0
#define BCM_5710_FW_COMPILE_FLAGS 1
diff --git a/firmware/Makefile b/firmware/Makefile
index 74d47cd0886c..69779d1637e1 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -32,9 +32,9 @@ fw-shipped-$(CONFIG_ADAPTEC_STARFIRE) += adaptec/starfire_rx.bin \
adaptec/starfire_tx.bin
fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin
fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw
-fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.0.34.0.fw \
- bnx2x/bnx2x-e1h-6.0.34.0.fw \
- bnx2x/bnx2x-e2-6.0.34.0.fw
+fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.5.0.fw \
+ bnx2x/bnx2x-e1h-6.2.5.0.fw \
+ bnx2x/bnx2x-e2-6.2.5.0.fw
fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.0.17.fw \
bnx2/bnx2-rv2p-09-6.0.17.fw \
bnx2/bnx2-rv2p-09ax-6.0.17.fw \