summaryrefslogtreecommitdiff
path: root/sys/net/if_mpe.c
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-09-21 07:41:50 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-09-21 07:41:50 +0000
commit6d5fce2f1331e897db7deefdf67b4f74e8ab74e2 (patch)
treef39bad639ea53c4612f7c9645820f02671181a11 /sys/net/if_mpe.c
parenteb959627e6f753d225c33a60aeccd35c07eaac17 (diff)
Remove recursive splsoftnet() calls, from David Hill.
Diffstat (limited to 'sys/net/if_mpe.c')
-rw-r--r--sys/net/if_mpe.c5
1 files changed, 1 insertions, 4 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);