From patchwork Fri Oct 10 03:21:15 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guo-Fu Tseng X-Patchwork-Id: 3679 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 52B10DDED4 for ; Fri, 10 Oct 2008 14:23:57 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751519AbYJJDVv (ORCPT ); Thu, 9 Oct 2008 23:21:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751499AbYJJDVv (ORCPT ); Thu, 9 Oct 2008 23:21:51 -0400 Received: from 220-133-139-86.HINET-IP.hinet.net ([220.133.139.86]:36851 "EHLO cooldavid.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbYJJDVu (ORCPT ); Thu, 9 Oct 2008 23:21:50 -0400 Received: from cooldavid.org (localhost [127.0.0.1]) by cooldavid.org (Postfix) with ESMTP id 4A98767A51; Fri, 10 Oct 2008 11:21:15 +0800 (CST) From: "Guo-Fu Tseng" To: David Miller Cc: netdev@vger.kernel.org Reply-To: cooldavid@cooldavid.org Subject: [PATCH net-next-2.6]: tcpv6: fix error with CONFIG_TCP_MD5SIG disabled Date: Fri, 10 Oct 2008 11:21:15 +0800 Message-Id: <20081010031703.M9440@cooldavid.org> In-Reply-To: <20081008.195524.235036900.davem@davemloft.net> References: <20081008.195524.235036900.davem@davemloft.net> X-Mailer: Open WebMail 2.51 20050228 X-OriginatingIP: 140.117.194.21 (cooldavid) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 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) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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)