summaryrefslogtreecommitdiff
path: root/sys/net/pipex.c
diff options
context:
space:
mode:
Diffstat (limited to 'sys/net/pipex.c')
-rw-r--r--sys/net/pipex.c19
1 files changed, 3 insertions, 16 deletions
diff --git a/sys/net/pipex.c b/sys/net/pipex.c
index 505165ceff2..00508517f7a 100644
--- a/sys/net/pipex.c
+++ b/sys/net/pipex.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pipex.c,v 1.100 2017/05/28 20:48:29 yasuoka Exp $ */
+/* $OpenBSD: pipex.c,v 1.101 2017/05/30 07:50:37 mpi Exp $ */
/*-
* Copyright (c) 2009 Internet Initiative Japan Inc.
@@ -1096,20 +1096,15 @@ pipex_ip_input(struct mbuf *m0, struct pipex_session *session)
bpf_mtap_af(ifp->if_bpf, AF_INET, m0, BPF_DIRECTION_IN);
#endif
- if (niq_enqueue(&ipintrq, m0) != 0) {
- ifp->if_collisions++;
- goto dropped;
- }
-
ifp->if_ipackets++;
ifp->if_ibytes += len;
session->stat.ipackets++;
session->stat.ibytes += len;
+ ipv4_input(ifp, m0);
return;
drop:
m_freem(m0);
-dropped:
session->stat.ierrors++;
}
@@ -1147,19 +1142,11 @@ pipex_ip6_input(struct mbuf *m0, struct pipex_session *session)
bpf_mtap_af(ifp->if_bpf, AF_INET6, m0, BPF_DIRECTION_IN);
#endif
- if (niq_enqueue(&ip6intrq, m0) != 0) {
- ifp->if_collisions++;
- goto dropped;
- }
-
ifp->if_ipackets++;
ifp->if_ibytes += len;
session->stat.ipackets++;
session->stat.ibytes += len;
-
- return;
-dropped:
- session->stat.ierrors++;
+ ipv6_input(ifp, m0);
}
#endif