2020-08-03 13:21:04

by Yue Haibing

Subject: [PATCH net-next] fib: Fix undef compile warning

net/core/fib_rules.c:26:7: warning: "CONFIG_IP_MULTIPLE_TABLES" is not defined, evaluates to 0 [-Wundef]
#elif CONFIG_IP_MULTIPLE_TABLES
^~~~~~~~~~~~~~~~~~~~~~~~~

Fixes: 8b66a6fd34f5 ("fib: fix another fib_rules_ops indirect call wrapper problem")
Signed-off-by: YueHaibing <[email protected]>
---
net/core/fib_rules.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index a7a3f500a857..51678a528f85 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -23,7 +23,7 @@
#else
#define INDIRECT_CALL_MT(f, f2, f1, ...) INDIRECT_CALL_1(f, f2, __VA_ARGS__)
#endif
-#elif CONFIG_IP_MULTIPLE_TABLES
+#elif defined(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__)
--
2.17.1

2020-08-03 16:24:37

by Brian Vazquez

Subject: Re: [PATCH net-next] fib: Fix undef compile warning

Acked-By: Brian Vazquez <[email protected]>

On Mon, Aug 3, 2020 at 6:20 AM YueHaibing <[email protected]> wrote:
>
> net/core/fib_rules.c:26:7: warning: "CONFIG_IP_MULTIPLE_TABLES" is not defined, evaluates to 0 [-Wundef]
> #elif CONFIG_IP_MULTIPLE_TABLES
> ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> Fixes: 8b66a6fd34f5 ("fib: fix another fib_rules_ops indirect call wrapper problem")
> Signed-off-by: YueHaibing <[email protected]>
> ---
> net/core/fib_rules.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
> index a7a3f500a857..51678a528f85 100644
> --- a/net/core/fib_rules.c
> +++ b/net/core/fib_rules.c
> @@ -23,7 +23,7 @@
> #else
> #define INDIRECT_CALL_MT(f, f2, f1, ...) INDIRECT_CALL_1(f, f2, __VA_ARGS__)
> #endif
> -#elif CONFIG_IP_MULTIPLE_TABLES
> +#elif defined(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__)
> --
> 2.17.1
>
>

2020-08-04 01:02:40

by David Miller

Subject: Re: [PATCH net-next] fib: Fix undef compile warning

From: YueHaibing <[email protected]>
Date: Mon, 3 Aug 2020 21:19:48 +0800

> net/core/fib_rules.c:26:7: warning: "CONFIG_IP_MULTIPLE_TABLES" is not defined, evaluates to 0 [-Wundef]
> #elif CONFIG_IP_MULTIPLE_TABLES
> ^~~~~~~~~~~~~~~~~~~~~~~~~
>
> Fixes: 8b66a6fd34f5 ("fib: fix another fib_rules_ops indirect call wrapper problem")
> Signed-off-by: YueHaibing <[email protected]>

Applied, thank for fixing this up.