summaryrefslogtreecommitdiff
path: root/sys/netinet
diff options
context:
space:
mode:
authorMartin Pieuchot <mpi@cvs.openbsd.org>2018-06-11 08:48:55 +0000
committerMartin Pieuchot <mpi@cvs.openbsd.org>2018-06-11 08:48:55 +0000
commit7559e7eb03267b3e8ce6a3940100d5db4fb01c62 (patch)
tree6a241bb74363018073fd13f21bce11cc4e52b8fa /sys/netinet
parent6fa871355586760f3c952e5e1839b3bae1135c9e (diff)
Push the KERNEL_LOCK() inside route_input().
ok visa@, tb@
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/if_ether.c4
-rw-r--r--sys/netinet/in_pcb.c4
2 files changed, 2 insertions, 6 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c
index 1ceeaaae82a..2965ec08c5d 100644
--- a/sys/netinet/if_ether.c
+++ b/sys/netinet/if_ether.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_ether.c,v 1.235 2018/03/31 15:07:09 stsp Exp $ */
+/* $OpenBSD: if_ether.c,v 1.236 2018/06/11 08:48:54 mpi Exp $ */
/* $NetBSD: if_ether.c,v 1.31 1996/05/11 12:59:58 mycroft Exp $ */
/*
@@ -664,9 +664,7 @@ arpcache(struct ifnet *ifp, struct ether_arp *ea, struct rtentry *rt)
/* Notify userland that an ARP resolution has been done. */
if (la->la_asked || changed) {
- KERNEL_LOCK();
rtm_send(rt, RTM_RESOLVE, 0, ifp->if_rdomain);
- KERNEL_UNLOCK();
}
la->la_asked = 0;
diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c
index 4c4ca0c8b10..690263a4130 100644
--- a/sys/netinet/in_pcb.c
+++ b/sys/netinet/in_pcb.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_pcb.c,v 1.235 2018/06/07 08:46:24 bluhm Exp $ */
+/* $OpenBSD: in_pcb.c,v 1.236 2018/06/11 08:48:54 mpi Exp $ */
/* $NetBSD: in_pcb.c,v 1.25 1996/02/13 23:41:53 christos Exp $ */
/*
@@ -722,10 +722,8 @@ in_losing(struct inpcb *inp)
info.rti_info[RTAX_GATEWAY] = rt->rt_gateway;
info.rti_info[RTAX_NETMASK] = rt_plen2mask(rt, &sa_mask);
- KERNEL_LOCK();
rtm_miss(RTM_LOSING, &info, rt->rt_flags, rt->rt_priority,
rt->rt_ifidx, 0, inp->inp_rtableid);
- KERNEL_UNLOCK();
if (rt->rt_flags & RTF_DYNAMIC) {
struct ifnet *ifp;