summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtur Grabowski <art@cvs.openbsd.org>2001-04-23 13:55:28 +0000
committerArtur Grabowski <art@cvs.openbsd.org>2001-04-23 13:55:28 +0000
commit735b86c66f53e3dec67cf193b10e991b6570b17d (patch)
treecd56b4d8e3c7b15729fbc98827cf7ffa8e7c3ea1
parent9e0d8fc2d9d4d3ba84c64f856ff28e96ea0db783 (diff)
s = splimp(); ... s = splimp(); ... splx(x); ... splx(s); is a bad idea.
-rw-r--r--sys/net/if_tun.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c
index ef7fe33193d..87282337516 100644
--- a/sys/net/if_tun.c
+++ b/sys/net/if_tun.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_tun.c,v 1.32 2001/03/05 04:00:36 angelos Exp $ */
+/* $OpenBSD: if_tun.c,v 1.33 2001/04/23 13:55:27 art Exp $ */
/* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */
/*
@@ -455,12 +455,10 @@ tunioctl(dev, cmd, data, flag, p)
tp->tun_flags &= ~TUN_ASYNC;
break;
case FIONREAD:
- s = splimp();
if (tp->tun_if.if_snd.ifq_head)
*(int *)data = tp->tun_if.if_snd.ifq_head->m_pkthdr.len;
else
*(int *)data = 0;
- splx(s);
break;
case TIOCSPGRP:
tp->tun_pgid = *(int *)data;