]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
drivers/net/bonding: fix sparse warning: symbol shadows an earlier one
authorHannes Eder <hannes@hanneseder.net>
Sat, 14 Feb 2009 11:15:49 +0000 (11:15 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Feb 2009 01:26:08 +0000 (17:26 -0800)
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 <hannes@hanneseder.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index d7695d43158b3b42630a230b8d5933d3e4c3ec7e..2c96b93b12a5780209bf0c5a894c30903d1175c3 100644 (file)
@@ -4732,7 +4732,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++)
@@ -4742,13 +4742,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;