summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2006-02-20 12:30:32 +0000
committerume <ume@FreeBSD.org>2006-02-20 12:30:32 +0000
commitb365fc827b024cd497521479b9eedcafa8d66ae1 (patch)
tree75d5e666d203afbefe157dcdc84cb15097f80c05 /sys
parentba189db15daba153b3f67ae632ccb2d18ae628d5 (diff)
downloadFreeBSD-src-b365fc827b024cd497521479b9eedcafa8d66ae1.zip
FreeBSD-src-b365fc827b024cd497521479b9eedcafa8d66ae1.tar.gz
Obey opt_inet6.h in kernel build directory.
Reported by: Peter Losher <plosher-keyword-freebsd.a36e57__at__plosh.net> MFC after: 3 days
Diffstat (limited to 'sys')
-rw-r--r--sys/modules/dummynet/Makefile8
-rw-r--r--sys/netinet/ip_dummynet.c2
2 files changed, 8 insertions, 2 deletions
diff --git a/sys/modules/dummynet/Makefile b/sys/modules/dummynet/Makefile
index 84ccffe..ecd6cbe 100644
--- a/sys/modules/dummynet/Makefile
+++ b/sys/modules/dummynet/Makefile
@@ -3,5 +3,13 @@
.PATH: ${.CURDIR}/../../netinet
KMOD= dummynet
SRCS= ip_dummynet.c
+SRCS+= opt_inet6.h
+
+.if !defined(KERNBUILDDIR)
+.if !defined(NO_INET6)
+opt_inet6.h:
+ echo "#define INET6 1" > ${.TARGET}
+.endif
+.endif
.include <bsd.kmod.mk>
diff --git a/sys/netinet/ip_dummynet.c b/sys/netinet/ip_dummynet.c
index 4c02915..63a3e68 100644
--- a/sys/netinet/ip_dummynet.c
+++ b/sys/netinet/ip_dummynet.c
@@ -29,9 +29,7 @@
#define DUMMYNET_DEBUG
-#if !defined(KLD_MODULE)
#include "opt_inet6.h"
-#endif
/*
* This module implements IP dummynet, a bandwidth limiter/delay emulator
OpenPOWER on IntegriCloud