Commit 8b66a6fd authored Jul 31, 2020 by Brian Vazquez Committed by David S. Miller Aug 01, 2020

fib: fix another fib_rules_ops indirect call wrapper problem



It turns out that on commit 41d707b7 ("fib: fix fib_rules_ops
indirect calls wrappers") I forgot to include the case when
CONFIG_IP_MULTIPLE_TABLES is not set.

Fixes: 41d707b7 ("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>

parent 0e8642cf

net/core/fib_rules.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -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 = {

Admin message