diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2015-08-24 21:28:48 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2015-08-24 21:28:48 +0000 |
| commit | 183b636950e387efd43ec56f32296e097bb83135 (patch) | |
| tree | 51c67c18dee2a30512d9b975a56e3c815f0206e6 | |
| parent | bc2b57e3f631931bd15a55c1059d65212d2cdf3e (diff) | |
The bridge list is a relict, delete the remaining LIST_REMOVE.
This fixes a crash during ifconfig bridge0 destroy.
OK mpi@
| -rw-r--r-- | sys/net/if_bridge.c | 7 | ||||
| -rw-r--r-- | sys/net/if_bridge.h | 3 |
2 files changed, 2 insertions, 8 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 5193c50017e..eba150c93c7 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.c,v 1.258 2015/08/18 09:01:16 mpi Exp $ */ +/* $OpenBSD: if_bridge.c,v 1.259 2015/08/24 21:28:47 bluhm Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -243,7 +243,6 @@ bridge_clone_destroy(struct ifnet *ifp) struct bridge_softc *sc = ifp->if_softc; struct bridge_iflist *bif; struct ifih *bridge_ifih; - int s; bridge_stop(sc); bridge_rtflush(sc, IFBF_FLUSHALL); @@ -254,10 +253,6 @@ bridge_clone_destroy(struct ifnet *ifp) free(bif, M_DEVBUF, 0); } - s = splnet(); - LIST_REMOVE(sc, sc_list); - splx(s); - bstp_destroy(sc->sc_stp); /* Undo pseudo-driver changes. */ diff --git a/sys/net/if_bridge.h b/sys/net/if_bridge.h index f6ec74824be..4778f690632 100644 --- a/sys/net/if_bridge.h +++ b/sys/net/if_bridge.h @@ -1,4 +1,4 @@ -/* $OpenBSD: if_bridge.h,v 1.44 2015/07/02 09:40:02 mpi Exp $ */ +/* $OpenBSD: if_bridge.h,v 1.45 2015/08/24 21:28:47 bluhm Exp $ */ /* * Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net) @@ -421,7 +421,6 @@ struct bridge_rtnode { */ struct bridge_softc { struct ifnet sc_if; /* the interface */ - LIST_ENTRY(bridge_softc) sc_list; /* all bridges */ struct bridge_iflist *sc_root_port; u_int32_t sc_brtmax; /* max # addresses */ u_int32_t sc_brtcnt; /* current # addrs */ |