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_vxlan.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_vxlan.c')
| -rw-r--r-- | sys/net/if_vxlan.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/sys/net/if_vxlan.c b/sys/net/if_vxlan.c index c0ac347e2bb..bb263c70982 100644 --- a/sys/net/if_vxlan.c +++ b/sys/net/if_vxlan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: if_vxlan.c,v 1.26 2015/07/18 22:15:14 goda Exp $ */ +/* $OpenBSD: if_vxlan.c,v 1.27 2015/07/20 22:54:30 mpi Exp $ */ /* * Copyright (c) 2013 Reyk Floeter <reyk@openbsd.org> @@ -478,7 +478,6 @@ vxlan_lookup(struct mbuf *m, struct udphdr *uh, int iphlen, #if NBRIDGE > 0 struct sockaddr *sa; #endif - int s; /* XXX Should verify the UDP port first before copying the packet */ skip = iphlen + sizeof(*uh); @@ -531,9 +530,7 @@ vxlan_lookup(struct mbuf *m, struct udphdr *uh, int iphlen, #endif ml_enqueue(&ml, m); - s = splnet(); if_input(ifp, &ml); - splx(s); /* success */ return (1); |