Re: [PATCH 1/2] tcp: setup random timestamp offset when write_seq already set

[David Miller]

From: Alexey Kodanev <alexey.koda...@oracle.com>
Date: Sat, 18 Feb 2017 03:56:11 +0300

> @@ -232,12 +232,17 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr 
> *uaddr, int addr_len)
>       sk->sk_gso_type = SKB_GSO_TCPV4;
>       sk_setup_caps(sk, &rt->dst);
>  
> -     if (!tp->write_seq && likely(!tp->repair))
> +     if (!tp->write_seq && likely(!tp->repair)) {
>               tp->write_seq = secure_tcp_sequence_number(inet->inet_saddr,
>                                                          inet->inet_daddr,
>                                                          inet->inet_sport,
>                                                          usin->sin_port,
>                                                          &tp->tsoffset);
> +     } else if (likely(!tp->repair)) {
> +             secure_tcp_sequence_number(inet->inet_saddr, inet->inet_daddr,
> +                                        inet->inet_sport, usin->sin_port,
> +                                        &tp->tsoffset);
> +     }

This would be so much easier to understand if it were coded as:

        if (!tp->repair) {
                seq = secure_tcp_sequence_number(...);
                if (!tp->write_seq)
                        tp->write_seq = seq;
        }