diff options
author | David S. Miller <davem@davemloft.net> | 2015-05-31 00:02:30 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-05-31 00:02:30 -0700 |
commit | 583d3f5af2a6dfa7866715d9e062dbfb3b66a6f0 (patch) | |
tree | 77e7c8514031b67d74bb5ce415074dd098b108ac /net/netfilter/Kconfig | |
parent | 5289e4a03fb9ba79f0ad065c26024afe379c3d35 (diff) | |
parent | ed6c4136f1571bd6ab362afc3410905a8a69ca42 (diff) | |
download | op-kernel-dev-583d3f5af2a6dfa7866715d9e062dbfb3b66a6f0.zip op-kernel-dev-583d3f5af2a6dfa7866715d9e062dbfb3b66a6f0.tar.gz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
Pablo Neira Ayuso says:
====================
Netfilter updates for net-next
The following patchset contains Netfilter updates for net-next, they are:
1) default CONFIG_NETFILTER_INGRESS to y for easier compile-testing of all
options.
2) Allow to bind a table to net_device. This introduces the internal
NFT_AF_NEEDS_DEV flag to perform a mandatory check for this binding.
This is required by the next patch.
3) Add the 'netdev' table family, this new table allows you to create ingress
filter basechains. This provides access to the existing nf_tables features
from ingress.
4) Kill unused argument from compat_find_calc_{match,target} in ip_tables
and ip6_tables, from Florian Westphal.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/Kconfig')
-rw-r--r-- | net/netfilter/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig index 1c78d7f..fbc8d15 100644 --- a/net/netfilter/Kconfig +++ b/net/netfilter/Kconfig @@ -3,6 +3,7 @@ menu "Core Netfilter Configuration" config NETFILTER_INGRESS bool "Netfilter ingress support" + default y select NET_INGRESS help This allows you to classify packets from ingress using the Netfilter @@ -455,6 +456,11 @@ config NF_TABLES_INET help This option enables support for a mixed IPv4/IPv6 "inet" table. +config NF_TABLES_NETDEV + tristate "Netfilter nf_tables netdev tables support" + help + This option enables support for the "netdev" table. + config NFT_EXTHDR tristate "Netfilter nf_tables IPv6 exthdr module" help |