summaryrefslogtreecommitdiff
path: root/drivers/net/tg3.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 19:33:06 +0300
committerLinus Torvalds <torvalds@g5.osdl.org>2006-02-03 19:33:06 +0300
commitd6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f (patch)
tree8c21cc2ceaa11b7a6b023da6c8794f1e24eb0354 /drivers/net/tg3.h
parentd540c7428d297ab041e6cac72b9045e7b8f93f2b (diff)
parent0dec456d1fe73e0539625f0973ee8ef8fb805943 (diff)
downloadlinux-d6c8f6aaa1d7f68c1e6471ab0839d9047cdd159f.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/tg3.h')
-rw-r--r--drivers/net/tg3.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index e8243305f0e8..7f4b7f6ac40d 100644
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2162,6 +2162,7 @@ struct tg3 {
#define TG3_FLAG_JUMBO_RING_ENABLE 0x00800000
#define TG3_FLAG_10_100_ONLY 0x01000000
#define TG3_FLAG_PAUSE_AUTONEG 0x02000000
+#define TG3_FLAG_IN_RESET_TASK 0x04000000
#define TG3_FLAG_BROKEN_CHECKSUMS 0x10000000
#define TG3_FLAG_GOT_SERDES_FLOWCTL 0x20000000
#define TG3_FLAG_SPLIT_MODE 0x40000000