diff options
| author | Eliezer Tamir <eliezert@broadcom.com> | 2008-04-10 00:25:46 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-10 00:25:46 +0200 |
| commit | 619c714c1d6e4dff00ddde582d78492fd95452d6 (patch) | |
| tree | 74d2388f679259ccb74187ed534f32dfc7db62cf /drivers | |
| parent | [NETFILTER]: nf_nat: autoload IPv4 connection tracking (diff) | |
| download | linux-619c714c1d6e4dff00ddde582d78492fd95452d6.tar.xz linux-619c714c1d6e4dff00ddde582d78492fd95452d6.zip | |
BNX2X: Correct bringing chip out of reset
Fixed bug: Wrong register was written to when bringing the chip out of
reset.
[ Bump driver version and release date -DaveM ]
Signed-off-by: Eliezer Tamir <eliezert@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/bnx2x.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/bnx2x.c b/drivers/net/bnx2x.c index de32b3fba322..7bdb5af35951 100644 --- a/drivers/net/bnx2x.c +++ b/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); |