netfilter: bridge: build br_nf_core only if required
authorFlorian Westphal <fw@strlen.de>
Tue, 30 Sep 2014 08:59:18 +0000 (10:59 +0200)
committerDavid S. Miller <davem@davemloft.net>
Tue, 30 Sep 2014 18:07:51 +0000 (14:07 -0400)
commit57f5877c11b244ff2315f4ba0e57b54fe013581f
tree7e122ae01871dcd51555f16ba9e8067f42bceec1
parent213d61386ee8a0a704d99922dbdb99f9c233d630
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>
net/Kconfig
net/bridge/Makefile