diff options
| author |   Stephen Hemminger <shemminger@linux-foundation.org> | 2007-02-22 01:10:18 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2007-02-26 11:42:59 -0800 |
| commit | 269def7c505b4d229f9ad49bf88543d1e605533e (patch) | |
| tree | 341377271f16c0def001a876217a8e6f430d75b4 /net/bridge/br_private.h | |
| parent | [BRIDGE]: get rid of miscdevice include (diff) | |
| download | linux-dev-269def7c505b4d229f9ad49bf88543d1e605533e.tar.xz linux-dev-269def7c505b4d229f9ad49bf88543d1e605533e.zip | |
[BRIDGE]: eliminate workqueue for carrier check
Having a work queue for checking carrier leads to lots of race issues.
Simpler to just get the cost when data structure is created and
update on change.
Signed-off-by: Stephen Hemminger <shemminger@linux-foundation.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.h | 4 |
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 @@ #define BR_PORT_BITS 10 #define BR_MAX_PORTS (1<<BR_PORT_BITS) -#define BR_PORT_DEBOUNCE (HZ/10) - #define BR_VERSION "2.2" typedef struct bridge_id bridge_id; @@ -81,7 +79,6 @@ struct net_bridge_port struct timer_list hold_timer; struct timer_list message_age_timer; struct kobject kobj; - struct delayed_work carrier_check; struct rcu_head rcu; }; @@ -172,6 +169,7 @@ extern void br_flood_forward(struct net_bridge *br, int clone); /* br_if.c */ +extern void br_port_carrier_check(struct net_bridge_port *p); extern int br_add_bridge(const char *name); extern int br_del_bridge(const char *name); extern void br_cleanup_bridges(void); |