From a76dac119da365790b24f56c1abdcccd7847d065 Mon Sep 17 00:00:00 2001
From: Eliezer Tamir <eliezert@broadcom.com>
Date: Wed, 9 Apr 2008 15:25:46 -0700
Subject: [PATCH] --- yaml --- r: 88271 b: refs/heads/master c:
 619c714c1d6e4dff00ddde582d78492fd95452d6 h: refs/heads/master i:   88269:
 498862c2baaa3aed450f1d789ec4e15d46c5ce9d   88267:
 b798dc619089f63e69bcc68171283052b86c1049   88263:
 82e09333932885572c106f2afdfd2c1ced8e27e4   88255:
 12de798c3944928ed8dae9e5dba774deb3305583 v: v3

---
 [refs]                    | 2 +-
 trunk/drivers/net/bnx2x.c | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index ccbf4be327b2..b8c160332233 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 475959d4773e53a2700e523dd30acebbd47556a5
+refs/heads/master: 619c714c1d6e4dff00ddde582d78492fd95452d6
diff --git a/trunk/drivers/net/bnx2x.c b/trunk/drivers/net/bnx2x.c
index de32b3fba322..7bdb5af35951 100644
--- a/trunk/drivers/net/bnx2x.c
+++ b/trunk/drivers/net/bnx2x.c
@@ -63,8 +63,8 @@
 #include "bnx2x.h"
 #include "bnx2x_init.h"
 
-#define DRV_MODULE_VERSION      "1.42.3"
-#define DRV_MODULE_RELDATE      "2008/3/9"
+#define DRV_MODULE_VERSION      "1.42.4"
+#define DRV_MODULE_RELDATE      "2008/4/9"
 #define BNX2X_BC_VER    	0x040200
 
 /* Time in jiffies before concluding the transmitter is hung. */
@@ -6153,7 +6153,7 @@ static int bnx2x_function_init(struct bnx2x *bp, int mode)
 		   func, mode);
 		REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,
 		       0xffffffff);
-		REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_1_SET,
+		REG_WR(bp, GRCBASE_MISC + MISC_REGISTERS_RESET_REG_2_SET,
 		       0xfffc);
 		bnx2x_init_block(bp, MISC_COMMON_START, MISC_COMMON_END);