Subject: [PATCH net-next-2.6]: tcpv6: fix error with CONFIG_TCP_MD5SIG disabled

From: "Guo-Fu Tseng" <[email-masked]>
Date: Fri, 10 Oct 2008 11:21:15 +0800

Hi David:

    This patch fix error with CONFIG_TCP_MD5SIG disabled.

    The patch is also available at:
    http://cooldavid.org/download/tcpv6.net-next-2.6.20081010.patch

    Signed-off-by: Guo-Fu Tseng <[email-masked]>

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 13c6514..e5310c9 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/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)