Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove now unused 'isr', 'skip' and 'protoff' arguments from ipip_output.

Browse Source
This commit is contained in:
maxv 2018-05-07 09:25:04 +00:00
parent defd3aa31c
commit 20668b06aa
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/netipsec/ipsec_output.c
View File

@ -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, const struct ipsecrequest *isr)
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,

5
sys/netipsec/xform.h
View File

@ -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 *);

7
sys/netipsec/xform_ipip.c
View File

@ -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;