diff options
| author | Maciej Żenczykowski <maze@google.com> | 2024-01-12 05:20:19 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2024-01-12 05:20:19 +0000 |
| commit | 0c11e56498f65dea155f40e7fdcf3c3ea72cfe66 (patch) | |
| tree | 2aa7b4c8b6bd539d665e5f0004ae1ac90d726355 | |
| parent | f9cbb59d6895e37f4aec851095cf8c76248e140f (diff) | |
| parent | d0196f688c8266f0d4c5b95e88350080f8e877dc (diff) | |
| download | tests-0c11e56498f65dea155f40e7fdcf3c3ea72cfe66.tar.gz | |
net-test: adjust 'accept_ra_min_lft' minimum LTS kernel version check am: d0196f688c
Original change: https://android-review.googlesource.com/c/kernel/tests/+/2906340
Change-Id: I14f0d8361fa411057b397b2c78ee09bb2ef03e85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | net/test/multinetwork_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/test/multinetwork_base.py b/net/test/multinetwork_base.py index 5bf9b03..4f1f9aa 100644 --- a/net/test/multinetwork_base.py +++ b/net/test/multinetwork_base.py @@ -59,7 +59,8 @@ IPV6_MARK_REFLECT_SYSCTL = "/proc/sys/net/ipv6/fwmark_reflect" RA_HONOR_PIO_LIFE_SYSCTL = "/proc/sys/net/ipv6/conf/default/ra_honor_pio_life" HAVE_ACCEPT_RA_MIN_LFT = (os.path.isfile(ACCEPT_RA_MIN_LFT_SYSCTL) or - net_test.KernelAtLeast([(6, 6, 0)])) + net_test.KernelAtLeast([(5, 10, 199), (5, 15, 136), + (6, 1, 57), (6, 6, 0)])) HAVE_AUTOCONF_TABLE = os.path.isfile(AUTOCONF_TABLE_SYSCTL) HAVE_RA_HONOR_PIO_LIFE = (os.path.isfile(RA_HONOR_PIO_LIFE_SYSCTL) or net_test.KernelAtLeast([(6, 7, 0)])) |