From patchwork Wed Nov 12 13:10:03 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ebalard X-Patchwork-Id: 8374 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.176.167]) by ozlabs.org (Postfix) with ESMTP id 9B634DDDEC for ; Thu, 13 Nov 2008 00:26:43 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751984AbYKLN0j (ORCPT ); Wed, 12 Nov 2008 08:26:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751898AbYKLN0j (ORCPT ); Wed, 12 Nov 2008 08:26:39 -0500 Received: from copper.chdir.org ([88.191.97.87]:33553 "EHLO copper.chdir.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751828AbYKLN0i (ORCPT ); Wed, 12 Nov 2008 08:26:38 -0500 X-Greylist: delayed 889 seconds by postgrey-1.27 at vger.kernel.org; Wed, 12 Nov 2008 08:26:38 EST Received: from cct.net8.nerim.net ([213.41.184.223] helo=localhost.localdomain) by copper with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1L0FVX-0003o8-6K; Wed, 12 Nov 2008 14:11:43 +0100 X-Hashcash: 1:20:081112:davem@davemloft.net::SeBRaH5Vk8b4Wr0S:00000000000000000000000000000000000000000006ol X-Hashcash: 1:20:081112:herbert@gondor.apana.org.au::1sMMSRBvWImGMPtn:00000000000000000000000000000000001tGl X-Hashcash: 1:20:081112:netdev@vger.kernel.org::AFZ8fGEe0Iu1ixOU:0000000000000000000000000000000000000001DAq From: arno@natisbad.org (Arnaud Ebalard) To: David Miller Cc: Herbert Xu , netdev@vger.kernel.org Subject: [PATCH] Remove unused parameter of xfrm_gen_index() X-PGP-Key-URL: http://natisbad.org/arno@natisbad.org.asc X-Fingerprint: 47EB 85FE B99A AB85 FD09 46F3 0255 957C 047A 5026 Date: Wed, 12 Nov 2008 14:10:03 +0100 Message-ID: <87zlk5ccpg.fsf@natisbad.org> User-Agent: Gnus/5.110009 (No Gnus v0.9) Emacs/22.2 (gnu/linux) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi David, In commit 2518c7c2b3d7f0a6b302b4efe17c911f8dd4049f, the last use of xfrm_gen_policy() first argument was removed, but the argument was left behind in the prototype. Patch is against current net-2.6. Signed-off-by: Arnaud Ebalard Acked-by: Herbert Xu --- net/xfrm/xfrm_policy.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 058f04f..959958c 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c @@ -521,7 +521,7 @@ static DECLARE_WORK(xfrm_hash_work, xfrm_hash_resize); /* Generate new index... KAME seems to generate them ordered by cost * of an absolute inpredictability of ordering of rules. This will not pass. */ -static u32 xfrm_gen_index(u8 type, int dir) +static u32 xfrm_gen_index(int dir) { static u32 idx_generator; @@ -608,7 +608,7 @@ int xfrm_policy_insert(int dir, struct xfrm_policy *policy, int excl) list_del(&delpol->walk.all); xfrm_policy_count[dir]--; } - policy->index = delpol ? delpol->index : xfrm_gen_index(policy->type, dir); + policy->index = delpol ? delpol->index : xfrm_gen_index(dir); hlist_add_head(&policy->byidx, xfrm_policy_byidx+idx_hash(policy->index)); policy->curlft.add_time = get_seconds(); policy->curlft.use_time = 0; @@ -1138,7 +1138,7 @@ int xfrm_sk_policy_insert(struct sock *sk, int dir, struct xfrm_policy *pol) sk->sk_policy[dir] = pol; if (pol) { pol->curlft.add_time = get_seconds(); - pol->index = xfrm_gen_index(pol->type, XFRM_POLICY_MAX+dir); + pol->index = xfrm_gen_index(XFRM_POLICY_MAX+dir); __xfrm_policy_link(pol, XFRM_POLICY_MAX+dir); } if (old_pol)