diff options
author | mlaier <mlaier@FreeBSD.org> | 2004-06-13 17:29:10 +0000 |
---|---|---|
committer | mlaier <mlaier@FreeBSD.org> | 2004-06-13 17:29:10 +0000 |
commit | 977d97b004a1ae5bbd9d42eae28386f8e2372068 (patch) | |
tree | 75b8601b85775d6a872ff81b3098fedeb53233af /sys/conf | |
parent | 469e445f95c246a203c12198eff9932b25b49b12 (diff) | |
download | FreeBSD-src-977d97b004a1ae5bbd9d42eae28386f8e2372068.zip FreeBSD-src-977d97b004a1ae5bbd9d42eae28386f8e2372068.tar.gz |
Link ALTQ to the build and break with ABI for struct ifnet. Please recompile
your (network) modules as well as any userland that might make sense of
sizeof(struct ifnet).
This does not change the queueing yet. These changes will follow in a
seperate commit. Same with the driver changes, which need case by case
evaluation.
__FreeBSD_version bump will follow.
Tested-by: (i386)LINT
Diffstat (limited to 'sys/conf')
-rw-r--r-- | sys/conf/NOTES | 14 | ||||
-rw-r--r-- | sys/conf/files | 8 | ||||
-rw-r--r-- | sys/conf/kern.pre.mk | 3 | ||||
-rw-r--r-- | sys/conf/kmod.mk | 4 | ||||
-rw-r--r-- | sys/conf/options | 9 |
5 files changed, 38 insertions, 0 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES index ba02f00..ecb447d 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -399,6 +399,20 @@ options NETSMBCRYPTO #encrypted password support for SMB # mchain library. It can be either loaded as KLD or compiled into kernel options LIBMCHAIN +# altq(9). Enable the base part of the hooks with the ALTQ option. +# Individual disciplines must be built into the base system and can not be +# loaded as modules at this point. In order to build a SMP kernel you must +# also have the ALTQ_NOPCC option. +options ALTQ +options ALTQ_CBQ # Class Bases Queueing +options ALTQ_RED # Random Early Drop +options ALTQ_RIO # RED In/Out +options ALTQ_HFSC # Hierarchical Packet Scheduler +options ALTQ_CDNR # Traffic conditioner +options ALTQ_PRIQ # Prioirity Queueing +options ALTQ_NOPCC # Required for SMP build +options ALTQ_DEBUG + # netgraph(4). Enable the base netgraph code with the NETGRAPH option. # Individual node types can be enabled with the corresponding option # listed below; however, this is not strictly necessary as netgraph diff --git a/sys/conf/files b/sys/conf/files index 72afd93..4bf1291 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -85,6 +85,14 @@ coda/coda_venus.c optional vcoda coda/coda_vfsops.c optional vcoda coda/coda_vnops.c optional vcoda compat/linprocfs/linprocfs.c optional linprocfs +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/dbcmds.c optional acpi acpi_debug contrib/dev/acpica/dbdisply.c optional acpi acpi_debug contrib/dev/acpica/dbexec.c optional acpi acpi_debug diff --git a/sys/conf/kern.pre.mk b/sys/conf/kern.pre.mk index 83afd1e..0dc3b01 100644 --- a/sys/conf/kern.pre.mk +++ b/sys/conf/kern.pre.mk @@ -51,6 +51,9 @@ INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S # include path into 100+ source files. INCLUDES+= -I$S/contrib/dev/acpica +# ... and the same for altq +INCLUDES+= -I$S/contrib/altq + # ... and the same for ipfilter INCLUDES+= -I$S/contrib/ipfilter diff --git a/sys/conf/kmod.mk b/sys/conf/kmod.mk index de4461b..90c839e 100644 --- a/sys/conf/kmod.mk +++ b/sys/conf/kmod.mk @@ -96,6 +96,10 @@ CFLAGS+= -include ${KERNBUILDDIR}/opt_global.h # set because there are no standard paths for non-headers. CFLAGS+= -I. -I@ +# Add -I path for altq headers as they are included via net/if_var.h +# for example. +CFLAGS+= -I@/contrib/altq + # Add a -I path to standard headers like <stddef.h>. Use a relative # path to src/include if possible. If the @ symlink hasn't been built # yet, then we can't tell if the relative path exists. Add both the diff --git a/sys/conf/options b/sys/conf/options index 03fc6c6..62913a1 100644 --- a/sys/conf/options +++ b/sys/conf/options @@ -294,6 +294,15 @@ DEV_ATARAID opt_ata.h # Net stuff. ACCEPT_FILTER_DATA ACCEPT_FILTER_HTTP +ALTQ opt_global.h +ALTQ_CBQ opt_altq.h +ALTQ_RED opt_altq.h +ALTQ_RIO opt_altq.h +ALTQ_HFSC opt_altq.h +ALTQ_CDNR opt_altq.h +ALTQ_PRIQ opt_altq.h +ALTQ_NOPCC opt_altq.h +ALTQ_DEBUG opt_altq.h BOOTP opt_bootp.h BOOTP_COMPAT opt_bootp.h BOOTP_NFSROOT opt_bootp.h |