2020-01-02 14:08:59

by Mao Wenan

Subject: [PATCH net-next] tcp: use REXMIT_NEW instead of magic number

REXMIT_NEW is a macro for "FRTO-style
transmit of unsent/new packets", this patch
makes it more readable.

Signed-off-by: Mao Wenan <[email protected]>
---
net/ipv4/tcp_input.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
index 88b987ca9ebb..1d1e3493965f 100644
--- a/net/ipv4/tcp_input.c
+++ b/net/ipv4/tcp_input.c
@@ -3550,7 +3550,7 @@ static void tcp_xmit_recovery(struct sock *sk, int rexmit)
if (rexmit == REXMIT_NONE || sk->sk_state == TCP_SYN_SENT)
return;

- if (unlikely(rexmit == 2)) {
+ if (unlikely(rexmit == REXMIT_NEW)) {
__tcp_push_pending_frames(sk, tcp_current_mss(sk),
TCP_NAGLE_OFF);
if (after(tp->snd_nxt, tp->high_seq))
--
2.20.1

2020-01-02 16:46:59

by Neal Cardwell

Subject: Re: [PATCH net-next] tcp: use REXMIT_NEW instead of magic number

On Thu, Jan 2, 2020 at 9:07 AM Mao Wenan <[email protected]> wrote:
>
> REXMIT_NEW is a macro for "FRTO-style
> transmit of unsent/new packets", this patch
> makes it more readable.
>
> Signed-off-by: Mao Wenan <[email protected]>
> ---
> net/ipv4/tcp_input.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c
> index 88b987ca9ebb..1d1e3493965f 100644
> --- a/net/ipv4/tcp_input.c
> +++ b/net/ipv4/tcp_input.c
> @@ -3550,7 +3550,7 @@ static void tcp_xmit_recovery(struct sock *sk, int rexmit)
> if (rexmit == REXMIT_NONE || sk->sk_state == TCP_SYN_SENT)
> return;
>
> - if (unlikely(rexmit == 2)) {
> + if (unlikely(rexmit == REXMIT_NEW)) {
> __tcp_push_pending_frames(sk, tcp_current_mss(sk),
> TCP_NAGLE_OFF);
> if (after(tp->snd_nxt, tp->high_seq))
> --

Acked-by: Neal Cardwell <[email protected]>

Thanks for sending this patch!

neal

2020-01-03 00:38:36

by David Miller

Subject: Re: [PATCH net-next] tcp: use REXMIT_NEW instead of magic number

From: Mao Wenan <[email protected]>
Date: Thu, 2 Jan 2020 22:02:27 +0800

> REXMIT_NEW is a macro for "FRTO-style
> transmit of unsent/new packets", this patch
> makes it more readable.
>
> Signed-off-by: Mao Wenan <[email protected]>

Applied.