summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2010-01-12 04:06:56 +0000
committerYASUOKA Masahiko <yasuoka@cvs.openbsd.org>2010-01-12 04:06:56 +0000
commitf63d08c1957af45db291aa941c9cf909d6fe1365 (patch)
tree9207cdbec4ff90bee39e7e8b706da6947b14f7c7 /sys
parent4246f61d36d8437e9b6723fbaa9a4d6998e4a83c (diff)
Remove simple_unlock() that is mistakenly introduced and add required
splx().
Diffstat (limited to 'sys')
-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 */