diff options
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/if_ether.c | 2 | ||||
| -rw-r--r-- | sys/netinet/ip_input.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index c2fefd65e341..b6dafe7c8e3d 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -980,6 +980,6 @@ arp_init(void) mtx_init(&arpintrq.ifq_mtx, "arp_inq", NULL, MTX_DEF); LIST_INIT(&llinfo_arp); callout_init(&arp_callout, CALLOUT_MPSAFE); - netisr_register(NETISR_ARP, arpintr, &arpintrq); + netisr_register(NETISR_ARP, arpintr, &arpintrq, NETISR_MPSAFE); } SYSINIT(arp, SI_SUB_PROTO_DOMAIN, SI_ORDER_ANY, arp_init, 0); diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 26cc060efa09..2f2dc96c4e83 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -334,7 +334,7 @@ ip_init() #endif ipintrq.ifq_maxlen = ipqmaxlen; mtx_init(&ipintrq.ifq_mtx, "ip_inq", NULL, MTX_DEF); - netisr_register(NETISR_IP, ip_input, &ipintrq); + netisr_register(NETISR_IP, ip_input, &ipintrq, NETISR_MPSAFE); } /* @@ -1009,6 +1009,7 @@ DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/ * Switch out to protocol's input routine. */ ipstat.ips_delivered++; + NET_PICKUP_GIANT(); if (args.next_hop && ip->ip_p == IPPROTO_TCP) { /* TCP needs IPFORWARD info if available */ struct m_hdr tag; @@ -1022,6 +1023,7 @@ DPRINTF(("ip_input: no SP, packet discarded\n"));/*XXX*/ (struct mbuf *)&tag, hlen); } else (*inetsw[ip_protox[ip->ip_p]].pr_input)(m, hlen); + NET_DROP_GIANT(); return; bad: m_freem(m); |