1 files changed, 19 insertions, 13 deletions

diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c
index 8e42e8f54b70..aeb9497b5bb7 100644
--- a/net/ipv6/tcp_ipv6.c
+++ b/net/ipv6/tcp_ipv6.c
@@ -101,12 +101,18 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb)
         }
 }
 
-static u32 tcp_v6_init_seq_and_tsoff(const struct sk_buff *skb, u32 *tsoff)
+static u32 tcp_v6_init_seq(const struct sk_buff *skb)
 {
-        return secure_tcpv6_seq_and_tsoff(ipv6_hdr(skb)->daddr.s6_addr32,
-                                          ipv6_hdr(skb)->saddr.s6_addr32,
-                                          tcp_hdr(skb)->dest,
-                                          tcp_hdr(skb)->source, tsoff);
+        return secure_tcpv6_seq(ipv6_hdr(skb)->daddr.s6_addr32,
+                                ipv6_hdr(skb)->saddr.s6_addr32,
+                                tcp_hdr(skb)->dest,
+                                tcp_hdr(skb)->source);
+}
+
+static u32 tcp_v6_init_ts_off(const struct sk_buff *skb)
+{
+        return secure_tcpv6_ts_off(ipv6_hdr(skb)->daddr.s6_addr32,
+                                   ipv6_hdr(skb)->saddr.s6_addr32);
 }
 
 static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
@@ -122,7 +128,6 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         struct flowi6 fl6;
         struct dst_entry *dst;
         int addr_type;
-        u32 seq;
         int err;
         struct inet_timewait_death_row *tcp_death_row = &sock_net(sk)->ipv4.tcp_death_row;
 
@@ -282,13 +287,13 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr,
         sk_set_txhash(sk);
 
         if (likely(!tp->repair)) {
-                seq = secure_tcpv6_seq_and_tsoff(np->saddr.s6_addr32,
-                                                 sk->sk_v6_daddr.s6_addr32,
-                                                 inet->inet_sport,
-                                                 inet->inet_dport,
-                                                 &tp->tsoffset);
                 if (!tp->write_seq)
-                        tp->write_seq = seq;
+                        tp->write_seq = secure_tcpv6_seq(np->saddr.s6_addr32,
+                                                         sk->sk_v6_daddr.s6_addr32,
+                                                         inet->inet_sport,
+                                                         inet->inet_dport);
+                tp->tsoffset = secure_tcpv6_ts_off(np->saddr.s6_addr32,
+                                                   sk->sk_v6_daddr.s6_addr32);
         }
 
         if (tcp_fastopen_defer_connect(sk, &err))
@@ -749,7 +754,8 @@ static const struct tcp_request_sock_ops tcp_request_sock_ipv6_ops = {
         .cookie_init_seq =      cookie_v6_init_sequence,
 #endif
         .route_req      =       tcp_v6_route_req,
-        .init_seq_tsoff =       tcp_v6_init_seq_and_tsoff,
+        .init_seq       =       tcp_v6_init_seq,
+        .init_ts_off    =       tcp_v6_init_ts_off,
         .send_synack    =       tcp_v6_send_synack,
 };