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 73BE3C282CE for ; Fri, 5 Apr 2019 23:30:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2205721726 for ; Fri, 5 Apr 2019 23:30:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1554507053; bh=ppwayo/whXr1qdNUu0eYB4nC1YwacI01gW1Tl56lWpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mW6/zEwLFQIMjd5FOCm0RrFJRM4sSkthtIQnoFRpJqtIdfkW/RV8fVYj4trZI1rVV FVv//OEdl4gOIdeP92Yy6k2nKAm9pyfGb2yybx9tdwFlpJei5kt0ib93F1aht+6yGG C0OWrLoIbxxcv/tclvWMkkiNl/h4ZdrS7+cpvo+U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726591AbfDEXav (ORCPT ); Fri, 5 Apr 2019 19:30:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:56630 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726462AbfDEXad (ORCPT ); Fri, 5 Apr 2019 19:30:33 -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 2EC3321871; 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=ppwayo/whXr1qdNUu0eYB4nC1YwacI01gW1Tl56lWpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NgNPS/9prlsyiByX6NTD3I+c2NlsEtdWlO1cKljuOV7b/l/TV3XBGq7dw3Br6ljXJ xTm73lrcOHn4xfT40WmyHKDabW1DDNlbnz0LYqXmN6Ngb8Jj6JOSAeMoWzn9ANTAn3 2USxi78b8dt8BWOkdeTcFhZsT+TQOzT4Rwm5SDJc= 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 13/18] ipv4: Handle ipv6 gateway in ipv4_confirm_neigh Date: Fri, 5 Apr 2019 16:30:36 -0700 Message-Id: <20190405233041.30775-14-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 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