From patchwork Wed Apr 18 22:39:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 900429 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QBRp2nyY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40RH9r4JLQz9s27 for ; Thu, 19 Apr 2018 08:39:44 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753110AbeDRWjm (ORCPT ); Wed, 18 Apr 2018 18:39:42 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:35300 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752845AbeDRWjY (ORCPT ); Wed, 18 Apr 2018 18:39:24 -0400 Received: by mail-pg0-f66.google.com with SMTP id j11so1535683pgf.2 for ; Wed, 18 Apr 2018 15:39:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rfVA+PnnL6qx3VHgvvjJo75zoHQ0PaHGJF2rp+QIaX8=; b=QBRp2nyYhf1IIaV1LhlYBfIPMGwii81BLyH7a5RiwcLI4C8VN3BDFttuZz58Xe8tuC vWeE0aQmP+zGuVvgixIzEOJEeIWoB7gJihA82Wd6p2sQfQtDYxaXQk3mxPkNze/3ZfVn SqKCElSb5GKjmAKyxaCYFFbfvD4XHs/H1qvb5rTyEQfh6ZAcnk7jZwWgfx4z9s1ZJ0wS /NpU6kdB4grNDKvr25FWof7NpWPob/dOlnunNm6ssBtXgVUNhi9UoIxOiB5lzmaTPjGc xn6AdSG01nxKRG1267tLXWAevSivxzGu7rdHBLeN+LjQcmg51DRUQDbiliTh4QWI5iT0 VYKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rfVA+PnnL6qx3VHgvvjJo75zoHQ0PaHGJF2rp+QIaX8=; b=LWSV9Ab93OXu+4A3+MJoT7pJ8+YMTwWLfJ9wMH+td7VJAolHPQgbS63TrTJcB5oZz7 ko+ZV8rMEVdxV6NjcrDn8wP46z4WOfu7c90z4Ay8EEH/kQoroj3rC9ksZNn4HoCv1aU9 fRsC+dumYfCNAfhhqcamJgYssZYeux0eWARoPIM1cBXdRr38NdQPl5mJsn2OB5WCGwIg 5f1+ppH9WMwbnTeNOofRNEZjidKgfcaHNsMYOCpyPKT6RkdqGfS4dh4iwMh4cvmB8TQY ZwxEhsbDceD9nlUgqEM9iTsB7tU8mXqAZFS+TnDxw9pNO0FWS2kCclT4EdbNmpJXn6KK 7DVg== X-Gm-Message-State: ALQs6tCRoTiuVIQqTT0DYUsdIAyUGYh0Z+QrQLlg0A9Y+TqsJ9horOwQ ee6HD2pXjG2uQchEzL10YUOHzg== X-Google-Smtp-Source: AIpwx4/E40Xf7600acJtyBQG85oFdHoKYNA0WbSkqPdW7LITVoAM89hejLRR7spWixVORPBH6waI1A== X-Received: by 10.98.238.3 with SMTP id e3mr3514971pfi.232.1524091163890; Wed, 18 Apr 2018 15:39:23 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id w9sm4787312pfl.45.2018.04.18.15.39.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Apr 2018 15:39:23 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@idosch.org, roopa@cumulusnetworks.com, eric.dumazet@gmail.com, weiwan@google.com, kafai@fb.com, yoshfuji@linux-ipv6.org, David Ahern Subject: [PATCH net-next 6/8] net/ipv6: Remove compare of fib6_idev from rt6_duplicate_nexthop Date: Wed, 18 Apr 2018 15:39:04 -0700 Message-Id: <20180418223906.16650-7-dsahern@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180418223906.16650-1-dsahern@gmail.com> References: <20180418223906.16650-1-dsahern@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org After 4832c30d5458 ("net: ipv6: put host and anycast routes on device with address") the comparison of idev does not add value since it correlates to the nexthop device which is already compared. Remove the idev comparison. Signed-off-by: David Ahern --- include/net/ip6_route.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/net/ip6_route.h b/include/net/ip6_route.h index c0620330035c..8df4ff798b04 100644 --- a/include/net/ip6_route.h +++ b/include/net/ip6_route.h @@ -275,7 +275,6 @@ static inline struct in6_addr *rt6_nexthop(struct rt6_info *rt, static inline bool rt6_duplicate_nexthop(struct fib6_info *a, struct fib6_info *b) { return a->fib6_nh.nh_dev == b->fib6_nh.nh_dev && - a->fib6_idev == b->fib6_idev && ipv6_addr_equal(&a->fib6_nh.nh_gw, &b->fib6_nh.nh_gw) && !lwtunnel_cmp_encap(a->fib6_nh.nh_lwtstate, b->fib6_nh.nh_lwtstate); }