From: David Ahern <dsahern@kernel.org>
To: davem@davemloft.net, netdev@vger.kernel.org
Cc: idosch@mellanox.com, jiri@mellanox.com, saeedm@mellanox.com,
David Ahern <dsahern@gmail.com>
Subject: [PATCH v2 net-next 01/13] ipv4: Define fib_get_nhs when CONFIG_IP_ROUTE_MULTIPATH is disabled
Date: Wed, 27 Mar 2019 11:23:17 -0700 [thread overview]
Message-ID: <20190327182329.18149-2-dsahern@kernel.org> (raw)
In-Reply-To: <20190327182329.18149-1-dsahern@kernel.org>
From: David Ahern <dsahern@gmail.com>
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>
---
net/ipv4/fib_semantics.c | 15 +++++++++------
1 file 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;
--
2.11.0
next prev parent reply other threads:[~2019-03-27 18:23 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-27 18:23 [PATCH v2 net-next 00/13] net: Move fib_nh and fib6_nh to a common struct David Ahern
2019-03-27 18:23 ` David Ahern [this message]
2019-03-27 18:23 ` [PATCH v2 net-next 02/13] ipv4: Move IN_DEV_IGNORE_ROUTES_WITH_LINKDOWN to helper David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 03/13] ipv4: Create init helper for fib_nh David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 04/13] ipv4: Create cleanup " David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 05/13] ipv6: Create init helper for fib6_nh David Ahern
2019-03-27 22:52 ` Alexei Starovoitov
2019-03-28 0:47 ` David Ahern
2019-03-28 1:30 ` Alexei Starovoitov
2019-03-28 2:05 ` David Ahern
2019-03-28 2:29 ` Alexei Starovoitov
2019-03-28 2:50 ` David Ahern
2019-03-28 3:04 ` Alexei Starovoitov
2019-03-28 2:11 ` David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 06/13] ipv6: Create cleanup " David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 07/13] ipv6: Move gateway checks to a fib6_nh setting David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 08/13] ipv6: Refactor fib6_ignore_linkdown David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 09/13] ipv6: Change rt6_add_nexthop and rt6_nexthop_info to take fib6_nh David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 10/13] ipv4: Rename fib_nh entries David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 11/13] ipv6: Rename fib6_nh entries David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 12/13] net: Add fib_nh_common and update fib_nh and fib6_nh David Ahern
2019-03-27 18:23 ` [PATCH v2 net-next 13/13] net: Use common nexthop init and release helpers David Ahern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190327182329.18149-2-dsahern@kernel.org \
--to=dsahern@kernel.org \
--cc=davem@davemloft.net \
--cc=dsahern@gmail.com \
--cc=idosch@mellanox.com \
--cc=jiri@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=saeedm@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).