From: mpi <mpi@openbsd.org>
Date: Tue, 19 May 2015 15:10:59 +0000 (+0000)
Subject: splx should also be called in the error case, fix a regression
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=fbad357673bd92b4fd4a9eef47ba599e2f056704;p=openbsd

splx should also be called in the error case, fix a regression
introduced during the if_output() conversion.

Found by jsg@
---

diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index 28a14b279ac..06a747b6f38 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_tun.c,v 1.141 2015/05/15 12:40:05 mpi Exp $	*/
+/*	$OpenBSD: if_tun.c,v 1.142 2015/05/19 15:10:59 mpi Exp $	*/
 /*	$NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $	*/
 
 /*
@@ -570,13 +570,13 @@ tun_output(struct ifnet *ifp, struct mbuf *m0, struct sockaddr *dst,
 #endif
 
 	error = if_output(ifp, m0);
+	splx(s);
+
 	if (error) {
 		ifp->if_collisions++;
 		return (error);
 	}
 
-	splx(s);
-
 	tun_wakeup(tp);
 	return (0);
 }