From patchwork Wed May 20 11:07:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rami Rosen X-Patchwork-Id: 27453 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 3324AB6F56 for ; Wed, 20 May 2009 21:07:31 +1000 (EST) Received: by ozlabs.org (Postfix) id 243B5DE154; Wed, 20 May 2009 21:07:31 +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 843E5DE14C for ; Wed, 20 May 2009 21:07:30 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753988AbZETLHX (ORCPT ); Wed, 20 May 2009 07:07:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753980AbZETLHW (ORCPT ); Wed, 20 May 2009 07:07:22 -0400 Received: from ey-out-2122.google.com ([74.125.78.26]:61741 "EHLO ey-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753715AbZETLHV (ORCPT ); Wed, 20 May 2009 07:07:21 -0400 Received: by ey-out-2122.google.com with SMTP id 9so115763eyd.37 for ; Wed, 20 May 2009 04:07:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:cc:content-type; bh=2gFLQAmXxKVa5vxiXXBIQWuphslgacEHPGz8Lwh5w7c=; b=hAL4fzzPhawc4LXBZMGsblzwJQmTjbakQ3krf8uTnVkx4g4Swnm+joBYUbPBo/sLcB sHTMKX1qZwQdf7FifsDnjv9OPjUPRmpGM9ORGcKZx/zgPvrVALWueTKQ+LkCbFvHX8Rs pnzsepFRygYwgAWsoX6+1KupdxhY1jRcGoaY0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; b=mb4cA6aeKW26drOVIHCQExDDlEH/nqUgRXv5dEyTFI+MVBWn7aa7fwb3yGOHKc4gsx p9frio/hDxd5lcBMqvZCZ97Wa9joTq8DLzwsqNNWEJFZ88XXEnizGYHrwkEJYJPp1kS5 AeCDDWmLLPSfxl/dP9MEasks+yFbJo4sQoDJg= MIME-Version: 1.0 Received: by 10.216.46.194 with SMTP id r44mr247379web.20.1242817641367; Wed, 20 May 2009 04:07:21 -0700 (PDT) In-Reply-To: <4A13A9F6.7080800@cosmosbay.com> References: <20090519.151857.56095864.davem@davemloft.net> <4A13A9F6.7080800@cosmosbay.com> Date: Wed, 20 May 2009 14:07:21 +0300 Message-ID: Subject: Re: [PATCH net-next-2.6] cleanup: remove unused parameter from fill method in fib_rules_ops. From: Rami Rosen To: David Miller Cc: netdev@vger.kernel.org, Eric Dumazet Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Hi, Yes, you are right; sorry again! (running "git apply --check --whitespace=error-all diff" did not reveal what you mention, but you are right). I hope that the attached patch is fully correct now. The netlink message header (struct nlmsghdr) is an unused parameter in fill method of fib_rules_ops struct. This patch removes this parameter from this method and fixes the places where this method is called. (include/net/fib_rules.h) Regards, Rami Rosen Signed-off-by: Rami Rosen diff --git a/include/net/fib_rules.h b/include/net/fib_rules.h index b9b6339..ca4b2e8 100644 --- a/include/net/fib_rules.h +++ b/include/net/fib_rules.h @@ -54,7 +54,6 @@ struct fib_rules_ops struct fib_rule_hdr *, struct nlattr **); int (*fill)(struct fib_rule *, struct sk_buff *, - struct nlmsghdr *, struct fib_rule_hdr *); u32 (*default_pref)(struct fib_rules_ops *ops); size_t (*nlmsg_payload)(struct fib_rule *); diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c index 17d9f49..bd30938 100644 --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -500,7 +500,7 @@ static int fib_nl_fill_rule(struct sk_buff *skb, struct fib_rule *rule, if (rule->target) NLA_PUT_U32(skb, FRA_GOTO, rule->target); - if (ops->fill(rule, skb, nlh, frh) < 0) + if (ops->fill(rule, skb, frh) < 0) goto nla_put_failure; return nlmsg_end(skb, nlh); diff --git a/net/decnet/dn_rules.c b/net/decnet/dn_rules.c index a2690b1..d70dcb5 100644 --- a/net/decnet/dn_rules.c +++ b/net/decnet/dn_rules.c @@ -192,7 +192,7 @@ unsigned dnet_addr_type(__le16 addr) } static int dn_fib_rule_fill(struct fib_rule *rule, struct sk_buff *skb, - struct nlmsghdr *nlh, struct fib_rule_hdr *frh) + struct fib_rule_hdr *frh) { struct dn_fib_rule *r = (struct dn_fib_rule *)rule; diff --git a/net/ipv4/fib_rules.c b/net/ipv4/fib_rules.c index 38904be..42e7ad5 100644 --- a/net/ipv4/fib_rules.c +++ b/net/ipv4/fib_rules.c @@ -209,7 +209,7 @@ static int fib4_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh, } static int fib4_rule_fill(struct fib_rule *rule, struct sk_buff *skb, - struct nlmsghdr *nlh, struct fib_rule_hdr *frh) + struct fib_rule_hdr *frh) { struct fib4_rule *rule4 = (struct fib4_rule *) rule; diff --git a/net/ipv6/fib6_rules.c b/net/ipv6/fib6_rules.c index e1a36db..00a7a5e 100644 --- a/net/ipv6/fib6_rules.c +++ b/net/ipv6/fib6_rules.c @@ -211,7 +211,7 @@ static int fib6_rule_compare(struct fib_rule *rule, struct fib_rule_hdr *frh, } static int fib6_rule_fill(struct fib_rule *rule, struct sk_buff *skb, - struct nlmsghdr *nlh, struct fib_rule_hdr *frh) + struct fib_rule_hdr *frh) { struct fib6_rule *rule6 = (struct fib6_rule *) rule;