diff options
| author | Guo-Fu Tseng <cooldavid@cooldavid.org> | 2008-10-09 21:11:56 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-09 21:11:56 -0700 |
| commit | fa3e5b4eb8261ae6ee27922881093db973e9d640 (patch) | |
| tree | 1e3f2c168ca9154bfc5d43fea97b548c50c825b6 /net | |
| parent | bb21c95e2d3325fcb53c591686dbbf4068a165bc (diff) | |
| download | linux-stable-fa3e5b4eb8261ae6ee27922881093db973e9d640.tar.gz linux-stable-fa3e5b4eb8261ae6ee27922881093db973e9d640.tar.bz2 linux-stable-fa3e5b4eb8261ae6ee27922881093db973e9d640.zip | |
tcpv6: fix error with CONFIG_TCP_MD5SIG disabled
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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/tcp_ipv6.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 13c65144a00a..e5310c9b84dc 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) |