diff options
| author | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2010-11-20 14:23:10 +0000 |
|---|---|---|
| committer | Federico G. Schwindt <fgsch@cvs.openbsd.org> | 2010-11-20 14:23:10 +0000 |
| commit | 5fe9e0fb79d17ad7e86d2ace950fdd36bff7c603 (patch) | |
| tree | d1d5974dff1243e70ab00933bff2d10066788cac /sys/net | |
| parent | 7f474332e48e1508c540a29f43e5f4ad8698695e (diff) | |
remove bs_list occurrences. fixes panic on destroy.
ok from the m guild: mikeb@ miod@ mpf@
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/bridgestp.c | 7 | ||||
| -rw-r--r-- | sys/net/if_bridge.h | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/net/bridgestp.c b/sys/net/bridgestp.c index fa44377f90f..27e94daec79 100644 --- a/sys/net/bridgestp.c +++ b/sys/net/bridgestp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bridgestp.c,v 1.38 2010/10/31 15:14:30 mpf Exp $ */ +/* $OpenBSD: bridgestp.c,v 1.39 2010/11/20 14:23:09 fgsch Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -1958,18 +1958,13 @@ bstp_create(struct ifnet *ifp) void bstp_destroy(struct bstp_state *bs) { - int s; - if (bs == NULL) return; if (!LIST_EMPTY(&bs->bs_bplist)) panic("bstp still active"); - s = splnet(); - LIST_REMOVE(bs, bs_list); free(bs, M_DEVBUF); - splx(s); } void diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h index 662bdfb4749..4d393b74ff3 100644 --- a/sys/net/if_bridge.h +++ b/sys/net/if_bridge.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.h,v 1.33 2010/10/31 15:14:30 mpf Exp $ */ +/* $OpenBSD: if_bridge.h,v 1.34 2010/11/20 14:23:09 fgsch Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -354,7 +354,6 @@ struct bstp_port { * Software state for each bridge STP. */ struct bstp_state { - LIST_ENTRY(bstp_state) bs_list; struct ifnet *bs_ifp; struct bstp_pri_vector bs_bridge_pv; struct bstp_pri_vector bs_root_pv; |