Pablo Neira 1708803ef2 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>		2014-05-26 00:42:30 -04:00
..
ebt_802_3.c
ebt_among.c	bridge: netfilter: Use ether_addr_copy	2014-02-24 19:16:44 -05:00
ebt_arp.c
ebt_arpreply.c
ebt_dnat.c	bridge: netfilter: Use ether_addr_copy	2014-02-24 19:16:44 -05:00
ebt_ip6.c
ebt_ip.c
ebt_limit.c
ebt_log.c	bridge: add space before '(/{', after ',', etc.	2013-12-19 19:27:26 -05:00
ebt_mark_m.c
ebt_mark.c
ebt_nflog.c
ebt_pkttype.c
ebt_redirect.c	bridge: netfilter: Use ether_addr_copy	2014-02-24 19:16:44 -05:00
ebt_snat.c	bridge: netfilter: Use ether_addr_copy	2014-02-24 19:16:44 -05:00
ebt_stp.c
ebt_ulog.c
ebt_vlan.c
ebtable_broute.c	bridge: change the position of '{' to the pre line	2013-12-19 19:27:26 -05:00
ebtable_filter.c	bridge: change the position of '{' to the pre line	2013-12-19 19:27:26 -05:00
ebtable_nat.c	bridge: change the position of '{' to the pre line	2013-12-19 19:27:26 -05:00
ebtables.c	netfilter: Can't fail and free after table replacement	2014-04-05 17:46:22 +02:00
Kconfig	netfilter: bridge: fix Kconfig unmet dependencies	2014-05-26 00:42:30 -04:00
Makefile	netfilter: nf_tables: Add meta expression key for bridge interface name	2014-04-24 10:37:28 +02:00
nf_tables_bridge.c	netfilter: nf_tables: rename nft_do_chain_pktinfo() to nft_do_chain()	2014-01-09 20:17:16 +01:00
nft_meta_bridge.c	netfilter: nf_tables: Add meta expression key for bridge interface name	2014-04-24 10:37:28 +02:00