git: 2e97826052d1 - main - rack: Fix ECN on finalizing session.

Richard Scheffenegger rscheff at FreeBSD.org
Sat Apr 17 19:22:06 UTC 2021


The branch main has been updated by rscheff:

URL: https://cgit.FreeBSD.org/src/commit/?id=2e97826052d169f6e2e1d2f87b086f56d1cf2b0b

commit 2e97826052d169f6e2e1d2f87b086f56d1cf2b0b
Author:     Richard Scheffenegger <rscheff at FreeBSD.org>
AuthorDate: 2021-04-17 18:16:06 +0000
Commit:     Richard Scheffenegger <rscheff at FreeBSD.org>
CommitDate: 2021-04-17 18:16:42 +0000

    rack: Fix ECN on finalizing session.
    
    Maintain code similarity between RACK and base stack
    for ECN. This may not strictly be necessary, depending
    when a state transition to FIN_WAIT_1 is done in RACK
    after a shutdown() or close() syscall.
    
    MFC after: 3 days
    Reviewed By: tuexen, #transport
    Sponsored by: NetApp, Inc.
    Differential Revision: https://reviews.freebsd.org/D29658
---
 sys/netinet/tcp_stacks/rack.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sys/netinet/tcp_stacks/rack.c b/sys/netinet/tcp_stacks/rack.c
index beae1bf9cba7..0079bf8b6400 100644
--- a/sys/netinet/tcp_stacks/rack.c
+++ b/sys/netinet/tcp_stacks/rack.c
@@ -13438,7 +13438,7 @@ send:
 		flags |= TH_ECE;
 		tp->t_flags2 &= ~TF2_ECN_SND_ECE;
 	}
-	if (tp->t_state == TCPS_ESTABLISHED &&
+	if (TCPS_HAVEESTABLISHED(tp->t_state) &&
 	    (tp->t_flags2 & TF2_ECN_PERMIT)) {
 		/*
 		 * If the peer has ECN, mark data packets with ECN capable


More information about the dev-commits-src-all mailing list