Index: sys/netinet/udp_usrreq.c
===================================================================
--- sys/netinet/udp_usrreq.c
+++ sys/netinet/udp_usrreq.c
@@ -1650,7 +1650,8 @@
        if (m->m_pkthdr.csum_flags & CSUM_DATA_VALID)
                m->m_pkthdr.csum_flags &= ~(CSUM_DATA_VALID|CSUM_PSEUDO_HDR);
 
-       (void) ipsec4_common_input(m, iphlen, ip->ip_p);
+       (void) ipsec_common_input(m, iphlen, offsetof(struct ip, ip_p),
+                                  AF_INET, ip->ip_p);
        return (NULL);                  /* NB: consumed, bypass processing. */
 }
 #endif /* defined(IPSEC) && defined(IPSEC_NAT_T) */
Index: sys/netipsec/ipsec.h
===================================================================
--- sys/netipsec/ipsec.h
+++ sys/netipsec/ipsec.h
@@ -337,7 +337,7 @@
 extern int esp4_input(struct mbuf **mp, int *offp, int proto);
 extern void esp4_ctlinput(int cmd, struct sockaddr *sa, void *);
 extern int ipcomp4_input(struct mbuf **mp, int *offp, int proto);
-extern int ipsec4_common_input(struct mbuf *m, ...);
+extern int ipsec_common_input(struct mbuf *m, int, int, int, int); 
 extern int ipsec4_common_input_cb(struct mbuf *m, struct secasvar *sav,
                        int skip, int protoff);
 extern int ipsec4_process_packet(struct mbuf *, struct ipsecrequest *);
Index: sys/netipsec/ipsec_input.c
===================================================================
--- sys/netipsec/ipsec_input.c
+++ sys/netipsec/ipsec_input.c
@@ -118,7 +118,7 @@
  * and call the appropriate transform.  The transform callback
  * takes care of further processing (like ingress filtering).
  */
-static int
+int
 ipsec_common_input(struct mbuf *m, int skip, int protoff, int af, int sproto)
 {
        char buf[INET6_ADDRSTRLEN];
@@ -243,25 +243,7 @@
 }
 
 #ifdef INET
-/*
- * Common input handler for IPv4 AH, ESP, and IPCOMP.
- */
 int
-ipsec4_common_input(struct mbuf *m, ...)
-{
-       va_list ap;
-       int off, nxt;
-
-       va_start(ap, m);
-       off = va_arg(ap, int);
-       nxt = va_arg(ap, int);
-       va_end(ap);
-
-       return ipsec_common_input(m, off, offsetof(struct ip, ip_p),
-                                 AF_INET, nxt);
-}
-
-int
 ah4_input(struct mbuf **mp, int *offp, int proto)
 {
        struct mbuf *m;
@@ -271,7 +253,8 @@
        off = *offp;
        *mp = NULL;
 
-       ipsec4_common_input(m, off, IPPROTO_AH);
+       ipsec_common_input(m, off, offsetof(struct ip, ip_p),
+                                  AF_INET, IPPROTO_AH);
        return (IPPROTO_DONE);
 }
 void
@@ -292,7 +275,8 @@
        off = *offp;
        mp = NULL;
 
-       ipsec4_common_input(m, off, IPPROTO_ESP);
+       ipsec_common_input(m, off, offsetof(struct ip, ip_p),
+                                  AF_INET, IPPROTO_ESP);
        return (IPPROTO_DONE);
 }
 
@@ -314,7 +298,8 @@
        off = *offp;
        mp = NULL;
 
-       ipsec4_common_input(m, off, IPPROTO_IPCOMP);
+       ipsec_common_input(m, off, offsetof(struct ip, ip_p),
+                                  AF_INET, IPPROTO_IPCOMP);
        return (IPPROTO_DONE);
 }