From patchwork Sun Jul 19 18:38:40 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerrit Renker X-Patchwork-Id: 29988 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 17D04B7080 for ; Mon, 20 Jul 2009 04:39:01 +1000 (EST) Received: by ozlabs.org (Postfix) id 0B5B3DDD01; Mon, 20 Jul 2009 04:39:01 +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 892B5DDD0B for ; Mon, 20 Jul 2009 04:39:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751459AbZGSSi4 (ORCPT ); Sun, 19 Jul 2009 14:38:56 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751258AbZGSSi4 (ORCPT ); Sun, 19 Jul 2009 14:38:56 -0400 Received: from dee.erg.abdn.ac.uk ([139.133.204.82]:54994 "EHLO erg.abdn.ac.uk" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751459AbZGSSiz (ORCPT ); Sun, 19 Jul 2009 14:38:55 -0400 Received: from laptev.erg.abdn.ac.uk (Debian-exim@ra-gerrit.erg.abdn.ac.uk [139.133.204.38]) by erg.abdn.ac.uk (8.13.4/8.13.4) with ESMTP id n6JIcf5E026052 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Sun, 19 Jul 2009 19:38:42 +0100 (BST) Received: from root by laptev.erg.abdn.ac.uk with local (Exim 4.69) (envelope-from ) id 1MSbHW-0006JW-0T; Sun, 19 Jul 2009 20:38:42 +0200 From: Gerrit Renker To: davem@davemloft.net Cc: netdev@vger.kernel.org, Gerrit Renker Subject: [RFC][PATCH 1/2] mcastv6: Local variable shadows function argument Date: Sun, 19 Jul 2009 20:38:40 +0200 Message-Id: <1248028721-24244-2-git-send-email-gerrit@erg.abdn.ac.uk> X-Mailer: git-send-email 1.6.0.rc2 In-Reply-To: <1248028721-24244-1-git-send-email-gerrit@erg.abdn.ac.uk> References: <1248028721-24244-1-git-send-email-gerrit@erg.abdn.ac.uk> X-ERG-MailScanner: Found to be clean X-ERG-MailScanner-From: root@erg.abdn.ac.uk X-Spam-Status: No Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The local variable 'idev' shadows the function argument 'idev' to ip6_mc_add_src(). Reported-by: Gerrit Renker --- net/ipv6/mcast.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- a/net/ipv6/mcast.c +++ b/net/ipv6/mcast.c @@ -2107,7 +2107,6 @@ static int ip6_mc_add_src(struct inet6_d for (j=0; jmca_sfcount[MCAST_EXCLUDE] != 0)) { - struct inet6_dev *idev = pmc->idev; struct ip6_sf_list *psf; /* filter mode change */ @@ -2117,11 +2116,11 @@ static int ip6_mc_add_src(struct inet6_d pmc->mca_sfmode = MCAST_INCLUDE; /* else no filters; keep old mode for reports */ - pmc->mca_crcount = idev->mc_qrv; - idev->mc_ifc_count = pmc->mca_crcount; + pmc->mca_crcount = pmc->idev->mc_qrv; + pmc->idev->mc_ifc_count = pmc->mca_crcount; for (psf=pmc->mca_sources; psf; psf = psf->sf_next) psf->sf_crcount = 0; - mld_ifc_event(idev); + mld_ifc_event(pmc->idev); } else if (sf_setstate(pmc)) mld_ifc_event(idev); spin_unlock_bh(&pmc->mca_lock);