summaryrefslogtreecommitdiffstats
path: root/drivers/net/qlge/qlge.h
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-10-30 05:28:59 +0100
committerDavid S. Miller <davem@davemloft.net>2009-10-30 05:28:59 +0100
commit0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (patch)
tree2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb /drivers/net/qlge/qlge.h
parentnet,socket: introduce DECLARE_SOCKADDR helper to catch overflow at build time (diff)
parentnet: Fix 'Re: PACKET_TX_RING: packet size is too long' (diff)
downloadlinux-0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01.tar.xz
linux-0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/qlge/qlge.h')
-rw-r--r--drivers/net/qlge/qlge.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/qlge/qlge.h b/drivers/net/qlge/qlge.h
index 4b954e13c007..73c7fd2badcd 100644
--- a/drivers/net/qlge/qlge.h
+++ b/drivers/net/qlge/qlge.h
@@ -97,6 +97,7 @@ enum {
/* Misc. stuff */
MAILBOX_COUNT = 16,
+ MAILBOX_TIMEOUT = 5,
PROC_ADDR_RDY = (1 << 31),
PROC_ADDR_R = (1 << 30),