diff options
| author |   mpi <mpi@openbsd.org> | 2016-09-21 07:41:49 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2016-09-21 07:41:49 +0000 |
| commit | e402c1de3463894a6e97fbc8a57d6ade6959c8ae (patch) | |
| tree | fa9086578cf4f0085ed20770323646a4572a1f7c | |
| parent | Test ART implementation by default. (diff) | |
| download | wireguard-openbsd-e402c1de3463894a6e97fbc8a57d6ade6959c8ae.tar.xz wireguard-openbsd-e402c1de3463894a6e97fbc8a57d6ade6959c8ae.zip | |
Remove recursive splsoftnet() calls, from David Hill.
| -rw-r--r-- | sys/net/if_mpe.c | 5 | ||||
| -rw-r--r-- | sys/net/if_mpw.c | 5 | ||||
| -rw-r--r-- | sys/net/if_pfsync.c | 5 |
3 files changed, 3 insertions, 12 deletions
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c index dc228ce7ddc..d1c0ad054e0 100644 --- a/sys/net/if_mpe.c +++ b/sys/net/if_mpe.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpe.c,v 1.54 2016/04/13 11:41:15 mpi Exp $ */ +/* $OpenBSD: if_mpe.c,v 1.55 2016/09/21 07:41:49 mpi Exp $ */ /* * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org> @@ -117,15 +117,12 @@ int mpe_clone_destroy(struct ifnet *ifp) { struct mpe_softc *mpeif = ifp->if_softc; - int s; LIST_REMOVE(mpeif, sc_list); if (mpeif->sc_smpls.smpls_label) { - s = splsoftnet(); rt_ifa_del(&mpeif->sc_ifa, RTF_MPLS, smplstosa(&mpeif->sc_smpls)); - splx(s); } if_detach(ifp); diff --git a/sys/net/if_mpw.c b/sys/net/if_mpw.c index ae309f470ea..a967d83b5aa 100644 --- a/sys/net/if_mpw.c +++ b/sys/net/if_mpw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_mpw.c,v 1.14 2016/04/13 11:41:15 mpi Exp $ */ +/* $OpenBSD: if_mpw.c,v 1.15 2016/09/21 07:41:49 mpi Exp $ */ /* * Copyright (c) 2015 Rafael Zalamena <rzalamena@openbsd.org> @@ -120,15 +120,12 @@ int mpw_clone_destroy(struct ifnet *ifp) { struct mpw_softc *sc = ifp->if_softc; - int s; ifp->if_flags &= ~IFF_RUNNING; if (sc->sc_smpls.smpls_label) { - s = splsoftnet(); rt_ifa_del(&sc->sc_ifa, RTF_MPLS, smplstosa(&sc->sc_smpls)); - splx(s); } if_ih_remove(ifp, mpw_input, NULL); diff --git a/sys/net/if_pfsync.c b/sys/net/if_pfsync.c index acca3fae946..f07cd352755 100644 --- a/sys/net/if_pfsync.c +++ b/sys/net/if_pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_pfsync.c,v 1.231 2016/09/15 02:00:18 dlg Exp $ */ +/* $OpenBSD: if_pfsync.c,v 1.232 2016/09/21 07:41:49 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -353,9 +353,7 @@ pfsync_clone_destroy(struct ifnet *ifp) { struct pfsync_softc *sc = ifp->if_softc; struct pfsync_deferral *pd; - int s; - s = splsoftnet(); timeout_del(&sc->sc_bulkfail_tmo); timeout_del(&sc->sc_bulk_tmo); timeout_del(&sc->sc_tmo); @@ -384,7 +382,6 @@ pfsync_clone_destroy(struct ifnet *ifp) free(sc, M_DEVBUF, sizeof(*sc)); pfsyncif = NULL; - splx(s); return (0); } |