diff options
| author |   mpi <mpi@openbsd.org> | 2015-07-20 22:54:29 +0000 |
|---|---|---|
| committer | mpi <mpi@openbsd.org> | 2015-07-20 22:54:29 +0000 |
| commit | c35d6329d1b25112035a26038f662bd9cd376ac5 (patch) | |
| tree | 0198b8b13966ecdba32ea707d2e000d4944027a1 /sys/net/if_tun.c | |
| parent | properly encode IpAddress, Gauge32, and Counter32 (diff) | |
| download | wireguard-openbsd-c35d6329d1b25112035a26038f662bd9cd376ac5.tar.xz wireguard-openbsd-c35d6329d1b25112035a26038f662bd9cd376ac5.zip | |
Remove splassert(IPL_NET) from if_input().
if_input() has been designed to be able to safely handle a batch of
packets from physical drivers to the network stack. Most of these
drivers have an interrupt routine executed at IPL_NET and the check
made sense during the conversion. However we also want to re-enqueue
packets with if_input() from the network stack currently running at
IPL_SOFTNET.
ok claudio@
Diffstat (limited to 'sys/net/if_tun.c')
| -rw-r--r-- | sys/net/if_tun.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/net/if_tun.c b/sys/net/if_tun.c index a8d25da4983..8c81ce3680f 100644 --- a/sys/net/if_tun.c +++ b/sys/net/if_tun.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_tun.c,v 1.150 2015/07/15 22:16:42 deraadt Exp $ */ +/* $OpenBSD: if_tun.c,v 1.151 2015/07/20 22:54:29 mpi Exp $ */ /* $NetBSD: if_tun.c,v 1.24 1996/05/07 02:40:48 thorpej Exp $ */ /* @@ -875,10 +875,7 @@ tunwrite(dev_t dev, struct uio *uio, int ioflag) struct mbuf_list ml = MBUF_LIST_INITIALIZER(); ml_enqueue(&ml, top); - s = splnet(); if_input(ifp, &ml); - splx(s); - return (0); } |