Author: glebius
Date: Thu Apr 16 20:22:40 2015
New Revision: 281613
URL: https://svnweb.freebsd.org/changeset/base/281613
Log:
Move ALTQ from contrib to net/altq. The ALTQ code is for many years
discontinued by its initial authors. In FreeBSD the code was already
slightly edited during the pf(4) SMP project. It is about to be edited
more in the projects/ifnet. Moving out of contrib also allows to remove
several hacks to the make glue.
Reviewed by: net@
Added:
head/sys/net/altq/
- copied from r281610, head/sys/contrib/altq/altq/
Deleted:
head/sys/contrib/altq/altq/
Modified:
head/ObsoleteFiles.inc
head/etc/mtree/BSD.include.dist
head/include/Makefile
head/sbin/pfctl/parse.y
head/sbin/pfctl/pfctl.c
head/sbin/pfctl/pfctl_altq.c
head/sbin/pfctl/pfctl_qstats.c
head/sys/conf/files
head/sys/conf/kern.pre.mk
head/sys/conf/kmod.mk
head/sys/net/altq/altq.h
head/sys/net/altq/altq_cbq.c
head/sys/net/altq/altq_cbq.h
head/sys/net/altq/altq_cdnr.c
head/sys/net/altq/altq_cdnr.h
head/sys/net/altq/altq_hfsc.c
head/sys/net/altq/altq_hfsc.h
head/sys/net/altq/altq_priq.c
head/sys/net/altq/altq_priq.h
head/sys/net/altq/altq_red.c
head/sys/net/altq/altq_red.h
head/sys/net/altq/altq_rio.c
head/sys/net/altq/altq_rio.h
head/sys/net/altq/altq_rmclass.c
head/sys/net/altq/altq_rmclass.h
head/sys/net/altq/altq_subr.c
head/sys/net/altq/if_altq.h
head/sys/net/if_var.h
head/sys/net/ifq.h
head/sys/netpfil/pf/pf_ioctl.c
head/sys/sys/param.h
Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc Thu Apr 16 20:15:47 2015 (r281612)
+++ head/ObsoleteFiles.inc Thu Apr 16 20:22:40 2015 (r281613)
@@ -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
Modified: head/etc/mtree/BSD.include.dist
==============================================================================
--- head/etc/mtree/BSD.include.dist Thu Apr 16 20:15:47 2015
(r281612)
+++ head/etc/mtree/BSD.include.dist Thu Apr 16 20:22:40 2015
(r281613)
@@ -5,8 +5,6 @@
/set type=dir uname=root gname=wheel mode=0755
.
- altq
- ..
arpa
..
atf-c
@@ -254,6 +252,8 @@
..
..
net
+ altq
+ ..
..
net80211
..
Modified: head/include/Makefile
==============================================================================
--- head/include/Makefile Thu Apr 16 20:15:47 2015 (r281612)
+++ head/include/Makefile Thu Apr 16 20:22:40 2015 (r281613)
@@ -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 \
Modified: head/sbin/pfctl/parse.y
==============================================================================
--- head/sbin/pfctl/parse.y Thu Apr 16 20:15:47 2015 (r281612)
+++ head/sbin/pfctl/parse.y Thu Apr 16 20:22:40 2015 (r281613)
@@ -44,10 +44,10 @@ __FBSDID("$FreeBSD$");
#include <netinet/icmp6.h>
#include <net/pfvar.h>
#include <arpa/inet.h>
-#include <altq/altq.h>
-#include <altq/altq_cbq.h>
-#include <altq/altq_priq.h>
-#include <altq/altq_hfsc.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_cbq.h>
+#include <net/altq/altq_priq.h>
+#include <net/altq/altq_hfsc.h>
#include <stdio.h>
#include <unistd.h>
Modified: head/sbin/pfctl/pfctl.c
==============================================================================
--- head/sbin/pfctl/pfctl.c Thu Apr 16 20:15:47 2015 (r281612)
+++ head/sbin/pfctl/pfctl.c Thu Apr 16 20:22:40 2015 (r281613)
@@ -44,7 +44,7 @@ __FBSDID("$FreeBSD$");
#include <netinet/in.h>
#include <net/pfvar.h>
#include <arpa/inet.h>
-#include <altq/altq.h>
+#include <net/altq/altq.h>
#include <sys/sysctl.h>
#include <err.h>
Modified: head/sbin/pfctl/pfctl_altq.c
==============================================================================
--- head/sbin/pfctl/pfctl_altq.c Thu Apr 16 20:15:47 2015
(r281612)
+++ head/sbin/pfctl/pfctl_altq.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -38,10 +38,10 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-#include <altq/altq.h>
-#include <altq/altq_cbq.h>
-#include <altq/altq_priq.h>
-#include <altq/altq_hfsc.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_cbq.h>
+#include <net/altq/altq_priq.h>
+#include <net/altq/altq_hfsc.h>
#include "pfctl_parser.h"
#include "pfctl.h"
Modified: head/sbin/pfctl/pfctl_qstats.c
==============================================================================
--- head/sbin/pfctl/pfctl_qstats.c Thu Apr 16 20:15:47 2015
(r281612)
+++ head/sbin/pfctl/pfctl_qstats.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -34,10 +34,10 @@ __FBSDID("$FreeBSD$");
#include <string.h>
#include <unistd.h>
-#include <altq/altq.h>
-#include <altq/altq_cbq.h>
-#include <altq/altq_priq.h>
-#include <altq/altq_hfsc.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_cbq.h>
+#include <net/altq/altq_priq.h>
+#include <net/altq/altq_hfsc.h>
#include "pfctl.h"
#include "pfctl_parser.h"
Modified: head/sys/conf/files
==============================================================================
--- head/sys/conf/files Thu Apr 16 20:15:47 2015 (r281612)
+++ head/sys/conf/files Thu Apr 16 20:22:40 2015 (r281613)
@@ -247,14 +247,6 @@ compat/freebsd32/freebsd32_ioctl.c optio
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
Modified: head/sys/conf/kern.pre.mk
==============================================================================
--- head/sys/conf/kern.pre.mk Thu Apr 16 20:15:47 2015 (r281612)
+++ head/sys/conf/kern.pre.mk Thu Apr 16 20:22:40 2015 (r281613)
@@ -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
Modified: head/sys/conf/kmod.mk
==============================================================================
--- head/sys/conf/kmod.mk Thu Apr 16 20:15:47 2015 (r281612)
+++ head/sys/conf/kmod.mk Thu Apr 16 20:22:40 2015 (r281613)
@@ -101,10 +101,6 @@ CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -i
# 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
Modified: head/sys/net/altq/altq.h
==============================================================================
--- head/sys/contrib/altq/altq/altq.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq.h Thu Apr 16 20:22:40 2015 (r281613)
@@ -198,7 +198,7 @@ struct pktcntr {
#endif /* ALTQ3_COMPAT */
#ifdef _KERNEL
-#include <altq/altq_var.h>
+#include <net/altq/altq_var.h>
#endif
#endif /* _ALTQ_ALTQ_H_ */
Modified: head/sys/net/altq/altq_cbq.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_cbq.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_cbq.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -60,10 +60,10 @@
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
-#include <altq/altq.h>
-#include <altq/altq_cbq.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_cbq.h>
#ifdef ALTQ3_COMPAT
-#include <altq/altq_conf.h>
+#include <net/altq/altq_conf.h>
#endif
#ifdef ALTQ3_COMPAT
Modified: head/sys/net/altq/altq_cbq.h
==============================================================================
--- head/sys/contrib/altq/altq/altq_cbq.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_cbq.h Thu Apr 16 20:22:40 2015
(r281613)
@@ -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 <altq/altq.h>
-#include <altq/altq_rmclass.h>
-#include <altq/altq_red.h>
-#include <altq/altq_rio.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_rmclass.h>
+#include <net/altq/altq_red.h>
+#include <net/altq/altq_rio.h>
#ifdef __cplusplus
extern "C" {
Modified: head/sys/net/altq/altq_cdnr.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_cdnr.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_cdnr.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -55,12 +55,12 @@
#include <netinet/ip6.h>
#endif
-#include <altq/if_altq.h>
-#include <altq/altq.h>
+#include <net/altq/if_altq.h>
+#include <net/altq/altq.h>
#ifdef ALTQ3_COMPAT
-#include <altq/altq_conf.h>
+#include <net/altq/altq_conf.h>
#endif
-#include <altq/altq_cdnr.h>
+#include <net/altq/altq_cdnr.h>
#ifdef ALTQ3_COMPAT
/*
Modified: head/sys/net/altq/altq_cdnr.h
==============================================================================
--- head/sys/contrib/altq/altq/altq_cdnr.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_cdnr.h Thu Apr 16 20:22:40 2015
(r281613)
@@ -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 <altq/altq.h>
+#include <net/altq/altq.h>
/*
* traffic conditioner element types
Modified: head/sys/net/altq/altq_hfsc.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_hfsc.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_hfsc.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -72,10 +72,10 @@
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
-#include <altq/altq.h>
-#include <altq/altq_hfsc.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_hfsc.h>
#ifdef ALTQ3_COMPAT
-#include <altq/altq_conf.h>
+#include <net/altq/altq_conf.h>
#endif
/*
Modified: head/sys/net/altq/altq_hfsc.h
==============================================================================
--- head/sys/contrib/altq/altq/altq_hfsc.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_hfsc.h Thu Apr 16 20:22:40 2015
(r281613)
@@ -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 <altq/altq.h>
-#include <altq/altq_classq.h>
-#include <altq/altq_red.h>
-#include <altq/altq_rio.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_classq.h>
+#include <net/altq/altq_red.h>
+#include <net/altq/altq_rio.h>
#ifdef __cplusplus
extern "C" {
Modified: head/sys/net/altq/altq_priq.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_priq.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_priq.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -57,11 +57,11 @@
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
-#include <altq/altq.h>
+#include <net/altq/altq.h>
#ifdef ALTQ3_COMPAT
-#include <altq/altq_conf.h>
+#include <net/altq/altq_conf.h>
#endif
-#include <altq/altq_priq.h>
+#include <net/altq/altq_priq.h>
/*
* function prototypes
Modified: head/sys/net/altq/altq_priq.h
==============================================================================
--- head/sys/contrib/altq/altq/altq_priq.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_priq.h Thu Apr 16 20:22:40 2015
(r281613)
@@ -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 <altq/altq.h>
-#include <altq/altq_classq.h>
-#include <altq/altq_red.h>
-#include <altq/altq_rio.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_classq.h>
+#include <net/altq/altq_red.h>
+#include <net/altq/altq_rio.h>
#ifdef __cplusplus
extern "C" {
Modified: head/sys/net/altq/altq_red.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_red.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_red.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -98,12 +98,12 @@
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
#include <netpfil/pf/pf_mtag.h>
-#include <altq/altq.h>
-#include <altq/altq_red.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_red.h>
#ifdef ALTQ3_COMPAT
-#include <altq/altq_conf.h>
+#include <net/altq/altq_conf.h>
#ifdef ALTQ_FLOWVALVE
-#include <altq/altq_flowvalve.h>
+#include <net/altq/altq_flowvalve.h>
#endif
#endif
Modified: head/sys/net/altq/altq_red.h
==============================================================================
--- head/sys/contrib/altq/altq/altq_red.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_red.h Thu Apr 16 20:22:40 2015
(r281613)
@@ -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 <altq/altq_classq.h>
+#include <net/altq/altq_classq.h>
#ifdef ALTQ3_COMPAT
struct red_interface {
Modified: head/sys/net/altq/altq_rio.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_rio.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_rio.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -92,12 +92,12 @@
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
-#include <altq/altq.h>
-#include <altq/altq_cdnr.h>
-#include <altq/altq_red.h>
-#include <altq/altq_rio.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_cdnr.h>
+#include <net/altq/altq_red.h>
+#include <net/altq/altq_rio.h>
#ifdef ALTQ3_COMPAT
-#include <altq/altq_conf.h>
+#include <net/altq/altq_conf.h>
#endif
/*
Modified: head/sys/net/altq/altq_rio.h
==============================================================================
--- head/sys/contrib/altq/altq/altq_rio.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_rio.h Thu Apr 16 20:22:40 2015
(r281613)
@@ -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 <altq/altq_classq.h>
+#include <net/altq/altq_classq.h>
/*
* RIO: RED with IN/OUT bit
Modified: head/sys/net/altq/altq_rmclass.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_rmclass.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_rmclass.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -66,12 +66,12 @@
#include <netinet/ip.h>
#endif
-#include <altq/if_altq.h>
-#include <altq/altq.h>
-#include <altq/altq_rmclass.h>
-#include <altq/altq_rmclass_debug.h>
-#include <altq/altq_red.h>
-#include <altq/altq_rio.h>
+#include <net/altq/if_altq.h>
+#include <net/altq/altq.h>
+#include <net/altq/altq_rmclass.h>
+#include <net/altq/altq_rmclass_debug.h>
+#include <net/altq/altq_red.h>
+#include <net/altq/altq_rio.h>
/*
* Local Macros
Modified: head/sys/net/altq/altq_rmclass.h
==============================================================================
--- head/sys/contrib/altq/altq/altq_rmclass.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_rmclass.h Thu Apr 16 20:22:40 2015
(r281613)
@@ -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 <altq/altq_classq.h>
+#include <net/altq/altq_classq.h>
/* #pragma ident "@(#)rm_class.h 1.20 97/10/23 SMI" */
Modified: head/sys/net/altq/altq_subr.c
==============================================================================
--- head/sys/contrib/altq/altq/altq_subr.c Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/altq_subr.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -67,9 +67,9 @@
#include <netpfil/pf/pf.h>
#include <netpfil/pf/pf_altq.h>
-#include <altq/altq.h>
+#include <net/altq/altq.h>
#ifdef ALTQ3_COMPAT
-#include <altq/altq_conf.h>
+#include <net/altq/altq_conf.h>
#endif
/* machine dependent clock related includes */
Modified: head/sys/net/altq/if_altq.h
==============================================================================
--- head/sys/contrib/altq/altq/if_altq.h Thu Apr 16 19:23:08 2015
(r281610)
+++ head/sys/net/altq/if_altq.h Thu Apr 16 20:22:40 2015 (r281613)
@@ -36,7 +36,7 @@
#endif
#ifdef _KERNEL_OPT
-#include <altq/altqconf.h>
+#include <net/altq/altqconf.h>
#endif
struct altq_pktattr; struct tb_regulator; struct top_cdnr;
Modified: head/sys/net/if_var.h
==============================================================================
--- head/sys/net/if_var.h Thu Apr 16 20:15:47 2015 (r281612)
+++ head/sys/net/if_var.h Thu Apr 16 20:22:40 2015 (r281613)
@@ -83,7 +83,7 @@ struct netmap_adapter;
#define IF_DUNIT_NONE -1
-#include <altq/if_altq.h>
+#include <net/altq/if_altq.h>
TAILQ_HEAD(ifnethead, ifnet); /* we use TAILQs so that the order of */
TAILQ_HEAD(ifaddrhead, ifaddr); /* instantiation is preserved in the
list */
Modified: head/sys/net/ifq.h
==============================================================================
--- head/sys/net/ifq.h Thu Apr 16 20:15:47 2015 (r281612)
+++ head/sys/net/ifq.h Thu Apr 16 20:22:40 2015 (r281613)
@@ -47,7 +47,7 @@
*/
#define IF_DUNIT_NONE -1
-#include <altq/if_altq.h>
+#include <net/altq/if_altq.h>
/*
* Structure defining a queue for a network interface.
Modified: head/sys/netpfil/pf/pf_ioctl.c
==============================================================================
--- head/sys/netpfil/pf/pf_ioctl.c Thu Apr 16 20:15:47 2015
(r281612)
+++ head/sys/netpfil/pf/pf_ioctl.c Thu Apr 16 20:22:40 2015
(r281613)
@@ -84,7 +84,7 @@ __FBSDID("$FreeBSD$");
#endif /* INET6 */
#ifdef ALTQ
-#include <altq/altq.h>
+#include <net/altq/altq.h>
#endif
static int pfattach(void);
Modified: head/sys/sys/param.h
==============================================================================
--- head/sys/sys/param.h Thu Apr 16 20:15:47 2015 (r281612)
+++ head/sys/sys/param.h Thu Apr 16 20:22:40 2015 (r281613)
@@ -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,
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
