aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2008-10-10 00:11:56 -0400
committerDavid S. Miller <davem@davemloft.net>2008-10-10 00:11:56 -0400
commitfa3e5b4eb8261ae6ee27922881093db973e9d640 (patch)
tree1e3f2c168ca9154bfc5d43fea97b548c50c825b6
parentbb21c95e2d3325fcb53c591686dbbf4068a165bc (diff)
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>
-rw-r--r--net/ipv6/tcp_ipv6.c6
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)
1036{ 1036{
1037 struct tcphdr *th = tcp_hdr(skb); 1037 struct tcphdr *th = tcp_hdr(skb);
1038 u32 seq = 0, ack_seq = 0; 1038 u32 seq = 0, ack_seq = 0;
1039#ifdef CONFIG_TCP_MD5SIG 1039 struct tcp_md5sig_key *key = NULL;
1040 struct tcp_md5sig_key *key;
1041#endif
1042 1040
1043 if (th->rst) 1041 if (th->rst)
1044 return; 1042 return;
@@ -1049,8 +1047,6 @@ static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb)
1049#ifdef CONFIG_TCP_MD5SIG 1047#ifdef CONFIG_TCP_MD5SIG
1050 if (sk) 1048 if (sk)
1051 key = tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr); 1049 key = tcp_v6_md5_do_lookup(sk, &ipv6_hdr(skb)->daddr);
1052 else
1053 key = NULL;
1054#endif 1050#endif
1055 1051
1056 if (th->ack) 1052 if (th->ack)