summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormvs <mvs@openbsd.org>2021-01-02 13:16:04 +0000
committermvs <mvs@openbsd.org>2021-01-02 13:16:04 +0000
commit067bcd5fa4a0b1998bb182a0d1dff97fa95f4962 (patch)
tree607ed530a209277ffe5402d7378b7fddb1a5004f
parentRemove PIPEX{S,G}MODE ioctl(2) commands. This time they are pretty dummy (diff)
downloadwireguard-openbsd-067bcd5fa4a0b1998bb182a0d1dff97fa95f4962.tar.xz
wireguard-openbsd-067bcd5fa4a0b1998bb182a0d1dff97fa95f4962.zip
Don't call if_deactivate() in bridge_clone_destroy(). Following
if_detach() will do this. ok kn@
-rw-r--r--sys/net/if_bridge.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c
index b2fe96c9386..c39dd27ddf0 100644
--- a/sys/net/if_bridge.c
+++ b/sys/net/if_bridge.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_bridge.c,v 1.345 2020/08/06 19:47:44 bluhm Exp $ */
+/* $OpenBSD: if_bridge.c,v 1.346 2021/01/02 13:16:04 mvs Exp $ */
/*
* Copyright (c) 1999, 2000 Jason L. Wright (jason@thought.net)
@@ -237,9 +237,6 @@ bridge_clone_destroy(struct ifnet *ifp)
bstp_destroy(sc->sc_stp);
- /* Undo pseudo-driver changes. */
- if_deactivate(ifp);
-
if_detach(ifp);
free(sc, M_DEVBUF, sizeof *sc);