diff options
| author | bz <bz@FreeBSD.org> | 2011-11-04 16:24:19 +0000 |
|---|---|---|
| committer | bz <bz@FreeBSD.org> | 2011-11-04 16:24:19 +0000 |
| commit | cb425bfbfa0875c21d77ec5421ecaa7e3cae16ef (patch) | |
| tree | 0a69fdd69ee309b8093328fce009653caf904d36 /sys/modules | |
| parent | e95f384b6d6551373008e3cafbe53187532bf355 (diff) | |
| download | FreeBSD-src-cb425bfbfa0875c21d77ec5421ecaa7e3cae16ef.zip FreeBSD-src-cb425bfbfa0875c21d77ec5421ecaa7e3cae16ef.tar.gz | |
Always use the opt_*.h options for ipfw.ko, not just when
compiled into the kernel.
Do not try to build the module in case of no INET support but
keep #error calls for now in case we would compile it into the
kernel.
This should fix an issue where the module would fail to enable
IPv6 support from the rc framework, but also other INET and INET6
parts being silently compiled out without giving a warning in the
module case.
While here garbage collect unneeded opt_*.h includes.
opt_ipdn.h is not used anywhere but we need to leave the DUMMYNET
entry in options for conditional inclusion in kernel so keep the
file with the same name.
Reported by: pluknet
Reviewed by: plunket, jhb
MFC After: 3 days
Diffstat (limited to 'sys/modules')
| -rw-r--r-- | sys/modules/Makefile | 6 | ||||
| -rw-r--r-- | sys/modules/ipfw/Makefile | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 2c002a1..17d5be0 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -137,7 +137,7 @@ SUBDIR= ${_3dfx} \ ${_io} \ ipdivert \ ${_ipfilter} \ - ipfw \ + ${_ipfw} \ ipfw_nat \ ${_ipmi} \ ip_mroute_mod \ @@ -379,6 +379,10 @@ _if_carp= if_carp _ipfilter= ipfilter .endif +.if ${MK_INET_SUPPORT} != "no" || defined(ALL_MODULES) +_ipfw= ipfw +.endif + .if ${MK_NETGRAPH} != "no" || defined(ALL_MODULES) _netgraph= netgraph .endif diff --git a/sys/modules/ipfw/Makefile b/sys/modules/ipfw/Makefile index 60ab848..575a6ce 100644 --- a/sys/modules/ipfw/Makefile +++ b/sys/modules/ipfw/Makefile @@ -8,7 +8,7 @@ KMOD= ipfw SRCS= ip_fw2.c ip_fw_pfil.c SRCS+= ip_fw_dynamic.c ip_fw_log.c SRCS+= ip_fw_sockopt.c ip_fw_table.c -SRCS+= opt_inet.h opt_inet6.h opt_ipfw.h opt_ipsec.h +SRCS+= opt_inet.h opt_inet6.h opt_ipdivert.h opt_ipfw.h opt_ipsec.h CFLAGS+= -DIPFIREWALL CFLAGS+= -I${.CURDIR}/../../contrib/pf |
