Module Name: src
Committed By: christos
Date: Mon Mar 8 23:34:58 UTC 2021
Modified Files:
src/sys/dist/pf/net: pf_norm.c
src/sys/external/bsd/ipf/netinet: ip_fil_netbsd.c
Log Message:
Adjust for fewer args in calling functions
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dist/pf/net/pf_norm.c
cvs rdiff -u -r1.35 -r1.36 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.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/dist/pf/net/pf_norm.c
diff -u src/sys/dist/pf/net/pf_norm.c:1.28 src/sys/dist/pf/net/pf_norm.c:1.29
--- src/sys/dist/pf/net/pf_norm.c:1.28 Mon Apr 13 12:35:33 2015
+++ src/sys/dist/pf/net/pf_norm.c Mon Mar 8 18:34:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_norm.c,v 1.28 2015/04/13 16:35:33 riastradh Exp $ */
+/* $NetBSD: pf_norm.c,v 1.29 2021/03/08 23:34:58 christos Exp $ */
/* $OpenBSD: pf_norm.c,v 1.109 2007/05/28 17:16:39 henning Exp $ */
/*
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_norm.c,v 1.28 2015/04/13 16:35:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_norm.c,v 1.29 2021/03/08 23:34:58 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1044,7 +1044,7 @@ pf_normalize_ip(struct mbuf **m0, int di
if (r->rule_flag & PFRULE_RANDOMID) {
u_int16_t id = h->ip_id;
- h->ip_id = ip_randomid(ip_ids, 0);
+ h->ip_id = ip_randomid();
h->ip_sum = pf_cksum_fixup(h->ip_sum, id, h->ip_id, 0);
}
if ((r->rule_flag & (PFRULE_FRAGCROP|PFRULE_FRAGDROP)) == 0)
Index: src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.35 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.36
--- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.35 Fri Jun 12 06:35:59 2020
+++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Mon Mar 8 18:34:58 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.35 2020/06/12 10:35:59 roy Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.36 2021/03/08 23:34:58 christos Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -8,7 +8,7 @@
#if !defined(lint)
#if defined(__NetBSD__)
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.35 2020/06/12 10:35:59 roy Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.36 2021/03/08 23:34:58 christos Exp $");
#else
static const char sccsid[] = "@(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed";
static const char rcsid[] = "@(#)Id: ip_fil_netbsd.c,v 1.1.1.2 2012/07/22 13:45:17 darrenr Exp";
@@ -1637,7 +1637,7 @@ ipf_newisn(fr_info_t *fin)
return 0;
#ifdef INET
return tcp_new_iss1((void *)&fin->fin_src, (void *)&fin->fin_dst,
- fin->fin_sport, fin->fin_dport, asz, 0);
+ fin->fin_sport, fin->fin_dport, asz);
#else
return ENOSYS;
#endif
