diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 19:24:43 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-31 19:24:43 -0800 |
| commit | e1762ec6d72b71c4476018af3c153cd362a5e94e (patch) | |
| tree | 6814cb9ee9dee93e5734be92cd1d6775c335ba48 /net/bridge/br_private.h | |
| parent | ef59c4e935feb966900a8321e75f74d7df2a2f16 (diff) | |
| parent | 0cbd782507c502428c8ab3e91bee3940c19ac4d4 (diff) | |
| download | linux-e1762ec6d72b71c4476018af3c153cd362a5e94e.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/bridge/br_private.h')
| -rw-r--r-- | net/bridge/br_private.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h index c5bd631ffcd5..e330b17b6d81 100644 --- a/net/bridge/br_private.h +++ b/net/bridge/br_private.h @@ -68,6 +68,7 @@ struct net_bridge_port /* STP */ u8 priority; u8 state; + u8 deleted; u16 port_no; unsigned char topology_change_ack; unsigned char config_pending; |