diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 68195678610..12b36255bec 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -38,6 +38,21 @@ # xargs -n1 | sort | uniq -d; # done +# 20150416: ALTQ moved to net/altq +OLD_FILES+=usr/include/altq/altq_rmclass_debug.h +OLD_FILES+=usr/include/altq/altq.h +OLD_FILES+=usr/include/altq/altq_cdnr.h +OLD_FILES+=usr/include/altq/altq_hfsc.h +OLD_FILES+=usr/include/altq/altq_priq.h +OLD_FILES+=usr/include/altq/altqconf.h +OLD_FILES+=usr/include/altq/altq_classq.h +OLD_FILES+=usr/include/altq/altq_red.h +OLD_FILES+=usr/include/altq/if_altq.h +OLD_FILES+=usr/include/altq/altq_var.h +OLD_FILES+=usr/include/altq/altq_rmclass.h +OLD_FILES+=usr/include/altq/altq_cbq.h +OLD_FILES+=usr/include/altq/altq_rio.h +OLD_DIRS+=usr/include/altq # 20150410 OLD_FILES+=usr/share/doc/usd/10.exref/paper.ascii.gz OLD_FILES+=usr/share/doc/usd/10.exref/summary.ascii.gz diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist index 55b20aa79ac..48ec8b42451 100644 --- a/etc/mtree/BSD.include.dist +++ b/etc/mtree/BSD.include.dist @@ -5,8 +5,6 @@ /set type=dir uname=root gname=wheel mode=0755 . - altq - .. arpa .. atf-c @@ -254,6 +252,8 @@ .. .. net + altq + .. .. net80211 .. diff --git a/include/Makefile b/include/Makefile index 46b24f5db1f..d7badd7489b 100644 --- a/include/Makefile +++ b/include/Makefile @@ -50,6 +50,7 @@ LSUBDIRS= cam/ata cam/scsi \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/mountver geom/multipath geom/nop \ geom/raid geom/raid3 geom/shsec geom/stripe geom/virstor \ + net/altq \ netgraph/atm netgraph/netflow \ security/audit \ security/mac_biba security/mac_bsdextended security/mac_lomac \ @@ -144,7 +145,7 @@ compat: -p ${DESTDIR}${INCLUDEDIR} copies: -.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} altq crypto machine machine/pc \ +.for i in ${LDIRS} ${LSUBDIRS} ${LSUBSUBDIRS} crypto machine machine/pc \ ${_MARCHS} .if exists(${DESTDIR}${INCLUDEDIR}/$i) cd ${DESTDIR}${INCLUDEDIR}/$i; \ @@ -179,9 +180,6 @@ copies: cd ${.CURDIR}/../sys/dev/pci; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 pcireg.h \ ${DESTDIR}${INCLUDEDIR}/dev/pci - cd ${.CURDIR}/../sys/contrib/altq/altq; \ - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ - ${DESTDIR}${INCLUDEDIR}/altq cd ${.CURDIR}/../sys/fs/cd9660/; \ ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 *.h \ ${DESTDIR}${INCLUDEDIR}/isofs/cd9660 @@ -279,11 +277,6 @@ symlinks: ln -fs ../../../../../sys/$i/$$h ${DESTDIR}${INCLUDEDIR}/$i; \ done .endfor - cd ${.CURDIR}/../sys/contrib/altq/altq; \ - for h in *.h; do \ - ln -fs ../../../sys/contrib/altq/altq/$$h \ - ${DESTDIR}${INCLUDEDIR}/altq; \ - done .if ${MK_IPFILTER} != "no" cd ${.CURDIR}/../sys/contrib/ipfilter/netinet; \ for h in *.h; do \ diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y index 99c26c0a33d..aebf8a7d093 100644 --- a/sbin/pfctl/parse.y +++ b/sbin/pfctl/parse.y @@ -44,10 +44,10 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index f90fd70ffa6..c1ba12f4c3c 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#include +#include #include #include diff --git a/sbin/pfctl/pfctl_altq.c b/sbin/pfctl/pfctl_altq.c index ae566f84df2..64f474ce050 100644 --- a/sbin/pfctl/pfctl_altq.c +++ b/sbin/pfctl/pfctl_altq.c @@ -38,10 +38,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "pfctl_parser.h" #include "pfctl.h" diff --git a/sbin/pfctl/pfctl_qstats.c b/sbin/pfctl/pfctl_qstats.c index 95371e47af4..0921d47fbe9 100644 --- a/sbin/pfctl/pfctl_qstats.c +++ b/sbin/pfctl/pfctl_qstats.c @@ -34,10 +34,10 @@ __FBSDID("$FreeBSD$"); #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "pfctl.h" #include "pfctl_parser.h" diff --git a/sys/conf/files b/sys/conf/files index 7ef7afe6452..1a85e808864 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -247,14 +247,6 @@ compat/freebsd32/freebsd32_ioctl.c optional compat_freebsd32 compat/freebsd32/freebsd32_misc.c optional compat_freebsd32 compat/freebsd32/freebsd32_syscalls.c optional compat_freebsd32 compat/freebsd32/freebsd32_sysent.c optional compat_freebsd32 -contrib/altq/altq/altq_cbq.c optional altq -contrib/altq/altq/altq_cdnr.c optional altq -contrib/altq/altq/altq_hfsc.c optional altq -contrib/altq/altq/altq_priq.c optional altq -contrib/altq/altq/altq_red.c optional altq -contrib/altq/altq/altq_rio.c optional altq -contrib/altq/altq/altq_rmclass.c optional altq -contrib/altq/altq/altq_subr.c optional altq contrib/dev/acpica/common/ahids.c optional acpi acpi_debug contrib/dev/acpica/common/ahuuids.c optional acpi acpi_debug contrib/dev/acpica/components/debugger/dbcmds.c optional acpi acpi_debug @@ -3272,6 +3264,14 @@ libkern/strtoul.c standard libkern/strtouq.c standard libkern/strvalid.c standard libkern/timingsafe_bcmp.c standard +net/altq/altq_cbq.c optional altq +net/altq/altq_cdnr.c optional altq +net/altq/altq_hfsc.c optional altq +net/altq/altq_priq.c optional altq +net/altq/altq_red.c optional altq +net/altq/altq_rio.c optional altq +net/altq/altq_rmclass.c optional altq +net/altq/altq_subr.c optional altq net/bpf.c standard net/bpf_buffer.c optional bpf net/bpf_jitter.c optional bpf_jitter diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index ede4ae852cf..cc16d15b1e7 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -64,13 +64,10 @@ NOSTDINC= -nostdinc INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S -# This hack lets us use the OpenBSD altq code without spamming a new -# include path into contrib'ed source files. -INCLUDES+= -I$S/contrib/altq - .if make(depend) || make(kernel-depend) -# ... and the same for ipfilter +# This hack lets us use the ipfilter code without spamming a new +# include path into contrib'ed source files. INCLUDES+= -I$S/contrib/ipfilter # ... and the same for ath diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index b6b01e57200..ee892605a01 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -101,10 +101,6 @@ CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h # set because there are no standard paths for non-headers. CFLAGS+= -I. -I${SYSDIR} -# Add -I path for altq headers as they are included via net/if_var.h -# for example. -CFLAGS+= -I${SYSDIR}/contrib/altq - CFLAGS.gcc+= -finline-limit=${INLINE_LIMIT} CFLAGS.gcc+= -fms-extensions CFLAGS.gcc+= --param inline-unit-growth=100 diff --git a/sys/contrib/altq/altq/altq.h b/sys/net/altq/altq.h similarity index 99% rename from sys/contrib/altq/altq/altq.h rename to sys/net/altq/altq.h index c740ed359ad..d0182431f7f 100644 --- a/sys/contrib/altq/altq/altq.h +++ b/sys/net/altq/altq.h @@ -198,7 +198,7 @@ struct pktcntr { #endif /* ALTQ3_COMPAT */ #ifdef _KERNEL -#include +#include #endif #endif /* _ALTQ_ALTQ_H_ */ diff --git a/sys/contrib/altq/altq/altq_cbq.c b/sys/net/altq/altq_cbq.c similarity index 99% rename from sys/contrib/altq/altq/altq_cbq.c rename to sys/net/altq/altq_cbq.c index 3991d1d927c..1a7f4cae189 100644 --- a/sys/contrib/altq/altq/altq_cbq.c +++ b/sys/net/altq/altq_cbq.c @@ -60,10 +60,10 @@ #include #include #include -#include -#include +#include +#include #ifdef ALTQ3_COMPAT -#include +#include #endif #ifdef ALTQ3_COMPAT diff --git a/sys/contrib/altq/altq/altq_cbq.h b/sys/net/altq/altq_cbq.h similarity index 96% rename from sys/contrib/altq/altq/altq_cbq.h rename to sys/net/altq/altq_cbq.h index 30a15c73024..792c9fd15b9 100644 --- a/sys/contrib/altq/altq/altq_cbq.h +++ b/sys/net/altq/altq_cbq.h @@ -1,6 +1,4 @@ -/* $KAME: altq_cbq.h,v 1.12 2003/10/03 05:05:15 kjc Exp $ */ - -/* +/*- * Copyright (c) Sun Microsystems, Inc. 1993-1998 All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -28,15 +26,18 @@ * provided "as is" without express or implied warranty of any kind. * * These notices must be retained in any copies of any part of this software. + * + * $KAME: altq_cbq.h,v 1.12 2003/10/03 05:05:15 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_CBQ_H_ #define _ALTQ_ALTQ_CBQ_H_ -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/sys/contrib/altq/altq/altq_cdnr.c b/sys/net/altq/altq_cdnr.c similarity index 99% rename from sys/contrib/altq/altq/altq_cdnr.c rename to sys/net/altq/altq_cdnr.c index ee36fe8a9f5..122643a5e21 100644 --- a/sys/contrib/altq/altq/altq_cdnr.c +++ b/sys/net/altq/altq_cdnr.c @@ -55,12 +55,12 @@ #include #endif -#include -#include +#include +#include #ifdef ALTQ3_COMPAT -#include +#include #endif -#include +#include #ifdef ALTQ3_COMPAT /* diff --git a/sys/contrib/altq/altq/altq_cdnr.h b/sys/net/altq/altq_cdnr.h similarity index 98% rename from sys/contrib/altq/altq/altq_cdnr.h rename to sys/net/altq/altq_cdnr.h index d55402f4ef5..06fa9c98d3d 100644 --- a/sys/contrib/altq/altq/altq_cdnr.h +++ b/sys/net/altq/altq_cdnr.h @@ -1,6 +1,4 @@ -/* $KAME: altq_cdnr.h,v 1.9 2003/07/10 12:07:48 kjc Exp $ */ - -/* +/*- * Copyright (C) 1999-2002 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -24,12 +22,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_cdnr.h,v 1.9 2003/07/10 12:07:48 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_CDNR_H_ #define _ALTQ_ALTQ_CDNR_H_ -#include +#include /* * traffic conditioner element types diff --git a/sys/contrib/altq/altq/altq_classq.h b/sys/net/altq/altq_classq.h similarity index 100% rename from sys/contrib/altq/altq/altq_classq.h rename to sys/net/altq/altq_classq.h diff --git a/sys/contrib/altq/altq/altq_hfsc.c b/sys/net/altq/altq_hfsc.c similarity index 99% rename from sys/contrib/altq/altq/altq_hfsc.c rename to sys/net/altq/altq_hfsc.c index 03630167fc6..05fca40acaf 100644 --- a/sys/contrib/altq/altq/altq_hfsc.c +++ b/sys/net/altq/altq_hfsc.c @@ -72,10 +72,10 @@ #include #include #include -#include -#include +#include +#include #ifdef ALTQ3_COMPAT -#include +#include #endif /* diff --git a/sys/contrib/altq/altq/altq_hfsc.h b/sys/net/altq/altq_hfsc.h similarity index 98% rename from sys/contrib/altq/altq/altq_hfsc.h rename to sys/net/altq/altq_hfsc.h index d04b378100a..81014287c5b 100644 --- a/sys/contrib/altq/altq/altq_hfsc.h +++ b/sys/net/altq/altq_hfsc.h @@ -1,6 +1,4 @@ -/* $KAME: altq_hfsc.h,v 1.12 2003/12/05 05:40:46 kjc Exp $ */ - -/* +/*- * Copyright (c) 1997-1999 Carnegie Mellon University. All Rights Reserved. * * Permission to use, copy, modify, and distribute this software and @@ -28,14 +26,17 @@ * software to return any improvements or extensions that they make, * and to grant Carnegie Mellon the rights to redistribute these * changes without encumbrance. + * + * $KAME: altq_hfsc.h,v 1.12 2003/12/05 05:40:46 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_HFSC_H_ #define _ALTQ_ALTQ_HFSC_H_ -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/sys/contrib/altq/altq/altq_priq.c b/sys/net/altq/altq_priq.c similarity index 99% rename from sys/contrib/altq/altq/altq_priq.c rename to sys/net/altq/altq_priq.c index 3ce65dc15e1..be62373add9 100644 --- a/sys/contrib/altq/altq/altq_priq.c +++ b/sys/net/altq/altq_priq.c @@ -57,11 +57,11 @@ #include #include #include -#include +#include #ifdef ALTQ3_COMPAT -#include +#include #endif -#include +#include /* * function prototypes diff --git a/sys/contrib/altq/altq/altq_priq.h b/sys/net/altq/altq_priq.h similarity index 96% rename from sys/contrib/altq/altq/altq_priq.h rename to sys/net/altq/altq_priq.h index 481d31b8a6b..d3cea335a3a 100644 --- a/sys/contrib/altq/altq/altq_priq.h +++ b/sys/net/altq/altq_priq.h @@ -1,5 +1,4 @@ -/* $KAME: altq_priq.h,v 1.7 2003/10/03 05:05:15 kjc Exp $ */ -/* +/*- * Copyright (C) 2000-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -23,15 +22,18 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_priq.h,v 1.7 2003/10/03 05:05:15 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_PRIQ_H_ #define _ALTQ_ALTQ_PRIQ_H_ -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/sys/contrib/altq/altq/altq_red.c b/sys/net/altq/altq_red.c similarity index 99% rename from sys/contrib/altq/altq/altq_red.c rename to sys/net/altq/altq_red.c index defee2923d4..7cd690ffd0c 100644 --- a/sys/contrib/altq/altq/altq_red.c +++ b/sys/net/altq/altq_red.c @@ -98,12 +98,12 @@ #include #include #include -#include -#include +#include +#include #ifdef ALTQ3_COMPAT -#include +#include #ifdef ALTQ_FLOWVALVE -#include +#include #endif #endif diff --git a/sys/contrib/altq/altq/altq_red.h b/sys/net/altq/altq_red.h similarity index 98% rename from sys/contrib/altq/altq/altq_red.h rename to sys/net/altq/altq_red.h index dc8ea0ace31..8ae8d29166c 100644 --- a/sys/contrib/altq/altq/altq_red.h +++ b/sys/net/altq/altq_red.h @@ -1,6 +1,4 @@ -/* $KAME: altq_red.h,v 1.8 2003/07/10 12:07:49 kjc Exp $ */ - -/* +/*- * Copyright (C) 1997-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -24,12 +22,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_red.h,v 1.8 2003/07/10 12:07:49 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_RED_H_ #define _ALTQ_ALTQ_RED_H_ -#include +#include #ifdef ALTQ3_COMPAT struct red_interface { diff --git a/sys/contrib/altq/altq/altq_rio.c b/sys/net/altq/altq_rio.c similarity index 99% rename from sys/contrib/altq/altq/altq_rio.c rename to sys/net/altq/altq_rio.c index 151debed451..ccf0e8dcf54 100644 --- a/sys/contrib/altq/altq/altq_rio.c +++ b/sys/net/altq/altq_rio.c @@ -92,12 +92,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef ALTQ3_COMPAT -#include +#include #endif /* diff --git a/sys/contrib/altq/altq/altq_rio.h b/sys/net/altq/altq_rio.h similarity index 97% rename from sys/contrib/altq/altq/altq_rio.h rename to sys/net/altq/altq_rio.h index 83210f235e7..ce9dc0e0f4d 100644 --- a/sys/contrib/altq/altq/altq_rio.h +++ b/sys/net/altq/altq_rio.h @@ -1,6 +1,4 @@ -/* $KAME: altq_rio.h,v 1.9 2003/07/10 12:07:49 kjc Exp $ */ - -/* +/*- * Copyright (C) 1998-2003 * Sony Computer Science Laboratories Inc. All rights reserved. * @@ -24,12 +22,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_rio.h,v 1.9 2003/07/10 12:07:49 kjc Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_RIO_H_ #define _ALTQ_ALTQ_RIO_H_ -#include +#include /* * RIO: RED with IN/OUT bit diff --git a/sys/contrib/altq/altq/altq_rmclass.c b/sys/net/altq/altq_rmclass.c similarity index 99% rename from sys/contrib/altq/altq/altq_rmclass.c rename to sys/net/altq/altq_rmclass.c index c433024e717..b5e23f750bb 100644 --- a/sys/contrib/altq/altq/altq_rmclass.c +++ b/sys/net/altq/altq_rmclass.c @@ -66,12 +66,12 @@ #include #endif -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /* * Local Macros diff --git a/sys/contrib/altq/altq/altq_rmclass.h b/sys/net/altq/altq_rmclass.h similarity index 98% rename from sys/contrib/altq/altq/altq_rmclass.h rename to sys/net/altq/altq_rmclass.h index cf0ddf48e20..e2cae899a2b 100644 --- a/sys/contrib/altq/altq/altq_rmclass.h +++ b/sys/net/altq/altq_rmclass.h @@ -1,6 +1,4 @@ -/* $KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $ */ - -/* +/*- * Copyright (c) 1991-1997 Regents of the University of California. * All rights reserved. * @@ -31,12 +29,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. + * + * $KAME: altq_rmclass.h,v 1.10 2003/08/20 23:30:23 itojun Exp $ + * $FreeBSD$ */ #ifndef _ALTQ_ALTQ_RMCLASS_H_ #define _ALTQ_ALTQ_RMCLASS_H_ -#include +#include /* #pragma ident "@(#)rm_class.h 1.20 97/10/23 SMI" */ diff --git a/sys/contrib/altq/altq/altq_rmclass_debug.h b/sys/net/altq/altq_rmclass_debug.h similarity index 100% rename from sys/contrib/altq/altq/altq_rmclass_debug.h rename to sys/net/altq/altq_rmclass_debug.h diff --git a/sys/contrib/altq/altq/altq_subr.c b/sys/net/altq/altq_subr.c similarity index 99% rename from sys/contrib/altq/altq/altq_subr.c rename to sys/net/altq/altq_subr.c index 16b796a1e52..eefa12f21f5 100644 --- a/sys/contrib/altq/altq/altq_subr.c +++ b/sys/net/altq/altq_subr.c @@ -67,9 +67,9 @@ #include #include -#include +#include #ifdef ALTQ3_COMPAT -#include +#include #endif /* machine dependent clock related includes */ diff --git a/sys/contrib/altq/altq/altq_var.h b/sys/net/altq/altq_var.h similarity index 100% rename from sys/contrib/altq/altq/altq_var.h rename to sys/net/altq/altq_var.h diff --git a/sys/contrib/altq/altq/altqconf.h b/sys/net/altq/altqconf.h similarity index 100% rename from sys/contrib/altq/altq/altqconf.h rename to sys/net/altq/altqconf.h diff --git a/sys/contrib/altq/altq/if_altq.h b/sys/net/altq/if_altq.h similarity index 99% rename from sys/contrib/altq/altq/if_altq.h rename to sys/net/altq/if_altq.h index 7c4d1c2795c..3c43fc7ea6f 100644 --- a/sys/contrib/altq/altq/if_altq.h +++ b/sys/net/altq/if_altq.h @@ -36,7 +36,7 @@ #endif #ifdef _KERNEL_OPT -#include +#include #endif struct altq_pktattr; struct tb_regulator; struct top_cdnr; diff --git a/sys/net/if_var.h b/sys/net/if_var.h index c770374d6ad..4af6b521ec5 100644 --- a/sys/net/if_var.h +++ b/sys/net/if_var.h @@ -83,7 +83,7 @@ struct netmap_adapter; #define IF_DUNIT_NONE -1 -#include +#include TAILQ_HEAD(ifnethead, ifnet); /* we use TAILQs so that the order of */ TAILQ_HEAD(ifaddrhead, ifaddr); /* instantiation is preserved in the list */ diff --git a/sys/net/ifq.h b/sys/net/ifq.h index d1fc3fe9e08..769d5a5f223 100644 --- a/sys/net/ifq.h +++ b/sys/net/ifq.h @@ -47,7 +47,7 @@ */ #define IF_DUNIT_NONE -1 -#include +#include /* * Structure defining a queue for a network interface. diff --git a/sys/netpfil/pf/pf_ioctl.c b/sys/netpfil/pf/pf_ioctl.c index 359d9de71eb..c20e00acbe5 100644 --- a/sys/netpfil/pf/pf_ioctl.c +++ b/sys/netpfil/pf/pf_ioctl.c @@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$"); #endif /* INET6 */ #ifdef ALTQ -#include +#include #endif static int pfattach(void); diff --git a/sys/sys/param.h b/sys/sys/param.h index 98151ac252b..33eaa71a6d8 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -58,7 +58,7 @@ * in the range 5 to 9. */ #undef __FreeBSD_version -#define __FreeBSD_version 1100069 /* Master, propagated to newvers */ +#define __FreeBSD_version 1100070 /* Master, propagated to newvers */ /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,