From patchwork Sat Feb 14 21:15:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hannes Eder X-Patchwork-Id: 23161 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 E0AE1DDDA2 for ; Sun, 15 Feb 2009 08:17:12 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754800AbZBNVQA (ORCPT ); Sat, 14 Feb 2009 16:16:00 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754780AbZBNVP5 (ORCPT ); Sat, 14 Feb 2009 16:15:57 -0500 Received: from mu-out-0910.google.com ([209.85.134.187]:33539 "EHLO mu-out-0910.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754240AbZBNVPz (ORCPT ); Sat, 14 Feb 2009 16:15:55 -0500 Received: by mu-out-0910.google.com with SMTP id i10so699081mue.1 for ; Sat, 14 Feb 2009 13:15:53 -0800 (PST) Received: by 10.103.227.13 with SMTP id e13mr2091291mur.20.1234646152856; Sat, 14 Feb 2009 13:15:52 -0800 (PST) Received: from vmbox.hanneseder.net (chello080109038207.17.14.tuwien.teleweb.at [80.109.38.207]) by mx.google.com with ESMTPS id e8sm1428497muf.29.2009.02.14.13.15.50 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 14 Feb 2009 13:15:52 -0800 (PST) Received: by vmbox.hanneseder.net (sSMTP sendmail emulation); Sat, 14 Feb 2009 22:15:49 +0100 From: Hannes Eder Subject: [PATCH 15/43] drivers/net/bonding: fix sparse warning: symbol shadows an earlier one To: netdev@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Date: Sat, 14 Feb 2009 22:15:49 +0100 Message-ID: <20090214211541.23489.33717.stgit@vmbox.hanneseder.net> In-Reply-To: <20090214210940.23489.95001.stgit@vmbox.hanneseder.net> References: <20090214210940.23489.95001.stgit@vmbox.hanneseder.net> User-Agent: StGit/0.14.3.348.gcb02 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Impact: Rename function scope variable. Fix this sparse warning: drivers/net/bonding/bond_main.c:4704:13: warning: symbol 'mode' shadows an earlier one drivers/net/bonding/bond_main.c:95:13: originally declared here Signed-off-by: Hannes Eder --- drivers/net/bonding/bond_main.c | 6 +++--- 1 files changed, 3 insertions(+), 3 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 diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 45f6d6a..c5abd17 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c @@ -4701,7 +4701,7 @@ static void bond_free_all(void) */ int bond_parse_parm(const char *buf, const struct bond_parm_tbl *tbl) { - int mode = -1, i, rv; + int modeint = -1, i, rv; char *p, modestr[BOND_MAX_MODENAME_LEN + 1] = { 0, }; for (p = (char *)buf; *p; p++) @@ -4711,13 +4711,13 @@ int bond_parse_parm(const char *buf, const struct bond_parm_tbl *tbl) if (*p) rv = sscanf(buf, "%20s", modestr); else - rv = sscanf(buf, "%d", &mode); + rv = sscanf(buf, "%d", &modeint); if (!rv) return -1; for (i = 0; tbl[i].modename; i++) { - if (mode == tbl[i].mode) + if (modeint == tbl[i].mode) return tbl[i].mode; if (strcmp(modestr, tbl[i].modename) == 0) return tbl[i].mode;