From c6fc06d4caf9201e54530b498b8c9053e4103a59 Mon Sep 17 00:00:00 2001 From: Vladislav Zolotarov Date: Mon, 13 Dec 2010 05:44:35 +0000 Subject: [PATCH] --- yaml --- r: 225169 b: refs/heads/master c: 5928c8baf67a36f553fe23a1b7820c7745e8bb2e h: refs/heads/master i: 225167: 06ef9ea0aca45a85f6cd91127697c2d35f4abd3f v: v3 --- [refs] | 2 +- trunk/drivers/net/bnx2x/bnx2x_hsi.h | 4 ++-- trunk/firmware/Makefile | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index ca1cc232f017..09a87e3cd0a1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 40392d4e49c29bf5e939803d804dc8c7b600f297 +refs/heads/master: 5928c8baf67a36f553fe23a1b7820c7745e8bb2e diff --git a/trunk/drivers/net/bnx2x/bnx2x_hsi.h b/trunk/drivers/net/bnx2x/bnx2x_hsi.h index ed90ec831fe0..6238d4f63989 100644 --- a/trunk/drivers/net/bnx2x/bnx2x_hsi.h +++ b/trunk/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/trunk/firmware/Makefile b/trunk/firmware/Makefile index 74d47cd0886c..69779d1637e1 100644 --- a/trunk/firmware/Makefile +++ b/trunk/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 \