summaryrefslogtreecommitdiffstats
path: root/net/bridge/br_private.h
diff options
context:
space:
mode:
authorStephen Hemminger2006-02-10 02:08:52 +0100
committerDavid S. Miller2006-02-10 02:08:52 +0100
commitb3f1be4b5412e34647764457bec901e06b03e624 (patch)
treeb3f1529ff0882ebb5aed190d8a61b52f703503ce /net/bridge/br_private.h
parent[TCP]: rcvbuf lock when tcp_moderate_rcvbuf enabled (diff)
downloadkernel-qcow2-linux-b3f1be4b5412e34647764457bec901e06b03e624.tar.gz
kernel-qcow2-linux-b3f1be4b5412e34647764457bec901e06b03e624.tar.xz
kernel-qcow2-linux-b3f1be4b5412e34647764457bec901e06b03e624.zip
[BRIDGE]: fix for RCU and deadlock on device removal
Change Bridge receive path to correctly handle RCU removal of device from bridge. Also fixes deadlock between carrier_check and del_nbp. This replaces the previous deleted flag fix. Signed-off-by: Stephen Hemminger <shemminger@osdl.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r--net/bridge/br_private.h1
1 files changed, 0 insertions, 1 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index e330b17b6d81..c5bd631ffcd5 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -68,7 +68,6 @@ struct net_bridge_port
/* STP */
u8 priority;
u8 state;
- u8 deleted;
u16 port_no;
unsigned char topology_change_ack;
unsigned char config_pending;