From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 68356C43381 for ; Wed, 27 Mar 2019 18:23:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 322732063F for ; Wed, 27 Mar 2019 18:23:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553711014; bh=Ywhulm+2P98zdpkifA3lb2vGZASX3u2Qe3tWGG4OI8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gksi2b2aqsWcpTIgu6NUyXGBijhuh60DmjEm7JHewaIw9EYb/Wu82PHNSemO+aeag jgET82WJJcx6p+0JwuM64S0uQOvOPyIrnhmcZKmecCvw5ID8LXxEL114pVBDKzSFRR 8tJ9O92FL/kKCArg2kmRgRhh+j5AddKYFZkYiR9s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403878AbfC0SXd (ORCPT ); Wed, 27 Mar 2019 14:23:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:42052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391489AbfC0SX2 (ORCPT ); Wed, 27 Mar 2019 14:23:28 -0400 Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com [216.129.126.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 19A032087C; Wed, 27 Mar 2019 18:23:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1553711008; bh=Ywhulm+2P98zdpkifA3lb2vGZASX3u2Qe3tWGG4OI8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=a4iPNtPL2LoWO2/vrtOm4ElWuVL5AcAr2hdpjyy56/JUMh98VfxY0MQ1/xX5i0ZqF C1OatvVXRB0D73Fr1aXo18BOzeEbDCEtpvCyNsRHUhaXg4THZEIAOhtmyX0T7RP5PO sYBxk3j05bXxSzbOmqKCHvJubGU58itxN0TOVjfA= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, jiri@mellanox.com, saeedm@mellanox.com, David Ahern 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 Message-Id: <20190327182329.18149-2-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190327182329.18149-1-dsahern@kernel.org> References: <20190327182329.18149-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern 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 Reviewed-by: Ido Schimmel --- 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