From 7f106caaa36ea449a1641345d777f96d156bb03e Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Tue, 17 Sep 2013 10:32:58 +0200 Subject: Kconfig: ipset needs NETFILTER_NETLINK NETFILTER_NETLINK is not selectable in recent kernels, check and warn if not enabled indirectly. --- kernel/include/linux/netfilter/ipset/ip_set_compat.h | 5 +++++ kernel/net/netfilter/ipset/Kconfig | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'kernel') diff --git a/kernel/include/linux/netfilter/ipset/ip_set_compat.h b/kernel/include/linux/netfilter/ipset/ip_set_compat.h index 7c10816..cdc8f53 100644 --- a/kernel/include/linux/netfilter/ipset/ip_set_compat.h +++ b/kernel/include/linux/netfilter/ipset/ip_set_compat.h @@ -26,6 +26,11 @@ #endif #endif +#if defined(CONFIG_NETFILTER_NETLINK) || defined(CONFIG_NETFILTER_NETLINK_MODULE) +#else +#error "NETFILTER_NETLINK must be enabled: select NFACCT/NFQUEUE/LOG over NFNETLINK" +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35) #define xt_action_param xt_match_param #endif diff --git a/kernel/net/netfilter/ipset/Kconfig b/kernel/net/netfilter/ipset/Kconfig index ba36c28..fd2c14b 100644 --- a/kernel/net/netfilter/ipset/Kconfig +++ b/kernel/net/netfilter/ipset/Kconfig @@ -1,7 +1,7 @@ menuconfig IP_SET tristate "IP set support" depends on INET && NETFILTER - depends on NETFILTER_NETLINK + select NETFILTER_NETLINK help This option adds IP set support to the kernel. In order to define and use the sets, you need the userspace utility -- cgit v1.2.3