diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2012-02-02 08:23:44 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2012-02-02 08:23:44 +0000 |
| commit | c336de3d85efb1a1150825870b7cbff4f7a65366 (patch) | |
| tree | 1df886e923ad54d1454ad6004dd854c7d9a04b67 /include | |
| parent | 3310df6b521c25898d7db6dcdf49b13eebd982a3 (diff) | |
| download | upstream-c336de3d85efb1a1150825870b7cbff4f7a65366.tar.gz upstream-c336de3d85efb1a1150825870b7cbff4f7a65366.tar.bz2 upstream-c336de3d85efb1a1150825870b7cbff4f7a65366.zip | |
kernel: update module names and add new config symbols for linux 3.3
SVN-Revision: 29985
Diffstat (limited to 'include')
| -rw-r--r-- | include/netfilter.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/netfilter.mk b/include/netfilter.mk index 29dbbc4e57..1cbb9a8b86 100644 --- a/include/netfilter.mk +++ b/include/netfilter.mk @@ -116,7 +116,6 @@ $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_TARGET_DSCP, $(P_V4)ipt_DSCP)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_DSCP)) $(eval $(call nf_add,IPT_HASHLIMIT,CONFIG_NETFILTER_XT_MATCH_HASHLIMIT, $(P_XT)xt_hashlimit)) -$(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_ECN, $(P_V4)ipt_ecn)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_LENGTH, $(P_V4)ipt_length)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_LENGTH, $(P_XT)xt_length)) $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_MARK, $(P_V4)ipt_mark)) @@ -144,6 +143,12 @@ else $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_MARK, $(P_XT)xt_MARK)) endif +ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3)),1) + $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_ECN, $(P_XT)xt_ecn)) +else + $(eval $(call nf_add,IPT_IPOPT,CONFIG_IP_NF_MATCH_ECN, $(P_V4)ipt_ecn)) +endif + # userland only $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_tos))) $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_TARGET_DSCP, $(P_XT)xt_TOS))) |