| From 3f38c6ec1cf177b95bcdf02e17d6ddeeac048bad Mon Sep 17 00:00:00 2001 |
| From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> |
| Date: Wed, 8 Oct 2008 14:36:33 -0700 |
| Subject: tcpv6: fix option space offsets with md5 |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=utf-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> |
| |
| [ Upstream commit 53b125779fb0b29e5b316bf3dc7d199e6dcea567 ] |
| |
| More breakage :-), part of timestamps just were previously |
| overwritten. |
| |
| Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/ipv6/tcp_ipv6.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/ipv6/tcp_ipv6.c |
| +++ b/net/ipv6/tcp_ipv6.c |
| @@ -1087,7 +1087,7 @@ static void tcp_v6_send_ack(struct sk_bu |
| *topt++ = htonl((TCPOPT_NOP << 24) | (TCPOPT_NOP << 16) | |
| (TCPOPT_TIMESTAMP << 8) | TCPOLEN_TIMESTAMP); |
| *topt++ = htonl(tcp_time_stamp); |
| - *topt = htonl(ts); |
| + *topt++ = htonl(ts); |
| } |
| |
| #ifdef CONFIG_TCP_MD5SIG |
