summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryasuoka <yasuoka@openbsd.org>2010-01-12 04:06:55 +0000
committeryasuoka <yasuoka@openbsd.org>2010-01-12 04:06:55 +0000
commitd3f84a12a676814905951fbb76e62624cf4751d6 (patch)
tree242ac8d82bc4873f48f987376823071b7e3d369b
parentSince ifinit() is now safe to be called earlier, call it just before (diff)
downloadwireguard-openbsd-d3f84a12a676814905951fbb76e62624cf4751d6.tar.xz
wireguard-openbsd-d3f84a12a676814905951fbb76e62624cf4751d6.zip
Remove simple_unlock() that is mistakenly introduced and add required
splx().
-rw-r--r--sys/net/if_tun.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 7c28153f67e..a175b6be72d 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tun.c,v 1.102 2010/01/12 03:41:29 deraadt Exp $ */
+/* $OpenBSD: if_tun.c,v 1.103 2010/01/12 04:06:55 yasuoka Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
@@ -627,7 +627,7 @@ tun_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
#ifdef PIPEX
if ((session = pipex_ip_lookup_session(m0, &tp->pipex_iface)) != NULL) {
pipex_ip_output(m0, session);
- simple_unlock(&tp->pppac_lock);
+ splx(s);
return (0);
}
#endif /* PIPEX */