Module Name: src
Committed By: maxv
Date: Mon May 7 09:25:04 UTC 2018
Modified Files:
src/sys/netipsec: ipsec_output.c xform.h xform_ipip.c
Log Message:
Remove now unused 'isr', 'skip' and 'protoff' arguments from ipip_output.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/netipsec/ipsec_output.c
cvs rdiff -u -r1.18 -r1.19 src/sys/netipsec/xform.h
cvs rdiff -u -r1.72 -r1.73 src/sys/netipsec/xform_ipip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netipsec/ipsec_output.c
diff -u src/sys/netipsec/ipsec_output.c:1.76 src/sys/netipsec/ipsec_output.c:1.77
--- src/sys/netipsec/ipsec_output.c:1.76 Mon May 7 09:16:46 2018
+++ src/sys/netipsec/ipsec_output.c Mon May 7 09:25:04 2018
@@ -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 @@ noneed:
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 @@ ipsec6_process_packet(struct mbuf *m, co
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,
Index: src/sys/netipsec/xform.h
diff -u src/sys/netipsec/xform.h:1.18 src/sys/netipsec/xform.h:1.19
--- src/sys/netipsec/xform.h:1.18 Mon May 7 09:16:46 2018
+++ src/sys/netipsec/xform.h Mon May 7 09:25:04 2018
@@ -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 @@ int xform_init(struct secasvar *sav, int
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 *);
Index: src/sys/netipsec/xform_ipip.c
diff -u src/sys/netipsec/xform_ipip.c:1.72 src/sys/netipsec/xform_ipip.c:1.73
--- src/sys/netipsec/xform_ipip.c:1.72 Mon May 7 09:16:46 2018
+++ src/sys/netipsec/xform_ipip.c Mon May 7 09:25:04 2018
@@ -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 @@ _ipip_input(struct mbuf *m, int iphlen)
}
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;
