| commit | 8653b32a48ebb35707c5dfd89e806e4c64370235 | [log] [tgz] |
|---|---|---|
| author | Marco Nelissen <marcone@google.com> | Thu Jan 26 15:41:56 2017 -0800 |
| committer | Marco Nelissen <marcone@google.com> | Fri Jan 27 23:14:25 2017 +0000 |
| tree | 4acd3262b0fcccd69342ac59fda1a325979c162d | |
| parent | a17d71f60a17859b5fb8be3e773252e3d71a1189 [diff] | |
| parent | 1cdcb253df72876aba10980b2bf967b8e892c252 [diff] |
Merge remote-tracking branch 'aosp/nougat-mr1-cts-dev' into master Test: built Merged-In: I0e9438d5fdb01c94077aa22cdf402dee8bf5ec97 Change-Id: Idbd20b12eec0440369b37316f9ab2c84978f7725
diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/PacketReflector.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/PacketReflector.java index dd0f792..a4a2956 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/PacketReflector.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/PacketReflector.java
@@ -151,6 +151,15 @@ request[hdrLen] = buf[hdrLen]; // Type. request[hdrLen + 2] = buf[hdrLen + 2]; // Checksum byte 1. request[hdrLen + 3] = buf[hdrLen + 3]; // Checksum byte 2. + + // Since Linux kernel 4.2, net.ipv6.auto_flowlabels is set by default, and therefore + // the request and reply may have different IPv6 flow label: ignore that as well. + if (version == 6) { + request[1] = (byte)(request[1] & 0xf0 | buf[1] & 0x0f); + request[2] = buf[2]; + request[3] = buf[3]; + } + for (int i = 0; i < len; i++) { if (buf[i] != request[i]) { Log.i(TAG, "Received non-matching packet when expecting ping response.");