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 B5AF0C4360F for ; Thu, 4 Apr 2019 17:50:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7AEDF20820 for ; Thu, 4 Apr 2019 17:50:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554400214; bh=ppwayo/whXr1qdNUu0eYB4nC1YwacI01gW1Tl56lWpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KN+YrHzSrDrJ6D8z/AH0F1L8YVYVFfuBObcFyyL3rYbgvWIsTMKq9nUwQDVNqzDMy 6MR35ryYTGba5LntZZuvux52L+6qEzSe4lzFCD2wxbYgzRT/gxfKOQLFEKxsAoKxUA hxlg5e62PhNFd9T+J1F2Xd+VRpFTmBIikzXhH4a4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728735AbfDDRuG (ORCPT ); Thu, 4 Apr 2019 13:50:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:36350 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729166AbfDDRuC (ORCPT ); Thu, 4 Apr 2019 13:50:02 -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 C030620855; Thu, 4 Apr 2019 17:50:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554400201; bh=ppwayo/whXr1qdNUu0eYB4nC1YwacI01gW1Tl56lWpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iMMFWIr3rVagZ/QgDWdhUYL8TL0mTHGSj55XqFKR0RQY1G1L2eyw2uZdwqTEuVGn1 Z/dCsO9IsuuuKMos4/pyKmQnmYAptTav8OwJMtufOSbdjsecV5k8RY/227vroyI/Kv gK4JjHL/qxzlqydLhap8nDIw4AUzZbPtZ3FU9BhA= From: David Ahern To: davem@davemloft.net, netdev@vger.kernel.org Cc: idosch@mellanox.com, jiri@mellanox.com, David Ahern Subject: [PATCH net-next 13/18] ipv4: Handle ipv6 gateway in ipv4_confirm_neigh Date: Thu, 4 Apr 2019 10:50:02 -0700 Message-Id: <20190404175007.8150-14-dsahern@kernel.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190404175007.8150-1-dsahern@kernel.org> References: <20190404175007.8150-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 ipv4_confirm_neigh to handle an ipv6 gateway. Signed-off-by: David Ahern --- net/ipv4/route.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/net/ipv4/route.c b/net/ipv4/route.c index 32ecb4c1c7e3..efa6a36cbfff 100644 --- a/net/ipv4/route.c +++ b/net/ipv4/route.c @@ -465,13 +465,15 @@ static void ipv4_confirm_neigh(const struct dst_entry *dst, const void *daddr) struct net_device *dev = dst->dev; const __be32 *pkey = daddr; - if (rt->rt_gw_family == AF_INET) + if (rt->rt_gw_family == AF_INET) { pkey = (const __be32 *)&rt->rt_gw4; - else if (!daddr || + } else if (rt->rt_gw_family == AF_INET6) { + return __ipv6_confirm_neigh_stub(dev, &rt->rt_gw6); + } else if (!daddr || (rt->rt_flags & - (RTCF_MULTICAST | RTCF_BROADCAST | RTCF_LOCAL))) + (RTCF_MULTICAST | RTCF_BROADCAST | RTCF_LOCAL))) { return; - + } __ipv4_confirm_neigh(dev, *(__force u32 *)pkey); } -- 2.11.0