diff options
| author | Florian Westphal <fw@strlen.de> | 2014-09-30 10:59:18 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-30 14:07:51 -0400 |
| commit | 57f5877c11b244ff2315f4ba0e57b54fe013581f (patch) | |
| tree | 7e122ae01871dcd51555f16ba9e8067f42bceec1 /net/Kconfig | |
| parent | 213d61386ee8a0a704d99922dbdb99f9c233d630 (diff) | |
| download | linux-stable-57f5877c11b244ff2315f4ba0e57b54fe013581f.tar.gz linux-stable-57f5877c11b244ff2315f4ba0e57b54fe013581f.tar.bz2 linux-stable-57f5877c11b244ff2315f4ba0e57b54fe013581f.zip | |
netfilter: bridge: build br_nf_core only if required
Eric reports build failure with
CONFIG_BRIDGE_NETFILTER=n
We insist to build br_nf_core.o unconditionally, but we must only do so
if br_netfilter was enabled, else it fails to build due to
functions being defined to empty stubs (and some structure members
being defined out).
Also, BRIDGE_NETFILTER=y|m makes no sense when BRIDGE=n.
Fixes: 34666d467 (netfilter: bridge: move br_netfilter out of the core)
Reported-by: Eric Dumazet <eric.dumazet@gmail.com>
Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/Kconfig')
| -rw-r--r-- | net/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/Kconfig b/net/Kconfig index dc5d700d05e7..d6b138e2c263 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -177,7 +177,7 @@ config NETFILTER_ADVANCED config BRIDGE_NETFILTER tristate "Bridged IP/ARP packets filtering" - depends on (BRIDGE || BRIDGE=n) + depends on BRIDGE depends on NETFILTER && INET depends on NETFILTER_ADVANCED default m |