aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2020-05-24 19:37:11 -0600
committerJason A. Donenfeld <Jason@zx2c4.com>2020-09-30 16:46:02 +0200
commitf8a0a8ebcc87434d29753b914794cabe4c4e1367 (patch)
tree4af713b0b7886144d04b3d5ae21868aacf197f28
parentsched: fair: averaging depends on CONFIG_FAIR_GROUP_SCHED (diff)
downloadrhel7-kernel-misery-f8a0a8ebcc87434d29753b914794cabe4c4e1367.tar.xz
rhel7-kernel-misery-f8a0a8ebcc87434d29753b914794cabe4c4e1367.zip
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>
-rw-r--r--net/ipv4/fib_semantics.c2
1 files changed, 2 insertions, 0 deletions
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 &&