aboutsummaryrefslogtreecommitdiffstats
path: root/net/bridge/br_private.h
diff options
context:
space:
mode:
Diffstat (limited to 'net/bridge/br_private.h')
-rw-r--r--net/bridge/br_private.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/net/bridge/br_private.h b/net/bridge/br_private.h
index 16fc47a821e5..cc3f1c99261a 100644
--- a/net/bridge/br_private.h
+++ b/net/bridge/br_private.h
@@ -26,8 +26,6 @@
26#define BR_PORT_BITS 10 26#define BR_PORT_BITS 10
27#define BR_MAX_PORTS (1<<BR_PORT_BITS) 27#define BR_MAX_PORTS (1<<BR_PORT_BITS)
28 28
29#define BR_PORT_DEBOUNCE (HZ/10)
30
31#define BR_VERSION "2.2" 29#define BR_VERSION "2.2"
32 30
33typedef struct bridge_id bridge_id; 31typedef struct bridge_id bridge_id;
@@ -81,7 +79,6 @@ struct net_bridge_port
81 struct timer_list hold_timer; 79 struct timer_list hold_timer;
82 struct timer_list message_age_timer; 80 struct timer_list message_age_timer;
83 struct kobject kobj; 81 struct kobject kobj;
84 struct delayed_work carrier_check;
85 struct rcu_head rcu; 82 struct rcu_head rcu;
86}; 83};
87 84
@@ -172,6 +169,7 @@ extern void br_flood_forward(struct net_bridge *br,
172 int clone); 169 int clone);
173 170
174/* br_if.c */ 171/* br_if.c */
172extern void br_port_carrier_check(struct net_bridge_port *p);
175extern int br_add_bridge(const char *name); 173extern int br_add_bridge(const char *name);
176extern int br_del_bridge(const char *name); 174extern int br_del_bridge(const char *name);
177extern void br_cleanup_bridges(void); 175extern void br_cleanup_bridges(void);