tcpv6: fix error with CONFIG_TCP_MD5SIG disabled
authorGuo-Fu Tseng <cooldavid@cooldavid.org>
Fri, 10 Oct 2008 04:11:56 +0000 (21:11 -0700)
committerDavid S. Miller <davem@davemloft.net>
Fri, 10 Oct 2008 04:11:56 +0000 (21:11 -0700)
This patch fix error with CONFIG_TCP_MD5SIG disabled.

Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/tcp_ipv6.c

index 13c65144a00a6a2442d2e351564623a79b41b334..e5310c9b84dcb2216f1db0b21ab92c3ed7a222b7 100644 (file)
@@ -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)