openwrtv3/target/linux/generic
Florian Fainelli d73dc14957 kernel: 3.18: Fix patch 644 dependency chain
This patch introduces some code that is compiled in whenever
CONFIG_BRIDGE_NETFILTER is built, with the code called from code compiled under
CONFIG_BRIDGE, CONFIG_BRIDGE_IGMP_SNOOPING or CONFIG_BRIDGE_NF_EBTABLES.

Unfortunately, these options aren't setting explicitly the dependency they now
have on CONFIG_BRIDGE_NETFILTER, for obvious reasons for CONFIG_BRIDGE.

However, this is not working really well when CONFIG_BRIDGE_NETFILTER is built
as a module, since code statically compiled will now use a function that is not
in the kernel image, which makes the linker grumpy.

Solve this by removing the option to build CONFIG_BRIDGE_NETFILTER as a module,
and protect our function definition by an IS_BUILTIN instead of a IS_ENABLED
macro. This fixes the issue for CONFIG_BRIDGE and CONFIG_BRIDGE_IGMP_SNOOPING.

Fixing CONFIG_BRIDGE_NF_EBTABLES has to be handled a bit differently, since it
directly references a variable that will not be declared if
CONFIG_BRIDGE_NETFILTER is not set. Protect the variable affectations by an
ifdef to make sure this doesn't happen.

Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Signed-off-by: Florian Fainelli <florian@openwrt.org>

SVN-Revision: 43419
2014-11-28 01:29:51 +00:00
..
base-files update the /init file to start /sbin/init 2013-03-13 18:11:13 +00:00
files ar8216: suppress PHY reset for linux 3.14 2014-11-27 18:26:06 +00:00
image rename target/linux/generic-2.6 to generic 2010-06-26 20:42:58 +00:00
patches-3.3 netfilter: consider reply direction on selective flushing 2014-08-10 10:15:22 +00:00
patches-3.8 netfilter: consider reply direction on selective flushing 2014-08-10 10:15:22 +00:00
patches-3.10 kernel: ssb: add PCI ID 0x4351 2014-11-08 20:51:24 +00:00
patches-3.13 kernel: add missing patch for AR8216_PHY_LEDS 2014-10-31 23:53:32 +00:00
patches-3.14 kernel: backport patches for overriding PHY reset to 3.14 2014-11-27 18:26:00 +00:00
patches-3.18 kernel: 3.18: Fix patch 644 dependency chain 2014-11-28 01:29:51 +00:00
config-3.3 kernel: add missing config options 2014-07-05 23:35:36 +00:00
config-3.8 kernel: add missing config option 2014-09-14 12:06:59 +00:00
config-3.10 kernel: update 3.10.49 to 3.10.58 (released 2014-oct-15) 2014-10-24 20:39:26 +00:00
config-3.13 kernel: add missing config symbol for 3.13+ 2014-11-02 20:06:41 +00:00
config-3.14 kernel: add missing config symbol for 3.13+ 2014-11-02 20:06:41 +00:00
config-3.18 kernel: unset CONFIG_ARM_CCN 2014-11-26 08:59:41 +00:00
PATCHES kernel: update PATCHES with a stricter policy 2013-07-09 20:52:07 +00:00