diff options
author | Ilpo Järvinen <ilpo.jarvinen@helsinki.fi> | 2008-10-08 23:36:33 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-10-08 23:36:33 +0200 |
commit | 53b125779fb0b29e5b316bf3dc7d199e6dcea567 (patch) | |
tree | 1c6ba910a930b686662be302d0358044403b5cd1 /net/ipv6 | |
parent | Merge branch 'lvs-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
download | linux-53b125779fb0b29e5b316bf3dc7d199e6dcea567.tar.xz linux-53b125779fb0b29e5b316bf3dc7d199e6dcea567.zip |
tcpv6: fix option space offsets with md5
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>
Diffstat (limited to 'net/ipv6')
-rw-r--r-- | net/ipv6/tcp_ipv6.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index e8b0fdd9edb8..dd7bdde7bddc 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c @@ -1088,7 +1088,7 @@ static void tcp_v6_send_ack(struct sk_buff *skb, u32 seq, u32 ack, u32 win, u32 *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 |