A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-30 11:41:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

netfilter: bridge: build br_nf_core only if required

Browse source 
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 <[email protected]>
Signed-off-by: Florian Westphal <[email protected]>
Signed-off-by: Pablo Neira Ayuso <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
This commit is contained in:
Florian Westphal 2014-09-30 10:59:18 +02:00 • committed by David S. Miller
commit 57f5877c11
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
net/Kconfig
View file

@ -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