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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,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 29829C282CE for ; Fri, 5 Apr 2019 23:30:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E234821726 for ; Fri, 5 Apr 2019 23:30:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554507049; bh=d5c+sRQ+SLQMHIZf6kr2NT/UQtb4OLMNBWSDMyxj33M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=QSOKtkYEBeBSKEXVm3dlSbqgUftLT9n5/BhYocySLbT/AZVw1tCyIJMd9sN8zT1IH eC2LQVa7UqJdj4hQQL0vFyPuHBoixishES6EzRN9q1eW2MyX1Tycnx1t+5QaU1n0tB ed3UcjOQxce21mVSCyroOTPkZr1wP2RvAZ6Kz4tY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726568AbfDEXar (ORCPT ); Fri, 5 Apr 2019 19:30:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:56632 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726475AbfDEXae (ORCPT ); Fri, 5 Apr 2019 19:30:34 -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 AADB5218AC; Fri, 5 Apr 2019 23:30:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554507033; bh=d5c+sRQ+SLQMHIZf6kr2NT/UQtb4OLMNBWSDMyxj33M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=edAnFdRDqfqUrb2yqGMK8JNKZpTn6vpchhKOk26eSVMEf8arYMywzaIbJcfIu0o0+ geRotggEDwNgXlxj+M5Ge48I0texYnhvUwRzrTa9qmW+unQN/xPtUxAShEFWcOt1iK q2Hd022OZKkrPGv8Vxd48eUQojJR5gSAZOlmZIiY= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, jiri@mellanox.com, David Ahern Subject: [PATCH v2 net-next 15/18] ipv4: Handle ipv6 gateway in fib_good_nh Date: Fri, 5 Apr 2019 16:30:38 -0700 Message-Id: <20190405233041.30775-16-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190405233041.30775-1-dsahern@kernel.org> References: <20190405233041.30775-1-dsahern@kernel.org> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: David Ahern Update fib_good_nh to handle an ipv6 gateway. Signed-off-by: David Ahern --- net/ipv4/fib_semantics.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index e5a6d431bfab..c1ea138335a2 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -1909,8 +1909,14 @@ static bool fib_good_nh(const struct fib_nh *nh) rcu_read_lock_bh(); - n = __ipv4_neigh_lookup_noref(nh->fib_nh_dev, - (__force u32)nh->fib_nh_gw4); + if (likely(nh->fib_nh_gw_family == AF_INET)) + n = __ipv4_neigh_lookup_noref(nh->fib_nh_dev, + (__force u32)nh->fib_nh_gw4); + else if (nh->fib_nh_gw_family == AF_INET6) + n = __ipv6_neigh_lookup_noref_stub(nh->fib_nh_dev, + &nh->fib_nh_gw6); + else + n = NULL; if (n) state = n->nud_state; -- 2.11.0