summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-15 10:56:13 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2008-10-15 10:56:13 +0000
commit313afd99d6ecce9ef7ed0994b54ac626fbcd374b (patch)
treef8b7024b647e4b47da5579dcd9d202d1cb8739c4
parent9569535774eb281ddc9e3751789ae5d044f79387 (diff)
[package] netfilter/iptables: disable IMQ on 2.6.27
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12984 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/iptables/Makefile2
-rw-r--r--package/kernel/modules/netfilter.mk5
2 files changed, 4 insertions, 3 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index ff2f314d1..c62d9741a 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -107,7 +107,7 @@ define Package/iptables-mod-filter/description
endef
define Package/iptables-mod-imq
-$(call Package/iptables/Module, +kmod-ipt-imq)
+$(call Package/iptables/Module, +kmod-ipt-imq @!LINUX_2_6_27)
TITLE:=IMQ support
endef
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 44f22e01f..4177dc3eb 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -237,7 +237,7 @@ define KernelPackage/ipt-imq
imq \
$(IPT_IMQ-m) \
))
- DEPENDS:= kmod-ipt-core
+ DEPENDS:= kmod-ipt-core @!LINUX_2_6_27
endef
define KernelPackage/ipt-imq/description
@@ -354,10 +354,11 @@ endef
$(eval $(call KernelPackage,ipt-extra))
+# XXX: disabled on 2.6.27 due to broken IMQ
define KernelPackage/ip6tables
SUBMENU:=$(NF_MENU)
TITLE:=IPv6 modules
- DEPENDS:=+kmod-ipv6
+ DEPENDS:=+kmod-ipv6 @!LINUX_2_6_27
KCONFIG:=CONFIG_IP6_NF_IPTABLES
FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPT_IPV6-m)))