diff options
| author | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-05-19 15:11:00 +0000 |
|---|---|---|
| committer | Martin Pieuchot <mpi@cvs.openbsd.org> | 2015-05-19 15:11:00 +0000 |
| commit | f2855c4f926cb299d8a715c76c1cb1ec42db1cbe (patch) | |
| tree | 88cc0518c3fca883af39419cb26605d2fc1b9b6b /sys/net/if_tun.c | |
| parent | 359e7f10252077fe56447ae53997abc63494f5ce (diff) | |
splx should also be called in the error case, fix a regression
introduced during the if_output() conversion.
Found by jsg@
Diffstat (limited to 'sys/net/if_tun.c')
| -rw-r--r-- | sys/net/if_tun.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |