diff options
| author |   Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-18 20:20:00 +0200 |
|---|---|---|
| committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2019-07-18 20:55:54 +0200 |
| commit | fc2f14f8f7beac518996f9e8e4ef7c4754c0ab7d (patch) | |
| tree | a29a279eeb57ad3435530f88645d52f2bbf32764 /net/bridge | |
| parent | netfilter: nft_meta: skip EAGAIN if nft_meta_bridge is not a module (diff) | |
| download | linux-dev-fc2f14f8f7beac518996f9e8e4ef7c4754c0ab7d.tar.xz linux-dev-fc2f14f8f7beac518996f9e8e4ef7c4754c0ab7d.zip | |
netfilter: bridge: NF_CONNTRACK_BRIDGE does not depend on NF_TABLES_BRIDGE
Place NF_CONNTRACK_BRIDGE away from the NF_TABLES_BRIDGE dependency.
Fixes: 3c171f496ef5 ("netfilter: bridge: add connection tracking system")
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'net/bridge')
| -rw-r--r-- | net/bridge/netfilter/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bridge/netfilter/Kconfig b/net/bridge/netfilter/Kconfig index 154fa558bb90..30d8241b426f 100644 --- a/net/bridge/netfilter/Kconfig +++ b/net/bridge/netfilter/Kconfig @@ -25,6 +25,8 @@ config NF_LOG_BRIDGE tristate "Bridge packet logging" select NF_LOG_COMMON +endif # NF_TABLES_BRIDGE + config NF_CONNTRACK_BRIDGE tristate "IPv4/IPV6 bridge connection tracking support" depends on NF_CONNTRACK @@ -39,8 +41,6 @@ config NF_CONNTRACK_BRIDGE To compile it as a module, choose M here. If unsure, say N. -endif # NF_TABLES_BRIDGE - menuconfig BRIDGE_NF_EBTABLES tristate "Ethernet Bridge tables (ebtables) support" depends on BRIDGE && NETFILTER && NETFILTER_XTABLES |