diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-06-02 19:46:47 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-06-02 19:46:47 +0000 |
| commit | f9518d9a74d4a418e32a48365dde1fc6b1b14387 (patch) | |
| tree | 7167cad316811176425e775b46ab69c305a52cca | |
| parent | 10c3ea71bb79d1b90ab18b36344116647f76755c (diff) | |
| download | upstream-f9518d9a74d4a418e32a48365dde1fc6b1b14387.tar.gz upstream-f9518d9a74d4a418e32a48365dde1fc6b1b14387.tar.bz2 upstream-f9518d9a74d4a418e32a48365dde1fc6b1b14387.zip | |
netfilter/iptables: enable IMQ on 2.6.25
SVN-Revision: 11335
| -rw-r--r-- | package/iptables/Makefile | 2 | ||||
| -rw-r--r-- | package/kernel/modules/netfilter.mk | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 6cbc9f53c5..05ef15b1dd 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -89,7 +89,7 @@ define Package/iptables-mod-filter/description endef define Package/iptables-mod-imq -$(call Package/iptables/Module, +kmod-ipt-imq @!LINUX_2_6_25) +$(call Package/iptables/Module, +kmod-ipt-imq) TITLE:=IMQ support endef diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index ec9f68c866..802edac7d7 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -157,7 +157,6 @@ define KernelPackage/ipt-imq SUBMENU:=$(NF_MENU) TITLE:=Intermediate Queueing support KCONFIG:=CONFIG_IP_NF_TARGET_IMQ - DEPENDS:=@!LINUX_2_6_25 FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX))))) endef @@ -272,11 +271,10 @@ endef $(eval $(call KernelPackage,ipt-extra)) -# XXX: disabled on 2.6.25 due to broken IMQ define KernelPackage/ip6tables SUBMENU:=$(NF_MENU) TITLE:=IPv6 modules - DEPENDS:=+kmod-ipv6 @!LINUX_2_6_25 + DEPENDS:=+kmod-ipv6 KCONFIG:=CONFIG_IP6_NF_IPTABLES FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPV6-m))) |