From 265f65dcf9aab0f9e974434ab650aa932aaa40c2 Mon Sep 17 00:00:00 2001
From: Guo-Fu Tseng <cooldavid@cooldavid.org>
Date: Thu, 9 Oct 2008 21:11:56 -0700
Subject: [PATCH] --- yaml --- r: 112245 b: refs/heads/master c:
 fa3e5b4eb8261ae6ee27922881093db973e9d640 h: refs/heads/master i:   112243:
 45f3ef025078bc7d1a3ba111147669a45faf5e10 v: v3

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

diff --git a/[refs] b/[refs]
index 2d84752eb5c8..d3ef5e06669a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb21c95e2d3325fcb53c591686dbbf4068a165bc
+refs/heads/master: fa3e5b4eb8261ae6ee27922881093db973e9d640
diff --git a/trunk/net/ipv6/tcp_ipv6.c b/trunk/net/ipv6/tcp_ipv6.c
index 13c65144a00a..e5310c9b84dc 100644
--- a/trunk/net/ipv6/tcp_ipv6.c
+++ b/trunk/net/ipv6/tcp_ipv6.c
@@ -1036,9 +1036,7 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
 {
 	struct tcphdr *th = tcp_hdr(skb);
 	u32 seq = 0, ack_seq = 0;
-#ifdef CONFIG_TCP_MD5SIG
-	struct tcp_md5sig_key *key;
-#endif
+	struct tcp_md5sig_key *key = NULL;
 
 	if (th->rst)
 		return;
@@ -1049,8 +1047,6 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
 #ifdef CONFIG_TCP_MD5SIG
 	if (sk)
 		key = tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr);
-	else
-		key = NULL;
 #endif
 
 	if (th->ack)