diff options
| author | Brian Vazquez <brianvv@google.com> | 2020-07-31 20:01:10 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-01 11:47:39 -0700 |
| commit | 8b66a6fd34f519f4ad42c4ab0152c3c0782a7dbd (patch) | |
| tree | 803b17b30bdcee6aa1474dbfec6a1b7cc8b6af38 /net | |
| parent | 0e8642cf369a37b718c15effa6ffd52c00fd7d15 (diff) | |
| download | lwn-8b66a6fd34f519f4ad42c4ab0152c3c0782a7dbd.tar.gz lwn-8b66a6fd34f519f4ad42c4ab0152c3c0782a7dbd.zip | |
fib: fix another fib_rules_ops indirect call wrapper problem
It turns out that on commit 41d707b7332f ("fib: fix fib_rules_ops
indirect calls wrappers") I forgot to include the case when
CONFIG_IP_MULTIPLE_TABLES is not set.
Fixes: 41d707b7332f ("fib: fix fib_rules_ops indirect calls wrappers")
Reported-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Brian Vazquez <brianvv@google.com>
Acked-by: Randy Dunlap <rdunlap@infradead.org> # build-tested
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/fib_rules.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index fce645f6b9b1..a7a3f500a857 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -17,10 +17,16 @@ #include <linux/indirect_call_wrapper.h> #ifdef CONFIG_IPV6_MULTIPLE_TABLES +#ifdef CONFIG_IP_MULTIPLE_TABLES #define INDIRECT_CALL_MT(f, f2, f1, ...) \ INDIRECT_CALL_INET(f, f2, f1, __VA_ARGS__) #else +#define INDIRECT_CALL_MT(f, f2, f1, ...) INDIRECT_CALL_1(f, f2, __VA_ARGS__) +#endif +#elif CONFIG_IP_MULTIPLE_TABLES #define INDIRECT_CALL_MT(f, f2, f1, ...) INDIRECT_CALL_1(f, f1, __VA_ARGS__) +#else +#define INDIRECT_CALL_MT(f, f2, f1, ...) f(__VA_ARGS__) #endif static const struct fib_kuid_range fib_kuid_range_unset = { |