summaryrefslogtreecommitdiffstats
path: root/sys/netinet
diff options
context:
space:
mode:
authorbz <bz@FreeBSD.org>2012-01-22 02:16:31 +0000
committerbz <bz@FreeBSD.org>2012-01-22 02:16:31 +0000
commit6aadb2bfe6ffccddb769e61e1dd5ba14dd5b53c5 (patch)
tree80a4a9dd47c096caa224d026aa158da8f8622489 /sys/netinet
parenta8d3ef905d6a09a0cfa4378c505c468682b9a267 (diff)
downloadFreeBSD-src-6aadb2bfe6ffccddb769e61e1dd5ba14dd5b53c5.zip
FreeBSD-src-6aadb2bfe6ffccddb769e61e1dd5ba14dd5b53c5.tar.gz
Fix ip_divert handling of inet and inet6 and module building some more.
Properly sort the "carp" case in modules/Makefile after it was renamed. Reported by: bde (most) Reviewed by: bde MFC after: 3 days
Diffstat (limited to 'sys/netinet')
-rw-r--r--sys/netinet/ip_divert.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/netinet/ip_divert.c b/sys/netinet/ip_divert.c
index 5892c9d..6be6d8b 100644
--- a/sys/netinet/ip_divert.c
+++ b/sys/netinet/ip_divert.c
@@ -30,14 +30,12 @@
#include <sys/cdefs.h>
__FBSDID("$FreeBSD$");
-#if !defined(KLD_MODULE)
#include "opt_inet.h"
+#include "opt_inet6.h"
#include "opt_sctp.h"
#ifndef INET
#error "IPDIVERT requires INET."
#endif
-#endif
-#include "opt_inet6.h"
#include <sys/param.h>
#include <sys/kernel.h>
OpenPOWER on IntegriCloud