diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/kernel/modules/netfilter.mk | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/kernel/modules/netfilter.mk')
| -rw-r--r-- | package/kernel/modules/netfilter.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index b739a9c28..4e4c85f45 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -377,6 +377,7 @@ endef define KernelPackage/ipt-extra/description Other Netfilter (IPv4) kernel modules Includes: + - addrtype - owner - physdev (if bridge support was enabled in kernel) - pkttype @@ -401,7 +402,7 @@ endef $(eval $(call KernelPackage,ip6tables)) - +ARP_MODULES = arp_tables arpt_mangle arptable_filter define KernelPackage/arptables SUBMENU:=$(NF_MENU) TITLE:=ARP firewalling modules @@ -409,7 +410,7 @@ define KernelPackage/arptables KCONFIG:=CONFIG_IP_NF_ARPTABLES \ CONFIG_IP_NF_ARPFILTER \ CONFIG_IP_NF_ARP_MANGLE - AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.ko)))) + AUTOLOAD:=$(call AutoLoad,49,$(ARP_MODULES)) endef define KernelPackage/arptables/description @@ -552,7 +553,7 @@ define KernelPackage/nf-conntrack-netlink endef define KernelPackage/nf-conntrack-netlink/description - Kernel modules support for a netlink-based connection tracking + Kernel modules support for a netlink-based connection tracking userspace interface endef |