From: Gabor Juhos <juhosg@openwrt.org>
Date: Wed, 15 Oct 2008 10:56:13 +0000 (+0000)
Subject: netfilter/iptables: disable IMQ on 2.6.27
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7613c343b551642c285b04dd5acf334d860dab13;p=librecmc%2Flibrecmc.git

netfilter/iptables: disable IMQ on 2.6.27

SVN-Revision: 12984
---

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)))