| commit | 7b07e88d38aa3211f47dc1fcd360399d75514479 | [log] [tgz] |
|---|---|---|
| author | eric_kuang.rs <eric_kuang.rs@realtek.com> | Wed Dec 01 16:17:40 2021 +0800 |
| committer | eric_kuang.rs <eric_kuang.rs@realtek.com> | Wed Dec 01 17:04:14 2021 +0800 |
| tree | 427695943c0c3e8ec51dd5534595b16e6fd6b469 | |
| parent | ab006551a604539917d38d2c68bc72cadac0fd6d [diff] |
net-test: not supported in netns before 4.15 if BH_TIMEOUT_SYSCTL does not exist. Related to the following CL which is included in 4.15: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=3733be14a32bae288b61ed28341e593baba983af Change-Id: I1cc9b9c79a1eec83c47d36790c8f944b0261ff32 Test: Run vts_kernel_net_tests with Ethernet or Wi-Fi connected Bug: 204306357
diff --git a/net/test/tcp_fastopen_test.py b/net/test/tcp_fastopen_test.py index 5b89a2d..9c777c6 100755 --- a/net/test/tcp_fastopen_test.py +++ b/net/test/tcp_fastopen_test.py
@@ -22,6 +22,7 @@ import multinetwork_base import net_test +import os import packets import tcp_metrics @@ -67,6 +68,9 @@ def clearBlackhole(self): if net_test.LINUX_VERSION < (4, 14, 0): return + # Prior to 4.15 this sysctl is not namespace aware. + if net_test.LINUX_VERSION < (4, 15, 0) and not os.path.exists(BH_TIMEOUT_SYSCTL): + return timeout = self.GetSysctl(BH_TIMEOUT_SYSCTL) # Write to timeout to clear any pre-existing blackhole condition