netfilter: nf_tables: merge exthdr expression into nft core

[sfrench/cifs-2.6.git] / net / netfilter / Kconfig

diff --git a/net/netfilter/Kconfig b/net/netfilter/Kconfig
index 704b3832dbad33688d8298518ec34c19cb57d847..f66586fb41cdaca2928a60f20a6481b3c75674aa 100644 (file)
--- a/net/netfilter/Kconfig
+++ b/net/netfilter/Kconfig
@@ -474,24 +474,6 @@ config NF_TABLES_NETDEV
        help
          This option enables support for the "netdev" table.
 
-config NFT_EXTHDR
-       tristate "Netfilter nf_tables exthdr module"
-       help
-         This option adds the "exthdr" expression that you can use to match
-         IPv6 extension headers and tcp options.
-
-config NFT_META
-       tristate "Netfilter nf_tables meta module"
-       help
-         This option adds the "meta" expression that you can use to match and
-         to set packet metainformation such as the packet mark.
-
-config NFT_RT
-       tristate "Netfilter nf_tables routing module"
-       help
-         This option adds the "rt" expression that you can use to match
-         packet routing information such as the packet nexthop.
-
 config NFT_NUMGEN
        tristate "Netfilter nf_tables number generator module"
        help
@@ -666,8 +648,7 @@ endif # NF_TABLES
 
 config NF_FLOW_TABLE_INET
        tristate "Netfilter flow table mixed IPv4/IPv6 module"
-       depends on NF_FLOW_TABLE_IPV4
-       depends on NF_FLOW_TABLE_IPV6
+       depends on NF_FLOW_TABLE
        help
           This option adds the flow table mixed IPv4/IPv6 support.