From e8ebd89459cde6dd177cf530a369aa3f573708da Mon Sep 17 00:00:00 2001
From: Michael Chan <mchan@broadcom.com>
Date: Sun, 18 Dec 2011 18:15:09 +0000
Subject: [PATCH] --- yaml --- r: 279015 b: refs/heads/master c:
 c2c20ef43d00b1439631e603f8dcee9a803cd8b3 h: refs/heads/master i:   279013:
 332a8c4c8eae3074927d3c15fc4604bbbf721bea   279011:
 6d1eed8ee665b8887987f3b9988c17e2f73bd2ab   279007:
 47bcdd345fa1617699572abab89687d099ff0f0c v: v3

---
 [refs]                                     | 2 +-
 trunk/drivers/net/ethernet/broadcom/bnx2.c | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 4eb0f19537d0..fb9ddff01ee6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93c86700c0ae3a1407b979073f423e62e29372c1
+refs/heads/master: c2c20ef43d00b1439631e603f8dcee9a803cd8b3
diff --git a/trunk/drivers/net/ethernet/broadcom/bnx2.c b/trunk/drivers/net/ethernet/broadcom/bnx2.c
index 787e1757973a..021fb818007a 100644
--- a/trunk/drivers/net/ethernet/broadcom/bnx2.c
+++ b/trunk/drivers/net/ethernet/broadcom/bnx2.c
@@ -57,11 +57,11 @@
 #include "bnx2_fw.h"
 
 #define DRV_MODULE_NAME		"bnx2"
-#define DRV_MODULE_VERSION	"2.1.11"
-#define DRV_MODULE_RELDATE	"July 20, 2011"
-#define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-6.2.1.fw"
+#define DRV_MODULE_VERSION	"2.2.1"
+#define DRV_MODULE_RELDATE	"Dec 18, 2011"
+#define FW_MIPS_FILE_06		"bnx2/bnx2-mips-06-6.2.3.fw"
 #define FW_RV2P_FILE_06		"bnx2/bnx2-rv2p-06-6.0.15.fw"
-#define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-6.2.1a.fw"
+#define FW_MIPS_FILE_09		"bnx2/bnx2-mips-09-6.2.1b.fw"
 #define FW_RV2P_FILE_09_Ax	"bnx2/bnx2-rv2p-09ax-6.0.17.fw"
 #define FW_RV2P_FILE_09		"bnx2/bnx2-rv2p-09-6.0.17.fw"