git: 9b1219b24a5a - stable/13 - tcp: fix RACK and BBR when using VIMAGE enabled kernel

[Michael Tuexen]

The branch stable/13 has been updated by tuexen:

URL: https://cgit.FreeBSD.org/src/commit/?id=9b1219b24a5adaca44833287ac2727e3523e3b62

commit 9b1219b24a5adaca44833287ac2727e3523e3b62
Author:     Michael Tuexen <tuexen at FreeBSD.org>
AuthorDate: 2021-07-19 22:29:18 +0000
Commit:     Michael Tuexen <tuexen at FreeBSD.org>
CommitDate: 2021-07-22 09:13:31 +0000

    tcp: fix RACK and BBR when using VIMAGE enabled kernel
    
    Fix a bug in VNET handling, which occurs when using specific NICs.
    PR:                     257195
    Reviewed by:            rrs
    Sponsored by:           Netflix, Inc.
    Differential Revision:  https://reviews.freebsd.org/D31212
    
    (cherry picked from commit a730d82378d3cdf5356775ec0c23ad2ca40c5edb)
---
 sys/netinet/tcp_stacks/rack_bbr_common.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/tcp_stacks/rack_bbr_common.c b/sys/netinet/tcp_stacks/rack_bbr_common.c
index d9f48f733e93..6fe11d9d2e52 100644
--- a/sys/netinet/tcp_stacks/rack_bbr_common.c
+++ b/sys/netinet/tcp_stacks/rack_bbr_common.c
@@ -510,16 +510,18 @@ skip_vnet:
 				m_freem(m);
 				m = m_save;
 			}
-			if (no_vn == 0)
+			if (no_vn == 0) {
 				CURVNET_RESTORE();
+			}
 			INP_UNLOCK_ASSERT(inp);
 			return(retval);
 		}
 skipped_pkt:
 		m = m_save;
 	}
-	if (no_vn == 0)
+	if (no_vn == 0) {
 		CURVNET_RESTORE();
+	}
 	return(retval);
 }