From 1ddfa8947767d875b680fda50c6afce58fe8c9a6 Mon Sep 17 00:00:00 2001
From: YOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Date: Thu, 10 Apr 2008 15:41:28 +0900
Subject: [PATCH] --- yaml --- r: 90629 b: refs/heads/master c:
 a9f83bf3858672164ed531cbc60ee9082d21d53f h: refs/heads/master i:   90627:
 e08f099d027596e2c2e6124511e9db3359633147 v: v3

---
 [refs]                         | 2 +-
 trunk/net/ipv6/ip6mr.c         | 2 +-
 trunk/net/ipv6/ipv6_sockglue.c | 3 ---
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 900290d77244..bb8107edd5a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02e10b90cd478bda81b4644102b0009bcd1d14ab
+refs/heads/master: a9f83bf3858672164ed531cbc60ee9082d21d53f
diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c
index da673ef75e12..433042114148 100644
--- a/trunk/net/ipv6/ip6mr.c
+++ b/trunk/net/ipv6/ip6mr.c
@@ -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;
diff --git a/trunk/net/ipv6/ipv6_sockglue.c b/trunk/net/ipv6/ipv6_sockglue.c
index 99624109c010..bf9695375219 100644
--- a/trunk/net/ipv6/ipv6_sockglue.c
+++ b/trunk/net/ipv6/ipv6_sockglue.c
@@ -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;