From: "Guo-Fu Tseng" <cooldavid@cooldavid.org>
To: David Miller <davem@davemloft.net>
Cc: netdev@vger.kernel.org
Subject: [PATCH net-next-2.6]: tcpv6: fix error with CONFIG_TCP_MD5SIG disabled
Date: Fri, 10 Oct 2008 11:21:15 +0800 [thread overview]
Message-ID: <20081010031703.M9440@cooldavid.org> (raw)
In-Reply-To: <20081008.195524.235036900.davem@davemloft.net>
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 <cooldavid@cooldavid.org>
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)
next prev parent reply other threads:[~2008-10-10 3:21 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-09 2:55 [PATCH]: jme: Fix warnings with CONFIG_PM disabled David Miller
2008-10-09 5:07 ` Guo-Fu Tseng
2008-10-10 3:08 ` [PATCH net-next-2.6] nf_conntrack_ecache.h: Fix missing braces Guo-Fu Tseng
2008-10-10 4:10 ` David Miller
2008-10-10 3:21 ` Guo-Fu Tseng [this message]
2008-10-10 4:12 ` [PATCH net-next-2.6]: tcpv6: fix error with CONFIG_TCP_MD5SIG disabled David Miller
2008-10-10 17:06 ` Guo-Fu Tseng
2008-10-10 12:05 ` Ilpo Järvinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20081010031703.M9440@cooldavid.org \
--to=cooldavid@cooldavid.org \
--cc=davem@davemloft.net \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).