summaryrefslogtreecommitdiff
path: root/sys/net/netisr.h
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2016-07-13 16:45:20 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2016-07-13 16:45:20 +0000
commitd2e1152afacae581f169f5a49e870b71494d36ae (patch)
treece694ec79f9d2f61dc3335dab761611d48d9c1e3 /sys/net/netisr.h
parent017be063f18b8676903994371040064a67e4b1e0 (diff)
Move ARP processing back to the KERNEL_LOCK()ed task until the race
triggered by updating a cached, but removed from the table, entry is properly fixed. Diff from dlg@, prodding deraadt@
Diffstat (limited to 'sys/net/netisr.h')
-rw-r--r--sys/net/netisr.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net/netisr.h b/sys/net/netisr.h
index 5c709f5b76d..c295f86afbd 100644
--- a/sys/net/netisr.h
+++ b/sys/net/netisr.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: netisr.h,v 1.45 2016/05/03 14:52:39 mpi Exp $ */
+/* $OpenBSD: netisr.h,v 1.46 2016/07/13 16:45:19 mpi Exp $ */
/* $NetBSD: netisr.h,v 1.12 1995/08/12 23:59:24 mycroft Exp $ */
/*
@@ -53,6 +53,7 @@
#define NETISR_IP 2 /* same as AF_INET */
#define NETISR_TX 3 /* for if_snd processing */
#define NETISR_PFSYNC 5 /* for pfsync "immediate" tx */
+#define NETISR_ARP 18 /* same as AF_LINK */
#define NETISR_IPV6 24 /* same as AF_INET6 */
#define NETISR_ISDN 26 /* same as AF_E164 */
#define NETISR_PPP 28 /* for PPP processing */
@@ -68,6 +69,7 @@
extern int netisr; /* scheduling bits for network */
extern struct task if_input_task_locked;
+void arpintr(void);
void ipintr(void);
void ip6intr(void);
void pppintr(void);