[OpenWrt-Devel] [PATCH] kernel: 3.18: Fix patch 644 dependency chain

[Florian Fainelli]

Le 07/11/2014 02:56, Maxime Ripard a écrit :
> 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 at free-electrons.com>

Applied in r43419, thanks!
--
Florian
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel