From patchwork Mon Oct 24 09:28:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Sitnicki X-Patchwork-Id: 685747 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3t2WGy65vhz9t1L for ; Mon, 24 Oct 2016 20:30:34 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938796AbcJXJaQ (ORCPT ); Mon, 24 Oct 2016 05:30:16 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:36371 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753162AbcJXJ24 (ORCPT ); Mon, 24 Oct 2016 05:28:56 -0400 Received: by mail-wm0-f45.google.com with SMTP id b80so92913166wme.1 for ; Mon, 24 Oct 2016 02:28:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=1j3s2VR6xstvsMRTFktQk/n+nE+ewMHqzaVG3F10Vds=; b=YDVNzG01Jfuh62gNByw9es36jaDue7mjz+xbsT0y+xeEOfN6MJ4FgJS9Ms65pu3YmJ EhY2ZxH22301+MXnXOyFh45at3/pkm8LdOXOGvbo++t4A3m/iqnsASKnhpj3BkqTh3Z/ IFiSLFhT0kyNsTq2WwyQf+BYzfH5hahIrBiTSKgi/GAEIQRb+i+o0X+Ubw4BaRLy9EWN scjNuzJ2+tOdiE3lIKBkaHyMZZQfc7XhQo5PviZTXHqE+waR0TxnASBSPxDZGpGIGWaK h+iAQ39ONJK5u3jmVC//xEvVpeW0JXlB2sfQctYIKcN90ClmrubJpTXuq6ojUkNh1Fa5 XM3g== X-Gm-Message-State: AA6/9RlmEC5GHOqQUbYPhB9cs1ZTmy1VKYgP25M6XALS6tbuGg53QwmYga/kBotw2cenNsL/ X-Received: by 10.28.93.137 with SMTP id r131mr20327989wmb.2.1477301335076; Mon, 24 Oct 2016 02:28:55 -0700 (PDT) Received: from redhat.com ([149.6.38.86]) by smtp.gmail.com with ESMTPSA id v3sm18316060wjm.4.2016.10.24.02.28.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Oct 2016 02:28:54 -0700 (PDT) From: Jakub Sitnicki To: netdev@vger.kernel.org Cc: linux-kernel@vger.kernel.org, "David S. Miller" , Alexey Kuznetsov , James Morris , Hideaki YOSHIFUJI , Patrick McHardy Subject: [PATCH net-next 1/5] ipv6: Fold rt6_info_hash_nhsfn() into its only caller Date: Mon, 24 Oct 2016 11:28:48 +0200 Message-Id: <1477301332-23954-2-git-send-email-jkbs@redhat.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1477301332-23954-1-git-send-email-jkbs@redhat.com> References: <1477301332-23954-1-git-send-email-jkbs@redhat.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Commit 644d0e656958 ("ipv6 Use get_hash_from_flowi6 for rt6 hash") has turned rt6_info_hash_nhsfn() into a one-liner, so it no longer makes sense to keep it around. Also the accompanying documentation comment has become outdated, so just remove it altogether. Signed-off-by: Jakub Sitnicki Acked-by: Hannes Frederic Sowa --- net/ipv6/route.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/net/ipv6/route.c b/net/ipv6/route.c index bdbc38e..0514b35 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -425,16 +425,6 @@ static bool rt6_check_expired(const struct rt6_info *rt) return false; } -/* Multipath route selection: - * Hash based function using packet header and flowlabel. - * Adapted from fib_info_hashfn() - */ -static int rt6_info_hash_nhsfn(unsigned int candidate_count, - const struct flowi6 *fl6) -{ - return get_hash_from_flowi6(fl6) % candidate_count; -} - static struct rt6_info *rt6_multipath_select(struct rt6_info *match, struct flowi6 *fl6, int oif, int strict) @@ -442,7 +432,7 @@ static struct rt6_info *rt6_multipath_select(struct rt6_info *match, struct rt6_info *sibling, *next_sibling; int route_choosen; - route_choosen = rt6_info_hash_nhsfn(match->rt6i_nsiblings + 1, fl6); + route_choosen = get_hash_from_flowi6(fl6) % (match->rt6i_nsiblings + 1); /* Don't change the route, if route_choosen == 0 * (siblings does not include ourself) */