3 files changed, 9 insertions, 12 deletions
diff --git a/sys/netinet6/ah_input.c b/sys/netinet6/ah_input.c
index 070883e7a624..4ee2a994c5f0 100644
--- a/sys/netinet6/ah_input.c
+++ b/sys/netinet6/ah_input.c
@@ -94,8 +94,7 @@
 #define IPLEN_FLIPPED
 
 #ifdef INET
-#include <netinet/ipprotosw.h>
-extern struct ipprotosw inetsw[];
+extern struct protosw inetsw[];
 
 void
 #if __STDC__
@@ -122,7 +121,7 @@ ah4_input(m, va_alist)
 
 	va_start(ap, m);
 	off = va_arg(ap, int);
-	proto = va_arg(ap, int);
+	proto = mtod(m, struct ip *)->ip_p;
 	va_end(ap);
 
 #ifndef PULLDOWN_TEST
@@ -550,7 +549,7 @@ ah4_input(m, va_alist)
 				ipsecstat.in_polvio++;
 				goto fail;
 			}
-			(*inetsw[ip_protox[nxt]].pr_input)(m, off, nxt);
+			(*inetsw[ip_protox[nxt]].pr_input)(m, off);
 		} else
 			m_freem(m);
 		m = NULL;
diff --git a/sys/netinet6/esp_input.c b/sys/netinet6/esp_input.c
index 4542f135d560..af12ec0d6294 100644
--- a/sys/netinet6/esp_input.c
+++ b/sys/netinet6/esp_input.c
@@ -97,8 +97,7 @@
 		? sizeof(struct newesp) : sizeof(struct esp))
 
 #ifdef INET
-#include <netinet/ipprotosw.h>
-extern struct ipprotosw inetsw[];
+extern struct protosw inetsw[];
 
 void
 #if __STDC__
@@ -125,7 +124,7 @@ esp4_input(m, va_alist)
 
 	va_start(ap, m);
 	off = va_arg(ap, int);
-	proto = va_arg(ap, int);
+	proto = mtod(m, struct ip *)->ip_p;
 	va_end(ap);
 
 	/* sanity check for alignment. */
@@ -445,7 +444,7 @@ noreplaycheck:
 				ipsecstat.in_polvio++;
 				goto bad;
 			}
-			(*inetsw[ip_protox[nxt]].pr_input)(m, off, nxt);
+			(*inetsw[ip_protox[nxt]].pr_input)(m, off);
 		} else
 			m_freem(m);
 		m = NULL;
diff --git a/sys/netinet6/ipcomp_input.c b/sys/netinet6/ipcomp_input.c
index 0a6e2f5d57f1..f3143d2a847e 100644
--- a/sys/netinet6/ipcomp_input.c
+++ b/sys/netinet6/ipcomp_input.c
@@ -83,8 +83,7 @@
 #define IPLEN_FLIPPED
 
 #ifdef INET
-#include <netinet/ipprotosw.h>
-extern struct ipprotosw inetsw[];
+extern struct protosw inetsw[];
 
 void
 #if __STDC__
@@ -110,7 +109,7 @@ ipcomp4_input(m, va_alist)
 
 	va_start(ap, m);
 	off = va_arg(ap, int);
-	proto = va_arg(ap, int);
+	proto = mtod(m, struct ip *)->ip_p;
 	va_end(ap);
 
 	if (m->m_pkthdr.len < off + sizeof(struct ipcomp)) {
@@ -231,7 +230,7 @@ ipcomp4_input(m, va_alist)
 			ipsecstat.in_polvio++;
 			goto fail;
 		}
-		(*inetsw[ip_protox[nxt]].pr_input)(m, off, nxt);
+		(*inetsw[ip_protox[nxt]].pr_input)(m, off);
 	} else
 		m_freem(m);
 	m = NULL;