diff options
| author |   David Ahern <dsahern@gmail.com> | 2019-03-27 20:53:46 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-03-29 10:48:03 -0700 |
| commit | 8373c6c84e6748e1dd8b82c43af37572ab040233 (patch) | |
| tree | 8e33c7e1dd091e105ebc3a975da2a3c099b2d0ea /net/ipv4/fib_semantics.c | |
| parent | Merge branch 'selftests-forwarding-Add-new-test-cases' (diff) | |
| download | linux-dev-8373c6c84e6748e1dd8b82c43af37572ab040233.tar.xz linux-dev-8373c6c84e6748e1dd8b82c43af37572ab040233.zip | |
ipv4: Define fib_get_nhs when CONFIG_IP_ROUTE_MULTIPATH is disabled
Define fib_get_nhs to return EINVAL when CONFIG_IP_ROUTE_MULTIPATH is
not enabled and remove the ifdef check for CONFIG_IP_ROUTE_MULTIPATH
in fib_create_info.
Signed-off-by: David Ahern <dsahern@gmail.com>
Reviewed-by: Ido Schimmel <idosch@mellanox.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/fib_semantics.c')
| -rw-r--r-- | net/ipv4/fib_semantics.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 8e185b5a2bf6..b5dbbdfd1e49 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -601,6 +601,15 @@ static void fib_rebalance(struct fib_info *fi) } #else /* CONFIG_IP_ROUTE_MULTIPATH */ +static int fib_get_nhs(struct fib_info *fi, struct rtnexthop *rtnh, + int remaining, struct fib_config *cfg, + struct netlink_ext_ack *extack) +{ + NL_SET_ERR_MSG(extack, "Multipath support not enabled in kernel"); + + return -EINVAL; +} + #define fib_rebalance(fi) do { } while (0) #endif /* CONFIG_IP_ROUTE_MULTIPATH */ @@ -1102,7 +1111,6 @@ struct fib_info *fib_create_info(struct fib_config *cfg, } endfor_nexthops(fi) if (cfg->fc_mp) { -#ifdef CONFIG_IP_ROUTE_MULTIPATH err = fib_get_nhs(fi, cfg->fc_mp, cfg->fc_mp_len, cfg, extack); if (err != 0) goto failure; @@ -1123,11 +1131,6 @@ struct fib_info *fib_create_info(struct fib_config *cfg, goto err_inval; } #endif -#else - NL_SET_ERR_MSG(extack, - "Multipath support not enabled in kernel"); - goto err_inval; -#endif } else { struct fib_nh *nh = fi->fib_nh; |