diff options
| -rw-r--r-- | sys/net/bridgestp.c | 9 | ||||
| -rw-r--r-- | sys/net/if_bridge.c | 3 | ||||
| -rw-r--r-- | sys/net/if_bridge.h | 3 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index 666bb45acb0..fa44377f90f 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.37 2010/10/28 13:49:54 claudio Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.38 2010/10/31 15:14:30 mpf Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -227,7 +227,6 @@ struct bstp_tbpdu { const u_int8_t bstp_etheraddr[] = { 0x01, 0x80, 0xc2, 0x00, 0x00, 0x00 }; -LIST_HEAD(, bstp_state) bstp_list; void bstp_transmit(struct bstp_state *, struct bstp_port *); void bstp_transmit_bpdu(struct bstp_state *, struct bstp_port *); @@ -287,11 +286,6 @@ void bstp_edge_delay_expiry(struct bstp_state *, int bstp_addr_cmp(const u_int8_t *, const u_int8_t *); int bstp_same_bridgeid(u_int64_t, u_int64_t); -void -bstp_attach(int n) -{ - LIST_INIT(&bstp_list); -} void bstp_transmit(struct bstp_state *bs, struct bstp_port *bp) @@ -1956,7 +1950,6 @@ bstp_create(struct ifnet *ifp) getmicrotime(&bs->bs_last_tc_time); - LIST_INSERT_HEAD(&bstp_list, bs, bs_list); splx(s); return (bs); diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 0ff14e4880a..936980e3a2d 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.186 2010/10/28 19:00:57 mpf Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.187 2010/10/31 15:14:30 mpf Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -186,7 +186,6 @@ bridgeattach(int n) { LIST_INIT(&bridge_list); if_clone_attach(&bridge_cloner); - bstp_attach(n); } int diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h index 1c77c842511..662bdfb4749 100644 --- a/sys/net/if_bridge.h +++ b/sys/net/if_bridge.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.h,v 1.32 2010/10/28 13:49:54 claudio Exp $ */ +/* $OpenBSD: if_bridge.h,v 1.33 2010/10/31 15:14:30 mpf Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -438,7 +438,6 @@ void bridge_update(struct ifnet *, struct ether_addr *, int); void bridge_rtdelete(struct bridge_softc *, struct ifnet *, int); void bridge_rtagenode(struct ifnet *, int); -void bstp_attach(int); struct bstp_state *bstp_create(struct ifnet *); void bstp_destroy(struct bstp_state *); void bstp_initialization(struct bstp_state *); |