Commit 1708803ef224367b8bd5b83b400c768a2044d7fa

Authored by Pablo Neira
Committed by David S. Miller
1 parent 587b24a549

netfilter: bridge: fix Kconfig unmet dependencies

Before f5efc69 ("netfilter: nf_tables: Add meta expression key for
bridge interface name"), the entire net/bridge/netfilter/ directory
depended on BRIDGE_NF_EBTABLES, ie. on ebtables. However, that
directory already contained the nf_tables bridge extension that
we should allow to compile separately. In f5efc69, we tried to
generalize this by using CONFIG_BRIDGE_NETFILTER which was not a good
idea since this option already existed and it is dedicated to enable
the Netfilter bridge IP/ARP filtering.

Let's try to fix this mess by:

1) making net/bridge/netfilter/ dependent on the toplevel
   CONFIG_NETFILTER option, just like we do with the net/netfilter and
   net/ipv{4,6}/netfilter/ directories.

2) Changing 'selects' to 'depends on' NETFILTER_XTABLES for
   BRIDGE_NF_EBTABLES. I believe this problem was already before
   f5efc69:

warning: (BRIDGE_NF_EBTABLES) selects NETFILTER_XTABLES which has
unmet direct dependencies (NET && INET && NETFILTER)

3) Fix ebtables/nf_tables bridge dependencies by making NF_TABLES_BRIDGE
   and BRIDGE_NF_EBTABLES dependent on BRIDGE and NETFILTER:

warning: (NF_TABLES_BRIDGE && BRIDGE_NF_EBTABLES) selects
BRIDGE_NETFILTER which has unmet direct dependencies (NET && BRIDGE &&
NETFILTER && INET && NETFILTER_ADVANCED)

net/built-in.o: In function `br_parse_ip_options':
br_netfilter.c:(.text+0x4a5ba): undefined reference to `ip_options_compile'
br_netfilter.c:(.text+0x4a5ed): undefined reference to `ip_options_rcv_srr'
net/built-in.o: In function `br_nf_pre_routing_finish':
br_netfilter.c:(.text+0x4a8a4): undefined reference to `ip_route_input_noref'
br_netfilter.c:(.text+0x4a987): undefined reference to `ip_route_output_flow'
make: *** [vmlinux] Error 1

Reported-by: Jim Davis <jim.epost@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 2 changed files with 3 additions and 6 deletions Side-by-side Diff

... ... @@ -16,5 +16,5 @@
16 16  
17 17 bridge-$(CONFIG_BRIDGE_VLAN_FILTERING) += br_vlan.o
18 18  
19   -obj-$(CONFIG_BRIDGE_NETFILTER) += netfilter/
  19 +obj-$(CONFIG_NETFILTER) += netfilter/
net/bridge/netfilter/Kconfig
... ... @@ -3,8 +3,7 @@
3 3 #
4 4 #
5 5 menuconfig NF_TABLES_BRIDGE
6   - depends on NF_TABLES
7   - select BRIDGE_NETFILTER
  6 + depends on BRIDGE && NETFILTER && NF_TABLES
8 7 tristate "Ethernet Bridge nf_tables support"
9 8  
10 9 if NF_TABLES_BRIDGE
... ... @@ -19,9 +18,7 @@
19 18  
20 19 menuconfig BRIDGE_NF_EBTABLES
21 20 tristate "Ethernet Bridge tables (ebtables) support"
22   - depends on BRIDGE && NETFILTER
23   - select BRIDGE_NETFILTER
24   - select NETFILTER_XTABLES
  21 + depends on BRIDGE && NETFILTER && NETFILTER_XTABLES
25 22 help
26 23 ebtables is a general, extensible frame/packet identification
27 24 framework. Say 'Y' or 'M' here if you want to do Ethernet