| Message ID | 20200908161812.723044-1-brianvv@google.com |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | fib: fix fib_rule_ops indirect call wrappers when CONFIG_IPV6=m | expand |
From: Brian Vazquez <brianvv@google.com> Date: Tue, 8 Sep 2020 09:18:12 -0700 > If CONFIG_IPV6=m, the IPV6 functions won't be found by the linker: > > ld: net/core/fib_rules.o: in function `fib_rules_lookup': > fib_rules.c:(.text+0x606): undefined reference to `fib6_rule_match' > ld: fib_rules.c:(.text+0x611): undefined reference to `fib6_rule_match' > ld: fib_rules.c:(.text+0x68c): undefined reference to `fib6_rule_action' > ld: fib_rules.c:(.text+0x693): undefined reference to `fib6_rule_action' > ld: fib_rules.c:(.text+0x6aa): undefined reference to `fib6_rule_suppress' > ld: fib_rules.c:(.text+0x6bc): undefined reference to `fib6_rule_suppress' > make: *** [Makefile:1166: vmlinux] Error 1 > > Reported-by: Sven Joachim <svenjoac@gmx.de> > Fixes: b9aaec8f0be5 ("fib: use indirect call wrappers in the most common fib_rules_ops") > Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested > Signed-off-by: Brian Vazquez <brianvv@google.com> Applied, thanks.
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 51678a528f85..7bcfb16854cb 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -16,7 +16,7 @@ #include <net/ip_tunnels.h> #include <linux/indirect_call_wrapper.h> -#ifdef CONFIG_IPV6_MULTIPLE_TABLES +#if defined(CONFIG_IPV6) && defined(CONFIG_IPV6_MULTIPLE_TABLES) #ifdef CONFIG_IP_MULTIPLE_TABLES #define INDIRECT_CALL_MT(f, f2, f1, ...) \ INDIRECT_CALL_INET(f, f2, f1, __VA_ARGS__)
If CONFIG_IPV6=m, the IPV6 functions won't be found by the linker: ld: net/core/fib_rules.o: in function `fib_rules_lookup': fib_rules.c:(.text+0x606): undefined reference to `fib6_rule_match' ld: fib_rules.c:(.text+0x611): undefined reference to `fib6_rule_match' ld: fib_rules.c:(.text+0x68c): undefined reference to `fib6_rule_action' ld: fib_rules.c:(.text+0x693): undefined reference to `fib6_rule_action' ld: fib_rules.c:(.text+0x6aa): undefined reference to `fib6_rule_suppress' ld: fib_rules.c:(.text+0x6bc): undefined reference to `fib6_rule_suppress' make: *** [Makefile:1166: vmlinux] Error 1 Reported-by: Sven Joachim <svenjoac@gmx.de> Fixes: b9aaec8f0be5 ("fib: use indirect call wrappers in the most common fib_rules_ops") Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested Signed-off-by: Brian Vazquez <brianvv@google.com> --- net/core/fib_rules.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)