summary refs log tree commit diff
path: root/drivers/net/bnx2.h
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2006-01-23 16:07:10 -0800
committerDavid S. Miller <davem@davemloft.net>2006-01-23 16:07:10 -0800
commitb090ae2b59f3db57732340c6af3beceec8d6c148 (patch)
treed776af0e28bdbce20be5589c26ceab644778e368 /drivers/net/bnx2.h
parente29054f92d7d575631691865c1b95bee5bc974cc (diff)
downloadlinux-b090ae2b59f3db57732340c6af3beceec8d6c148.tar.gz
[BNX2]: Improve handshake with firmware
Improve handshake with bootcode with the following changes:

1. Increase timeout to 100msec and use msleep instead of udelay.

2. Add more error checking for timeouts and errors. 

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bnx2.h')
-rw-r--r--drivers/net/bnx2.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h
index 8a70311d781f..a99b04143f69 100644
--- a/drivers/net/bnx2.h
+++ b/drivers/net/bnx2.h
@@ -3999,7 +3999,7 @@ struct bnx2 {
 	u16			bus_speed_mhz;
 	u8			wol;
 
-	u8			fw_timed_out;
+	u8			pad;
 
 	u16			fw_wr_seq;
 	u16			fw_drv_pulse_wr_seq;
@@ -4173,7 +4173,7 @@ struct fw_info {
  * the firmware has timed out, the driver will assume there is no firmware
  * running and there won't be any firmware-driver synchronization during a
  * driver reset. */
-#define FW_ACK_TIME_OUT_MS                  50
+#define FW_ACK_TIME_OUT_MS                  100
 
 
 #define BNX2_DRV_RESET_SIGNATURE		0x00000000