From 4c9ed1b5bfde286c38cf6e2d9b5e80ac73a8f0de Mon Sep 17 00:00:00 2001
From: Neal Cardwell <ncardwell@google.com>
Date: Mon, 22 Oct 2012 21:41:48 +0000
Subject: [PATCH] --- yaml --- r: 340461 b: refs/heads/master c:
 f3f121359caa069cefbc48008e94bcd862ca21e2 h: refs/heads/master i:   340459:
 2581c74644e21c3d0a4af5a8b4e9446d32a0345a v: v3

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

diff --git a/[refs] b/[refs]
index 9a95653d6439..dc1ddfaad426 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 598e74f32c6dd4b3dd0ed382c889be07a7c6cbc0
+refs/heads/master: f3f121359caa069cefbc48008e94bcd862ca21e2
diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
index 26175bffbaa0..bb6782e84996 100644
--- a/trunk/net/ipv6/tcp_ipv6.c
+++ b/trunk/net/ipv6/tcp_ipv6.c
@@ -1741,11 +1741,11 @@ static void tcp_v6_early_demux(struct sk_buff *skb)
 		skb->destructor = sock_edemux;
 		if (sk->sk_state != TCP_TIME_WAIT) {
 			struct dst_entry *dst = sk->sk_rx_dst;
-			struct inet_sock *icsk = inet_sk(sk);
+
 			if (dst)
 				dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie);
 			if (dst &&
-			    icsk->rx_dst_ifindex == skb->skb_iif)
+			    inet_sk(sk)->rx_dst_ifindex == skb->skb_iif)
 				skb_dst_set_noref(skb, dst);
 		}
 	}