Module Name: src
Committed By: ozaki-r
Date: Wed Oct 25 04:33:15 UTC 2017
Modified Files:
src/sys/net: if_bridge.c
Log Message:
Remove unnecessary splsoftnet
To generate a diff of this commit:
cvs rdiff -u -r1.137 -r1.138 src/sys/net/if_bridge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_bridge.c
diff -u src/sys/net/if_bridge.c:1.137 src/sys/net/if_bridge.c:1.138
--- src/sys/net/if_bridge.c:1.137 Wed Oct 25 04:17:34 2017
+++ src/sys/net/if_bridge.c Wed Oct 25 04:33:15 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bridge.c,v 1.137 2017/10/25 04:17:34 ozaki-r Exp $ */
+/* $NetBSD: if_bridge.c,v 1.138 2017/10/25 04:33:15 ozaki-r Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.137 2017/10/25 04:17:34 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.138 2017/10/25 04:33:15 ozaki-r Exp $");
#ifdef _KERNEL_OPT
#include "opt_bridge_ipf.h"
@@ -465,9 +465,6 @@ bridge_clone_destroy(struct ifnet *ifp)
{
struct bridge_softc *sc = ifp->if_softc;
struct bridge_iflist *bif;
- int s;
-
- s = splsoftnet();
bridge_stop(ifp, 1);
@@ -482,8 +479,6 @@ bridge_clone_destroy(struct ifnet *ifp)
PSLIST_DESTROY(&sc->sc_iflist_psref.bip_iflist);
BRIDGE_UNLOCK(sc);
- splx(s);
-
if_detach(ifp);
/* Tear down the routing table. */
