diff options
Diffstat (limited to 'sys/netipsec')
| -rw-r--r-- | sys/netipsec/ipsec_input.c | 3 | ||||
| -rw-r--r-- | sys/netipsec/xform_ipip.c | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sys/netipsec/ipsec_input.c b/sys/netipsec/ipsec_input.c index 9ebb518..b0d5df0 100644 --- a/sys/netipsec/ipsec_input.c +++ b/sys/netipsec/ipsec_input.c @@ -396,7 +396,7 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, /* * Re-dispatch via software interrupt. */ - if (!IF_HANDOFF(&ipintrq, m, NULL)) { + if (!netisr_queue(NETISR_IP, m)) { IPSEC_ISTAT(sproto, espstat.esps_qfull, ahstat.ahs_qfull, ipcompstat.ipcomps_qfull); @@ -404,7 +404,6 @@ ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav, "proto %u packet dropped\n", sproto)); return ENOBUFS; } - schednetisr(NETISR_IP); return 0; bad: m_freem(m); diff --git a/sys/netipsec/xform_ipip.c b/sys/netipsec/xform_ipip.c index 9d49a3e..11ec9b9 100644 --- a/sys/netipsec/xform_ipip.c +++ b/sys/netipsec/xform_ipip.c @@ -165,7 +165,6 @@ _ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp) register struct sockaddr_in *sin; register struct ifnet *ifp; register struct ifaddr *ifa; - struct ifqueue *ifq = NULL; struct ip *ipo; #ifdef INET6 register struct sockaddr_in6 *sin6; @@ -368,13 +367,11 @@ _ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp) switch (v >> 4) { #ifdef INET case 4: - ifq = &ipintrq; isr = NETISR_IP; break; #endif #ifdef INET6 case 6: - ifq = &ip6intrq; isr = NETISR_IPV6; break; #endif @@ -382,12 +379,9 @@ _ipip_input(struct mbuf *m, int iphlen, struct ifnet *gifp) panic("ipip_input: should never reach here"); } - if (!IF_HANDOFF(ifq, m, NULL)) { + if (!netisr_queue(isr, m)) { ipipstat.ipips_qfull++; - DPRINTF(("ipip_input: packet dropped because of full queue\n")); - } else { - schednetisr(isr); } } |
