blob: 1bce86e9fa14f089cf615348055536aa393f6fc2 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
From f8a0a8ebcc87434d29753b914794cabe4c4e1367 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 24 May 2020 19:37:11 -0600
Subject: [PATCH 25/34] net: fib: fib_encap_match requires
CONFIG_IP_ROUTE_MULTIPATH
Don't call into fib_encap_match when it's not defined on
!CONFIG_IP_ROUTE_MULTIPATH kernels.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
net/ipv4/fib_semantics.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c
index e483e2e916c..b3cdea362f4 100644
--- a/net/ipv4/fib_semantics.c
+++ b/net/ipv4/fib_semantics.c
@@ -615,10 +615,12 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi)
if (cfg->fc_oif || cfg->fc_gw) {
if (cfg->fc_encap) {
+#ifdef CONFIG_IP_ROUTE_MULTIPATH
if (fib_encap_match(net, cfg->fc_encap_type,
cfg->fc_encap, cfg->fc_oif,
fi->fib_nh, cfg))
return 1;
+#endif
}
#ifdef CONFIG_IP_ROUTE_CLASSID
if (cfg->fc_flow &&
--
2.29.1
|
