[src/trunk]: src/sys/netipsec Remove now unused 'isr', 'skip' an...

[maxv <maxv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fa74fe46a653
branches:  trunk
changeset: 318852:fa74fe46a653
user:      maxv <maxv%NetBSD.org@localhost>
date:      Mon May 07 09:25:04 2018 +0000
description:
Remove now unused 'isr', 'skip' and 'protoff' arguments from ipip_output.

diffstat:

 sys/netipsec/ipsec_output.c |  8 ++++----
 sys/netipsec/xform.h        |  5 ++---
 sys/netipsec/xform_ipip.c   |  7 +++----
 3 files changed, 9 insertions(+), 11 deletions(-)

diffs (83 lines):

diff -r 1a24e30b6fd7 -r fa74fe46a653 sys/netipsec/ipsec_output.c
--- a/sys/netipsec/ipsec_output.c       Mon May 07 09:16:46 2018 +0000
+++ b/sys/netipsec/ipsec_output.c       Mon May 07 09:25:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipsec_output.c,v 1.76 2018/05/07 09:16:46 maxv Exp $   */
+/*     $NetBSD: ipsec_output.c,v 1.77 2018/05/07 09:25:04 maxv Exp $   */
 
 /*
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.76 2018/05/07 09:16:46 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.77 2018/05/07 09:25:04 maxv Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_inet.h"
@@ -550,7 +550,7 @@
                ip->ip_sum = in_cksum(m, ip->ip_hl << 2);
 
                /* Encapsulate the packet */
-               error = ipip_output(m, isr, sav, &mp, 0, 0);
+               error = ipip_output(m, sav, &mp);
                if (mp == NULL && !error) {
                        /* Should never happen. */
                        IPSECLOG(LOG_DEBUG,
@@ -763,7 +763,7 @@
                ip6->ip6_plen = htons(m->m_pkthdr.len - sizeof(*ip6));
 
                /* Encapsulate the packet */
-               error = ipip_output(m, isr, sav, &mp, 0, 0);
+               error = ipip_output(m, sav, &mp);
                if (mp == NULL && !error) {
                        /* Should never happen. */
                        IPSECLOG(LOG_DEBUG,
diff -r 1a24e30b6fd7 -r fa74fe46a653 sys/netipsec/xform.h
--- a/sys/netipsec/xform.h      Mon May 07 09:16:46 2018 +0000
+++ b/sys/netipsec/xform.h      Mon May 07 09:25:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform.h,v 1.18 2018/05/07 09:16:46 maxv Exp $  */
+/*     $NetBSD: xform.h,v 1.19 2018/05/07 09:25:04 maxv Exp $  */
 /*     $FreeBSD: xform.h,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $       */
 /*     $OpenBSD: ip_ipsp.h,v 1.119 2002/03/14 01:27:11 millert Exp $   */
 /*
@@ -90,8 +90,7 @@
 struct cryptoini;
 
 /* XF_IP4 */
-int ipip_output(struct mbuf *, const struct ipsecrequest *, struct secasvar *,
-    struct mbuf **, int, int);
+int ipip_output(struct mbuf *, struct secasvar *, struct mbuf **);
 
 /* XF_AH */
 int ah_init0(struct secasvar *, const struct xformsw *, struct cryptoini *);
diff -r 1a24e30b6fd7 -r fa74fe46a653 sys/netipsec/xform_ipip.c
--- a/sys/netipsec/xform_ipip.c Mon May 07 09:16:46 2018 +0000
+++ b/sys/netipsec/xform_ipip.c Mon May 07 09:25:04 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: xform_ipip.c,v 1.72 2018/05/07 09:16:46 maxv Exp $     */
+/*     $NetBSD: xform_ipip.c,v 1.73 2018/05/07 09:25:04 maxv Exp $     */
 /*     $FreeBSD: xform_ipip.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $  */
 /*     $OpenBSD: ip_ipip.c,v 1.25 2002/06/10 18:04:55 itojun Exp $ */
 
@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.72 2018/05/07 09:16:46 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ipip.c,v 1.73 2018/05/07 09:25:04 maxv Exp $");
 
 /*
  * IP-inside-IP processing
@@ -316,8 +316,7 @@
 }
 
 int
-ipip_output(struct mbuf *m, const struct ipsecrequest *isr,
-    struct secasvar *sav, struct mbuf **mp, int skip, int protoff)
+ipip_output(struct mbuf *m, struct secasvar *sav, struct mbuf **mp)
 {
        char buf[IPSEC_ADDRSTRLEN];
        uint8_t tp, otos;