diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-07-11 06:47:33 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-07-11 06:47:33 +0000 |
| commit | a817b45169fafb4ec191ba786db0d9e34b130684 (patch) | |
| tree | 57bfb59d2dc8c293422f807c571dde0814555256 /include | |
| parent | febfbf2acd2afacb9dc899d320b1505399869cd0 (diff) | |
| download | upstream-a817b45169fafb4ec191ba786db0d9e34b130684.tar.gz upstream-a817b45169fafb4ec191ba786db0d9e34b130684.tar.bz2 upstream-a817b45169fafb4ec191ba786db0d9e34b130684.zip | |
reorganize netfilter modules, get rid of the iptables-mod-extra dependency in qos-scripts
SVN-Revision: 7912
Diffstat (limited to 'include')
| -rw-r--r-- | include/netfilter.mk | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk index 2ff30c2442..51f72fb9d3 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -22,35 +22,34 @@ IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_TARGET_CONNMARK) += $(P_XT)xt_CONNMARK IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_CONNTRACK) += $(P_XT)xt_conntrack IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += $(P_XT)xt_helper IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_STATE) += $(P_XT)xt_state - +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNBYTES) += $(P_V4)ipt_connbytes +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_CONNBYTES) += $(P_XT)xt_connbytes +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_LIMIT) += $(P_V4)ipt_limit +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += $(P_XT)xt_limit +IPT_CONNTRACK-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += $(P_XT)xt_NOTRACK +IPT_CONNTRACK-$(CONFIG_IP_NF_MATCH_RECENT) += $(P_V4)ipt_recent IPT_EXTRA-m := IPT_EXTRA-$(CONFIG_IP_NF_MATCH_CONDITION) += $(P_V4)ipt_condition -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_CONNBYTES) += $(P_V4)ipt_connbytes -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_CONNBYTES) += $(P_XT)xt_connbytes -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_LIMIT) += $(P_V4)ipt_limit -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_LIMIT) += $(P_XT)xt_limit IPT_EXTRA-$(CONFIG_IP_NF_TARGET_LOG) += $(P_V4)ipt_LOG -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_MULTIPORT) += $(P_V4)ipt_multiport -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_MULTIPORT) += $(P_XT)xt_multiport IPT_EXTRA-$(CONFIG_IP_NF_MATCH_OWNER) += $(P_V4)ipt_owner IPT_EXTRA-$(CONFIG_IP_NF_MATCH_PHYSDEV) += $(P_V4)ipt_physdev IPT_EXTRA-$(CONFIG_IP_NF_MATCH_PKTTYPE) += $(P_V4)ipt_pkttype IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_PKTTYPE) += $(P_XT)xt_pkttype IPT_EXTRA-$(CONFIG_IP_NF_MATCH_QUOTA) += $(P_V4)ipt_quota -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_RECENT) += $(P_V4)ipt_recent IPT_EXTRA-$(CONFIG_IP_NF_TARGET_REJECT) += $(P_V4)ipt_REJECT -IPT_EXTRA-$(CONFIG_IP_NF_MATCH_STRING) += $(P_V4)ipt_string -IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_STRING) += $(P_XT)xt_string IPT_EXTRA-$(CONFIG_NETFILTER_XT_TARGET_CHAOS) += $(P_XT)xt_CHAOS IPT_EXTRA-$(CONFIG_NETFILTER_XT_TARGET_DELUDE) += $(P_XT)xt_DELUDE IPT_EXTRA-$(CONFIG_NETFILTER_XT_MATCH_PORTSCAN) += $(P_XT)xt_portscan -IPT_EXTRA-$(CONFIG_IP_NF_RAW) += $(P_V4)iptable_raw -IPT_EXTRA-$(CONFIG_NETFILTER_XT_TARGET_NOTRACK) += $(P_XT)xt_NOTRACK +ifeq ($(NF_KMOD),1) + IPT_EXTRA-$(CONFIG_IP_NF_RAW) += $(P_V4)iptable_raw +endif IPT_FILTER-m := IPT_FILTER-$(CONFIG_IP_NF_MATCH_IPP2P) += $(P_V4)ipt_ipp2p IPT_FILTER-$(CONFIG_IP_NF_MATCH_LAYER7) += $(P_V4)ipt_layer7 +IPT_FILTER-$(CONFIG_IP_NF_MATCH_STRING) += $(P_V4)ipt_string +IPT_FILTER-$(CONFIG_NETFILTER_XT_MATCH_STRING) += $(P_XT)xt_string IPT_IMQ-m := IPT_IMQ-$(CONFIG_IP_NF_TARGET_IMQ) += $(P_V4)ipt_IMQ @@ -82,6 +81,8 @@ IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TOS) += $(P_V4)ipt_TOS IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TTL) += $(P_V4)ipt_ttl IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TTL) += $(P_V4)ipt_TTL IPT_IPOPT-$(CONFIG_IP_NF_MATCH_UNCLEAN) += $(P_V4)ipt_unclean +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_MULTIPORT) += $(P_V4)ipt_multiport +IPT_IPOPT-$(CONFIG_NETFILTER_XT_MATCH_MULTIPORT) += $(P_XT)xt_multiport IPT_IPSEC-m := IPT_IPSEC-$(CONFIG_IP_NF_MATCH_AH_ESP) += $(P_V4)ipt_ah $(P_V4)ipt_esp |