commit a9f83bf3858672164ed531cbc60ee9082d21d53f
author YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Thu Apr 10 15:41:28 2008 +0900
committer YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org> Fri Apr 11 19:47:52 2008 +0900
tree d36f642eb38fd89b3e5cac6b1ca2bdf9d45ceac5
parent 02e10b90cd478bda81b4644102b0009bcd1d14ab

[IPV6]: Sparse: Reuse previous delaration where appropriate.

| net/ipv6/ipv6_sockglue.c:162:16: warning: symbol 'net' shadows an earlier one
| net/ipv6/ipv6_sockglue.c:111:13: originally declared here
| net/ipv6/ipv6_sockglue.c:175:16: warning: symbol 'net' shadows an earlier one
| net/ipv6/ipv6_sockglue.c:111:13: originally declared here
| net/ipv6/ip6mr.c:1241:10: warning: symbol 'ret' shadows an earlier one
| net/ipv6/ip6mr.c:1163:6: originally declared here

Signed-off-by: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>

net/ipv6/ip6mr.c

diff --git a/net/ipv6/ip6mr.c b/net/ipv6/ip6mr.c
index da673ef..4330421 100644
--- a/net/ipv6/ip6mr.c
+++ b/net/ipv6/ip6mr.c
@@ -1238,7 +1238,7 @@
 #ifdef CONFIG_IPV6_PIMSM_V2
 	case MRT6_PIM:
 	{
-		int v, ret;
+		int v;
 		if (get_user(v, (int __user *)optval))
 			return -EFAULT;
 		v = !!v;