Module Name: src
Committed By: maxv
Date: Fri Aug 10 07:16:13 UTC 2018
Modified Files:
src/sys/dist/pf/net: pf_ioctl.c
src/sys/external/bsd/ipf/netinet: ip_fil_netbsd.c
Log Message:
Fix compilation of PF/IPF...
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dist/pf/net/pf_ioctl.c
cvs rdiff -u -r1.30 -r1.31 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_ioctl.c
diff -u src/sys/dist/pf/net/pf_ioctl.c:1.55 src/sys/dist/pf/net/pf_ioctl.c:1.56
--- src/sys/dist/pf/net/pf_ioctl.c:1.55 Fri Aug 10 06:46:08 2018
+++ src/sys/dist/pf/net/pf_ioctl.c Fri Aug 10 07:16:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pf_ioctl.c,v 1.55 2018/08/10 06:46:08 maxv Exp $ */
+/* $NetBSD: pf_ioctl.c,v 1.56 2018/08/10 07:16:13 maxv Exp $ */
/* $OpenBSD: pf_ioctl.c,v 1.182 2007/06/24 11:17:13 mcbride Exp $ */
/*
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.55 2018/08/10 06:46:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.56 2018/08/10 07:16:13 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -100,6 +100,7 @@ __KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v
#ifdef INET6
#include <netinet/ip6.h>
#include <netinet/in_pcb.h>
+#include <netinet6/in6_offload.h>
#endif /* INET6 */
#ifdef ALTQ
Index: src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c
diff -u src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.30 src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.31
--- src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c:1.30 Fri Aug 10 06:46:08 2018
+++ src/sys/external/bsd/ipf/netinet/ip_fil_netbsd.c Fri Aug 10 07:16:13 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_fil_netbsd.c,v 1.30 2018/08/10 06:46:08 maxv Exp $ */
+/* $NetBSD: ip_fil_netbsd.c,v 1.31 2018/08/10 07:16:13 maxv 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.30 2018/08/10 06:46:08 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ip_fil_netbsd.c,v 1.31 2018/08/10 07:16:13 maxv 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";
@@ -83,6 +83,7 @@ static const char rcsid[] = "@(#)Id: ip_
# endif
# if __NetBSD_Version__ >= 499001100
# include <netinet6/scope6_var.h>
+# include <netinet6/in6_offload.h>
# endif
#endif
#include "netinet/ip_fil.h"
