X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/0d08c06c225ba234a579613f05b772b18056f7c4..749229e47b71b89ecd98c776933887a563fc2677:/package/kernel/modules/netfilter.mk

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index e14cdb809..e22707679 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -1,213 +1,402 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # $Id$
 
-NFMENU:=Netfilter Extensions
+NF_MENU:=Netfilter Extensions
+NF_KMOD:=1
+include $(INCLUDE_DIR)/netfilter.mk
+
+define KernelPackage/ipt-core
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Netfilter core
+  KCONFIG:=$(KCONFIG_IPT_CORE)
+  FILES:=$(foreach mod,$(IPT_CORE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CORE-m)))
+endef
+
+define KernelPackage/ipt-core/description
+ Netfilter core kernel modules
+ Includes:
+ - limit
+ - LOG
+ - mac
+ - multiport
+ - TCPMSS
+ - REJECT
+endef
+
+$(eval $(call KernelPackage,ipt-core))
+
 
 define KernelPackage/ipt-conntrack
-  TITLE:=Modules for connection tracking
-  DESCRIPTION:=\
-	Netfilter (IPv4) kernel modules for connection tracking\\\
-	\\\
-	Includes: \\\
-	- ipt_conntrack \\\
-	- ipt_helper \\\
-	- ipt_connmark/CONNMARK
-  FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CONNTRACK-m)))
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Basic connection tracking modules
+  KCONFIG:=$(KCONFIG_IPT_CONNTRACK)
+  FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,41,$(notdir $(IPT_CONNTRACK-m)))
+  DEPENDS:= kmod-ipt-core
+endef
+
+define KernelPackage/ipt-conntrack/description
+ Netfilter (IPv4) kernel modules for connection tracking
+ Includes:
+ - state
 endef
+
 $(eval $(call KernelPackage,ipt-conntrack))
 
+
+define KernelPackage/ipt-conntrack-extra
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Extra connection tracking modules
+  KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA)
+  FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_CONNTRACK_EXTRA-m)))
+  DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack
+endef
+
+define KernelPackage/ipt-conntrack-extra/description
+ Netfilter (IPv4) extra kernel modules for connection tracking
+ Includes:
+ - connbytes
+ - connmark/CONNMARK
+ - conntrack
+ - helper
+ - recent
+ - NOTRACK
+endef
+
+$(eval $(call KernelPackage,ipt-conntrack-extra))
+
+
 define KernelPackage/ipt-filter
+  SUBMENU:=$(NF_MENU)
   TITLE:=Modules for packet content inspection
-  DESCRIPTION:=\
-	Netfilter (IPv4) kernel modules for packet content inspection \\\
-	\\\
-	Includes: \\\
-	- ipt_ipp2p \\\
-	- ipt_layer7
-  FILES:=$(foreach mod,$(IPT_FILTER-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_FILTER-m)))
+  KCONFIG:=$(KCONFIG_IPT_FILTER)
+  FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m)))
+  DEPENDS:= kmod-ipt-core
+endef
+
+define KernelPackage/ipt-filter/description
+ Netfilter (IPv4) kernel modules for packet content inspection
+ Includes:
+ - ipt_ipp2p
+ - ipt_layer7
 endef
+
 $(eval $(call KernelPackage,ipt-filter))
 
+
 define KernelPackage/ipt-ipopt
+  SUBMENU:=$(NF_MENU)
   TITLE:=Modules for matching/changing IP packet options
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for matching/changing IP packet options \\\
-	\\\
-	Includes: \\\
-	- ipt_dscp/DSCP \\\
-	- ipt_ecn/ECN \\\
-	- ipt_length \\\
-	- ipt_mac \\\
-	- ipt_tos/TOS \\\
-	- ipt_tcpmms \\\
-	- ipt_ttl/TTL \\\
-	- ipt_unclean
-  FILES:=$(foreach mod,$(IPT_IPOPT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPOPT-m)))
+  KCONFIG:=$(KCONFIG_IPT_IPOPT)
+  FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPOPT-m)))
+  DEPENDS:= kmod-ipt-core
 endef
+
+define KernelPackage/ipt-ipopt/description
+ Netfilter (IPv4) modules for matching/changing IP packet options
+ Includes:
+ - ipt_CLASSIFY
+ - ipt_dscp/DSCP
+ - ipt_ecn/ECN
+ - ipt_length
+ - ipt_tos/TOS
+ - ipt_tcpmms
+ - ipt_ttl/TTL
+ - ipt_unclean
+endef
+
 $(eval $(call KernelPackage,ipt-ipopt))
 
+
 define KernelPackage/ipt-ipsec
+  SUBMENU:=$(NF_MENU)
   TITLE:=Modules for matching IPSec packets
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for matching IPSec packets \\\
-	\\\
-	Includes: \\\
-	- ipt_ah \\\
-	- ipt_esp
-  FILES:=$(foreach mod,$(IPT_IPSEC-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSEC-m)))
+  KCONFIG:=$(KCONFIG_IPT_IPSEC)
+  FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSEC-m)))
+  DEPENDS:= kmod-ipt-core
+endef
+
+define KernelPackage/ipt-ipsec/description
+ Netfilter (IPv4) modules for matching IPSec packets
+ Includes:
+ - ipt_ah
+ - ipt_esp
 endef
+
 $(eval $(call KernelPackage,ipt-ipsec))
 
+
 define KernelPackage/ipt-nat
-  TITLE:=Modules for extra NAT targets
-  DESCRIPTION:=\
-	Netfilter (IPv4) modules for extra NAT targets \\\
-	\\\
-	Includes: \\\
-	- ipt_REDIRECT \\\
-	- ipt_NETMAP
-  FILES:=$(foreach mod,$(IPT_NAT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT-m)))
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Basic NAT targets
+  KCONFIG:=$(KCONFIG_IPT_NAT)
+  FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_NAT-m)))
+  DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack
 endef
+
+define KernelPackage/ipt-nat/description
+ Netfilter (IPv4) kernel modules for basic NAT targets
+ Includes:
+ - MASQUERADE
+endef
+
 $(eval $(call KernelPackage,ipt-nat))
 
+
+define KernelPackage/ipt-nat-extra
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Extra NAT targets
+  KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA)
+  FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT_EXTRA-m)))
+  DEPENDS:= kmod-ipt-core +kmod-ipt-nat
+endef
+
+define KernelPackage/ipt-nat-extra/description
+ Netfilter (IPv4) kernel modules for extra NAT targets
+ Includes:
+ - MIRROR
+ - NETMAP
+ - REDIRECT
+endef
+
+$(eval $(call KernelPackage,ipt-nat-extra))
+
+
 define KernelPackage/ipt-nathelper
-  TITLE:=Default Conntrack and NAT helpers
-  DEFAULT:=y
-  DESCRIPTION:=\
-	Default Netfilter (IPv4) Conntrack and NAT helpers \\\
-	\\\
-	Includes: \\\
-	- ip_conntrack_ftp \\\
-	- ip_nat_ftp \\\
-	- ip_conntrack_irc \\\
-	- ip_nat_irc \\\
-	- ip_conntrack_tftp
-  FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_DEFAULT-m)))
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Basic Conntrack and NAT helpers
+  KCONFIG:=$(KCONFIG_IPT_NATHELPER)
+  FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER-m)))
+  DEPENDS:= kmod-ipt-core +kmod-ipt-nat
 endef
+
+define KernelPackage/ipt-nathelper/description
+ Default Netfilter (IPv4) Conntrack and NAT helpers
+ Includes:
+ - conntrack_ftp
+ - nat_ftp
+ - conntrack_irc
+ - nat_irc
+ - conntrack_tftp
+ - nat_tftp
+endef
+
 $(eval $(call KernelPackage,ipt-nathelper))
 
+
 define KernelPackage/ipt-nathelper-extra
+  SUBMENU:=$(NF_MENU)
   TITLE:=Extra Conntrack and NAT helpers
-  DESCRIPTION:=\
-	Extra Netfilter (IPv4) Conntrack and NAT helpers \\\
-	\\\
-	Includes: \\\
-	- ip_conntrack_amanda \\\
-	- ip_conntrack_proto_gre \\\
-	- ip_nat_proto_gre \\\
-	- ip_conntrack_pptp \\\
-	- ip_nat_pptp \\\
-	- ip_conntrack_sip \\\
-	- ip_nat_sip \\\
-	- ip_nat_snmp_basic
-  FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_EXTRA-m)))
+  KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA)
+  FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m)))
+  DEPENDS:= kmod-ipt-core +kmod-ipt-nat
+endef
+
+define KernelPackage/ipt-nathelper-extra/description
+ Extra Netfilter (IPv4) Conntrack and NAT helpers
+ Includes:
+ - ip_conntrack_amanda
+ - ip_conntrack_proto_gre
+ - ip_nat_proto_gre
+ - ip_conntrack_pptp
+ - ip_nat_pptp
+ - ip_conntrack_sip
+ - ip_nat_sip
+ - ip_nat_snmp_basic
 endef
+
 $(eval $(call KernelPackage,ipt-nathelper-extra))
 
+
 define KernelPackage/ipt-imq
+  SUBMENU:=$(NF_MENU)
   TITLE:=Intermediate Queueing support
-  DESCRIPTION:=\
-	Kernel support for Intermediate Queueing devices
-  KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ)
-  FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(MODULES_DIR)/kernel/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(MODULES_DIR)/kernel/drivers/net/imq.$(LINUX_KMOD_SUFFIX)))))
+  KCONFIG:= \
+	CONFIG_IMQ \
+	CONFIG_IMQ_BEHAVIOR_BA=y \
+	CONFIG_IMQ_NUM_DEVS=2 \
+	CONFIG_IP_NF_TARGET_IMQ
+  FILES:= \
+	$(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) \
+	$(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir \
+	imq \
+	$(IPT_IMQ-m) \
+  ))
+  DEPENDS:= kmod-ipt-core @!LINUX_2_6_27 @!LINUX_2_6_28
 endef
+
+define KernelPackage/ipt-imq/description
+ Kernel support for Intermediate Queueing devices
+endef
+
 $(eval $(call KernelPackage,ipt-imq))
 
 
 define KernelPackage/ipt-queue
+  SUBMENU:=$(NF_MENU)
   TITLE:=Module for user-space packet queueing
-  DESCRIPTION:=\
-	Netfilter (IPv4) module for user-space packet queueing \\\
-	\\\
-	Includes: \\\
-	- ipt_QUEUE
-  FILES:=$(foreach mod,$(IPT_QUEUE-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_QUEUE-m)))
+  KCONFIG:=$(KCONFIG_IPT_QUEUE)
+  FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m)))
+  DEPENDS:= kmod-ipt-core
 endef
+
+define KernelPackage/ipt-queue/description
+ Netfilter (IPv4) module for user-space packet queueing
+ Includes:
+ - QUEUE
+endef
+
 $(eval $(call KernelPackage,ipt-queue))
 
+
 define KernelPackage/ipt-ulog
+  SUBMENU:=$(NF_MENU)
   TITLE:=Module for user-space packet logging
-  DESCRIPTION:=\
-	Netfilter (IPv4) module for user-space packet logging \\\
-	\\\
-	Includes: \\\
-	- ipt_ULOG
-  FILES:=$(foreach mod,$(IPT_ULOG-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_ULOG-m)))
+  KCONFIG:=$(KCONFIG_IPT_ULOG)
+  FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_ULOG-m)))
+  DEPENDS:= kmod-ipt-core
+endef
+
+define KernelPackage/ipt-ulog/description
+ Netfilter (IPv4) module for user-space packet logging
+ Includes:
+ - ipt_ULOG
 endef
+
 $(eval $(call KernelPackage,ipt-ulog))
 
+
+define KernelPackage/ipt-iprange
+  SUBMENU:=$(NF_MENU)
+  TITLE:=Module for matching ip ranges
+  FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPRANGE-m)))
+  DEPENDS:= kmod-ipt-core
+endef
+
+define KernelPackage/ipt-iprange/description
+ Netfilter (IPv4) module for matching ip ranges
+ Includes:
+ - ipt_IPRANGE
+endef
+
+$(eval $(call KernelPackage,ipt-iprange))
+
+
+define KernelPackage/ipt-ipset
+  SUBMENU:=$(NF_MENU)
+  TITLE:=IPSET Modules
+  KCONFIG:=$(KCONFIG_IPT_IPSET)
+  FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSET-m)))
+  DEPENDS:= kmod-ipt-core
+endef
+
+define KernelPackage/ipt-ipset/description
+ Netfilter kernel modules for ipset
+ Includes:
+ - ip_set
+ - ip_set_iphash
+ - ip_set_ipmap
+ - ip_set_ipporthash
+ - ip_set_iptree
+ - ip_set_iptreemap
+ - ip_set_macipmap
+ - ip_set_nethash
+ - ip_set_portmap
+ - ipt_set
+ - ipt_SET
+endef
+
+$(eval $(call KernelPackage,ipt-ipset))
+
+
 define KernelPackage/ipt-extra
+  SUBMENU:=$(NF_MENU)
   TITLE:=Extra modules
-  DESCRIPTION:=\
-	Other Netfilter (IPv4) kernel modules\\\
-	Includes: \\\
-	- ipt_limit \\\
-	- ipt_owner \\\
-	- ipt_physdev \\\
-	- ipt_pkttype \\\
-	- ipt_recent
-  FILES:=$(foreach mod,$(IPT_EXTRA-m),$(MODULES_DIR)/kernel/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_EXTRA-m)))
+  KCONFIG:=$(KCONFIG_IPT_EXTRA)
+  FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_EXTRA-m)))
+  DEPENDS:= kmod-ipt-core
+endef
+
+define KernelPackage/ipt-extra/description
+ Other Netfilter (IPv4) kernel modules
+ Includes:
+ - ipt_owner
+ - ipt_physdev
+ - ipt_pkttype
+ - ipt_recent
+ - iptable_raw
+ - xt_NOTRACK
+ - xt_TARPIT
+ - xt_DELUDE
+ - xt_CHAOS
 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
-  DESCRIPTION:=\
-	Netfilter IPv6 firewalling support
-  KCONFIG:=$(CONFIG_IP6_NF_IPTABLES)
-  FILES:=$(MODULES_DIR)/kernel/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX)
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6table_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(MODULES_DIR)/kernel/net/ipv6/netfilter/ip6t_*.$(LINUX_KMOD_SUFFIX)))))
+  DEPENDS:=+kmod-ipv6 @!LINUX_2_6_27 @!LINUX_2_6_28
+  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)))
 endef
+
+define KernelPackage/ip6tables/description
+ Netfilter IPv6 firewalling support
+endef
+
 $(eval $(call KernelPackage,ip6tables))
 
 
 define KernelPackage/arptables
+  SUBMENU:=$(NF_MENU)
   TITLE:=ARP firewalling modules
-  DESCRIPTION:=\
-	Kernel modules for ARP firewalling
-  FILES:=$(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_IP_NF_ARPTABLES)
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(MODULES_DIR)/kernel/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)))))
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_IP_NF_ARPTABLES
+  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)))))
+endef
+
+define KernelPackage/arptables/description
+ Kernel modules for ARP firewalling
 endef
-$(eval $(call KernelPackage,arptables))
 
+$(eval $(call KernelPackage,arptables))
 
 define KernelPackage/ebtables
+  SUBMENU:=$(NF_MENU)
   TITLE:=Bridge firewalling modules
-  DESCRIPTION:=\
-	Kernel modules for Ethernet Bridge firewalling
-  FILES:=$(MODULES_DIR)/kernel/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES)
-  SUBMENU:=$(NFMENU)
-  AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(MODULES_DIR)/kernel/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(MODULES_DIR)/kernel/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX)))))
+  DEPENDS:=@LINUX_2_6
+  FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX)
+  KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \
+  	CONFIG_BRIDGE_NF_EBTABLES
+  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX)))))
 endef
+
+define KernelPackage/ebtables/description
+ Kernel modules for Ethernet Bridge firewalling
+endef
+
 $(eval $(call KernelPackage,ebtables))