Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Fix build. pf_ioctl.c needs netinet/in_offload.h (after pr...



details:   https://anonhg.NetBSD.org/src/rev/e947334b1f4b
branches:  trunk
changeset: 833765:e947334b1f4b
user:      kre <kre%NetBSD.org@localhost>
date:      Wed Jul 11 11:13:16 2018 +0000

description:
Fix build.   pf_ioctl.c needs netinet/in_offload.h (after previous change).
Because this is in a module, apparently, that means that netinet_in_offload.h
needs to get installed in /usr/include, so do that as well.

Feel free to fix this in a better way...

diffstat:

 distrib/sets/lists/comp/mi |  3 ++-
 sys/dist/pf/net/pf_ioctl.c |  5 +++--
 sys/netinet/Makefile       |  4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 7229615a0011 -r e947334b1f4b distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Wed Jul 11 07:46:20 2018 +0000
+++ b/distrib/sets/lists/comp/mi        Wed Jul 11 11:13:16 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: mi,v 1.2206 2018/06/28 10:14:01 christos Exp $
+#      $NetBSD: mi,v 1.2207 2018/07/11 11:13:16 kre Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 ./etc/mtree/set.comp                           comp-sys-root
@@ -2388,6 +2388,7 @@
 ./usr/include/netinet/igmp_var.h               comp-c-include
 ./usr/include/netinet/in.h                     comp-c-include
 ./usr/include/netinet/in_gif.h                 comp-c-include
+./usr/include/netinet/in_offload.h             comp-c-include
 ./usr/include/netinet/in_l2tp.h                        comp-c-include
 ./usr/include/netinet/in_pcb.h                 comp-c-include
 ./usr/include/netinet/in_pcb_hdr.h             comp-c-include
diff -r 7229615a0011 -r e947334b1f4b sys/dist/pf/net/pf_ioctl.c
--- a/sys/dist/pf/net/pf_ioctl.c        Wed Jul 11 07:46:20 2018 +0000
+++ b/sys/dist/pf/net/pf_ioctl.c        Wed Jul 11 11:13:16 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pf_ioctl.c,v 1.53 2018/07/11 05:25:46 maxv Exp $       */
+/*     $NetBSD: pf_ioctl.c,v 1.54 2018/07/11 11:13:16 kre 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.53 2018/07/11 05:25:46 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pf_ioctl.c,v 1.54 2018/07/11 11:13:16 kre Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
@@ -84,6 +84,7 @@
 #include <dev/rndvar.h>
 #include <crypto/md5.h>
 #else
+#include <netinet/in_offload.h>
 #include <sys/md5.h>
 #endif /* __NetBSD__ */
 #include <net/pfvar.h>
diff -r 7229615a0011 -r e947334b1f4b sys/netinet/Makefile
--- a/sys/netinet/Makefile      Wed Jul 11 07:46:20 2018 +0000
+++ b/sys/netinet/Makefile      Wed Jul 11 11:13:16 2018 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: Makefile,v 1.28 2017/02/16 08:12:44 knakahara Exp $
+#      $NetBSD: Makefile,v 1.29 2018/07/11 11:13:16 kre Exp $
 
 INCSDIR= /usr/include/netinet
 
 INCS=  dccp.h icmp6.h icmp_var.h if_atm.h if_ether.h if_inarp.h igmp.h \
        igmp_var.h in.h in_gif.h in_l2tp.h in_pcb.h in_pcb_hdr.h \
-       in_selsrc.h in_systm.h \
+       in_offload.h in_selsrc.h in_systm.h \
        in_var.h ip.h ip_carp.h ip6.h ip_ecn.h ip_encap.h \
        ip_icmp.h ip_mroute.h ip_var.h pim.h pim_var.h portalgo.h \
        sctp.h sctp_uio.h \



Home | Main Index | Thread Index | Old Index