aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-10-15 10:56:13 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-10-15 10:56:13 +0000
commit7613c343b551642c285b04dd5acf334d860dab13 (patch)
treec155a88c4a76a37f9bd00648c139518511a37ef0
parentb08f5517114c4b94cef682989fee8c0e6b2cbcf3 (diff)
downloadupstream-7613c343b551642c285b04dd5acf334d860dab13.tar.gz
upstream-7613c343b551642c285b04dd5acf334d860dab13.tar.bz2
upstream-7613c343b551642c285b04dd5acf334d860dab13.zip
netfilter/iptables: disable IMQ on 2.6.27
SVN-Revision: 12984
-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 ff2f314d15..c62d9741a1 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 44f22e01f4..4177dc3eb4 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)))