From patchwork Mon May 18 11:19:12 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rami Rosen X-Patchwork-Id: 27355 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id F09B6B7069 for ; Mon, 18 May 2009 21:19:21 +1000 (EST) Received: by ozlabs.org (Postfix) id CE7F8DE0A0; Mon, 18 May 2009 21:19:21 +1000 (EST) 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 30AA3DE09E for ; Mon, 18 May 2009 21:19:21 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753278AbZERLTN (ORCPT ); Mon, 18 May 2009 07:19:13 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752494AbZERLTN (ORCPT ); Mon, 18 May 2009 07:19:13 -0400 Received: from mail-ew0-f176.google.com ([209.85.219.176]:59671 "EHLO mail-ew0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751727AbZERLTM (ORCPT ); Mon, 18 May 2009 07:19:12 -0400 Received: by ewy24 with SMTP id 24so3966493ewy.37 for ; Mon, 18 May 2009 04:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:date:message-id:subject :from:to:content-type; bh=ma9W6km4JBNzX2XJk3a2kCyh/vyPuLsD6NoU3s2hXt0=; b=QuOmBRF0/qJCDgSJt4OWX9MmSoEk91UXl3wKJPr1G6cr0gRYnSeaX3ALVYdIjRPF8X XgVtPz8RZUefVghCoRK9ewmoupGXfEEA1iQJU5xMiZizgiFQNSJYIj3W0QxBx9Ur52X9 K3P+TSL/ra3AdDSkOH6ZvK3fy2/lTFWJDWJrg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:date:message-id:subject:from:to:content-type; b=xfGqaudaQ7eFRxGYGl0UwqusUrnT3lDqCQvSHQBh3H5eGXZI8fdrwApx/QaJMm1yxF E+Bp/+vuySpcFT/UAz2TwpzPES/F5mZDsIFFZcqg/aLvl9cRhsjKxpJcYT8j1jj5viuI gsfmatY/38txrsMRsWxShihj6vZh640zLtrj0= MIME-Version: 1.0 Received: by 10.210.30.1 with SMTP id d1mr7511737ebd.12.1242645552402; Mon, 18 May 2009 04:19:12 -0700 (PDT) Date: Mon, 18 May 2009 14:19:12 +0300 Message-ID: Subject: [PATCH net-next-2.6] ipv4: cleanup - remove two unused parameters from fib_semantic_match(). From: Rami Rosen To: David Miller , netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, This patch removes two unused parameters from fib_semantic_match() (net/ipv4/fib_semantics.c). Regards, Rami Rosen Signed-off-by: Rami Rosen diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c index ded8c44..ecd3945 100644 --- a/net/ipv4/fib_hash.c +++ b/net/ipv4/fib_hash.c @@ -263,7 +263,6 @@ fn_hash_lookup(struct fib_table *tb, const struct flowi *flp, struct fib_result err = fib_semantic_match(&f->fn_alias, flp, res, - f->fn_key, fz->fz_mask, fz->fz_order); if (err <= 0) goto out; diff --git a/net/ipv4/fib_lookup.h b/net/ipv4/fib_lookup.h index 2c1623d..637b133 100644 --- a/net/ipv4/fib_lookup.h +++ b/net/ipv4/fib_lookup.h @@ -22,8 +22,7 @@ struct fib_alias { /* Exported by fib_semantics.c */ extern int fib_semantic_match(struct list_head *head, const struct flowi *flp, - struct fib_result *res, __be32 zone, __be32 mask, - int prefixlen); + struct fib_result *res, int prefixlen); extern void fib_release_info(struct fib_info *); extern struct fib_info *fib_create_info(struct fib_config *cfg); extern int fib_nh_match(struct fib_config *cfg, struct fib_info *fi); diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index f831df5..9b096d6 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c @@ -866,8 +866,7 @@ failure: /* Note! fib_semantic_match intentionally uses RCU list functions. */ int fib_semantic_match(struct list_head *head, const struct flowi *flp, - struct fib_result *res, __be32 zone, __be32 mask, - int prefixlen) + struct fib_result *res, int prefixlen) { struct fib_alias *fa; int nh_sel = 0; diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index ec0ae49..9070d11 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1347,8 +1347,7 @@ static int check_leaf(struct trie *t, struct leaf *l, if (l->key != (key & ntohl(mask))) continue; - err = fib_semantic_match(&li->falh, flp, res, - htonl(l->key), mask, plen); + err = fib_semantic_match(&li->falh, flp, res, plen); #ifdef CONFIG_IP_FIB_TRIE_STATS if (err <= 0)