]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tcpv6: fix option space offsets with md5
authorIlpo Järvinen <ilpo.jarvinen@helsinki.fi>
Wed, 8 Oct 2008 21:36:33 +0000 (14:36 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 7 Nov 2008 03:05:41 +0000 (19:05 -0800)
[ 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

index 10e22fd482225c0b49c17646fa0e347a6250904f..245cbc5898beb8a85600470ba1bf9d4d5cea987b 100644 (file)
@@ -1087,7 +1087,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