[IPV6]: Sparse: Reuse previous delaration where appropriate.
authorYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Thu, 10 Apr 2008 06:41:28 +0000 (15:41 +0900)
committerYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Fri, 11 Apr 2008 10:47:52 +0000 (19:47 +0900)
| 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
net/ipv6/ipv6_sockglue.c

index da673ef75e125e91ab7b3f4b2ff45e95e0e4dbcc..433042114148e0fa1cd42946075d845d3990d14f 100644 (file)
@@ -1238,7 +1238,7 @@ int ip6_mroute_setsockopt(struct sock *sk, int optname, char __user *optval, int
 #ifdef CONFIG_IPV6_PIMSM_V2
        case MRT6_PIM:
        {
-               int v, ret;
+               int v;
                if (get_user(v, (int __user *)optval))
                        return -EFAULT;
                v = !!v;
index 99624109c01026dd8e9f826582d36319df492caa..bf96953752199ef42de94779f2d4d6050c25b21f 100644 (file)
@@ -159,8 +159,6 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
 
                        if (sk->sk_protocol == IPPROTO_TCP) {
                                struct inet_connection_sock *icsk = inet_csk(sk);
-                               struct net *net = sock_net(sk);
-
                                local_bh_disable();
                                sock_prot_inuse_add(net, sk->sk_prot, -1);
                                sock_prot_inuse_add(net, &tcp_prot, 1);
@@ -172,7 +170,6 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname,
                                tcp_sync_mss(sk, icsk->icsk_pmtu_cookie);
                        } else {
                                struct proto *prot = &udp_prot;
-                               struct net *net = sock_net(sk);
 
                                if (sk->sk_protocol == IPPROTO_UDPLITE)
                                        prot = &udplite_prot;