From: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Date: Tue, 30 Apr 2013 16:40:43 +0000 (+0200)
Subject: netfilter: ipset: Sparse warning about shadowed variable fixed
X-Git-Tag: v3.13-rc1~105^2~227^2~28
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=b3aabd149c201a7c2a5f9ee673376948ae0724d8;p=~emulex%2Finfiniband.git

netfilter: ipset: Sparse warning about shadowed variable fixed

net/netfilter/ipset/ip_set_hash_ipportnet.c:275:20:
warning: symbol 'cidr' shadows an earlier one

Signed-off-by: Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
---

diff --git a/net/netfilter/ipset/ip_set_hash_ipportnet.c b/net/netfilter/ipset/ip_set_hash_ipportnet.c
index f15f3e28b9c..9a80d8bc9f1 100644
--- a/net/netfilter/ipset/ip_set_hash_ipportnet.c
+++ b/net/netfilter/ipset/ip_set_hash_ipportnet.c
@@ -272,7 +272,7 @@ hash_ipportnet4_uadt(struct ip_set *set, struct nlattr *tb[],
 		if (ip > ip_to)
 			swap(ip, ip_to);
 	} else if (tb[IPSET_ATTR_CIDR]) {
-		u8 cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
+		cidr = nla_get_u8(tb[IPSET_ATTR_CIDR]);
 
 		if (!cidr || cidr > 32)
 			return -IPSET_ERR_INVALID_CIDR;