AW: git: 84761f3df508 - main - Adjust line length in tcp_prr_partialack

[Scheffenegger, Richard]

Let's discuss this during the next @transport call on thursday; I would want to hold off for next weekend at least for the MFC to apply all related patches in close succession. (and quite frankly didn't think about it)


Richard Scheffenegger

-----Ursprüngliche Nachricht-----
Von: Michael Tuexen <Michael.Tuexen at macmic.franken.de> 
Gesendet: Dienstag, 26. Jänner 2021 17:09
An: Richard Scheffenegger <rscheff at FreeBSD.org>
Cc: src-committers at freebsd.org; dev-commits-src-all at freebsd.org; dev-commits-src-main at freebsd.org
Betreff: Re: git: 84761f3df508 - main - Adjust line length in tcp_prr_partialack

NetApp Security WARNING: This is an external email. Do not click links or open attachments unless you recognize the sender and know the content is safe.




> On 26. Jan 2021, at 16:01, Richard Scheffenegger <rscheff at FreeBSD.org> wrote:
>
> The branch main has been updated by rscheff:
>
> URL: 
> https://cgit.FreeBSD.org/src/commit/?id=84761f3df508aed50783b60f028af9
> d98a684b41
>
> commit 84761f3df508aed50783b60f028af9d98a684b41
> Author:     Richard Scheffenegger <rscheff at FreeBSD.org>
> AuthorDate: 2021-01-26 13:47:19 +0000
> Commit:     Richard Scheffenegger <rscheff at FreeBSD.org>
> CommitDate: 2021-01-26 13:47:19 +0000
>
>    Adjust line length in tcp_prr_partialack
>
>    Summary:
>    Wrap lines before column 80 in new prr code checked in recently.
>
>    No functional changes.
>
>    Reviewers: tuexen, rrs, jtl, mm, kbowling, #transport
>
>    Reviewed By: tuexen, mm, #transport
>
>    Subscribers: imp, melifaro
>
>    Differential Revision: https://reviews.freebsd.org/D28329
Any plans to MFC this to stable/13?

Best regards
Michael
> ---
> sys/netinet/tcp_input.c | 13 ++++++++-----
> 1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 
> 75718352da00..4b8f91ed9d0b 100644
> --- a/sys/netinet/tcp_input.c
> +++ b/sys/netinet/tcp_input.c
> @@ -3949,14 +3949,17 @@ tcp_prr_partialack(struct tcpcb *tp, struct tcphdr *th)
>        * Proportional Rate Reduction
>        */
>       if (pipe > tp->snd_ssthresh)
> -             snd_cnt = (tp->sackhint.prr_delivered * tp->snd_ssthresh / tp->sackhint.recover_fs) -
> -                 tp->sackhint.sack_bytes_rexmit;
> +             snd_cnt = (tp->sackhint.prr_delivered * tp->snd_ssthresh /
> +                 tp->sackhint.recover_fs) - 
> + tp->sackhint.sack_bytes_rexmit;
>       else {
>               if (V_tcp_do_prr_conservative)
> -                     limit = tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit;
> +                     limit = tp->sackhint.prr_delivered -
> +                         tp->sackhint.sack_bytes_rexmit;
>               else
> -                     if ((tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit) > del_data)
> -                             limit = tp->sackhint.prr_delivered - tp->sackhint.sack_bytes_rexmit + maxseg;
> +                     if ((tp->sackhint.prr_delivered -
> +                         tp->sackhint.sack_bytes_rexmit) > del_data)
> +                             limit = tp->sackhint.prr_delivered -
> +                                 tp->sackhint.sack_bytes_rexmit + 
> + maxseg;
>                       else
>                               limit = del_data + maxseg;
>               snd_cnt = min((tp->snd_ssthresh - pipe), limit);