From f63d08c1957af45db291aa941c9cf909d6fe1365 Mon Sep 17 00:00:00 2001
From: YASUOKA Masahiko <yasuoka@cvs.openbsd.org>
Date: Tue, 12 Jan 2010 04:06:56 +0000
Subject: Remove simple_unlock() that is mistakenly introduced and add required
 splx().

---
 sys/net/if_tun.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'sys/net')

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 */
-- 
cgit v1.2.3