diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-09-03 03:23:41 -0400 |
| commit | ae1ad26388228048db6a5f1056bd569ed2bbc4ec (patch) | |
| tree | 223f50677aa00eb6f2a6529099a1005c7e43c071 /tools/testing/selftests/bpf/progs/sendmsg6_prog.c | |
| parent | c84b82dd3e593db217f23c60f7edae02c76a3c4c (diff) | |
| parent | 089cf7f6ecb266b6a4164919a2e69bd2f938374a (diff) | |
Merge tag 'v5.3-rc7' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/testing/selftests/bpf/progs/sendmsg6_prog.c')
| -rw-r--r-- | tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tools/testing/selftests/bpf/progs/sendmsg6_prog.c b/tools/testing/selftests/bpf/progs/sendmsg6_prog.c index 5aeaa284fc47..a68062820410 100644 --- a/tools/testing/selftests/bpf/progs/sendmsg6_prog.c +++ b/tools/testing/selftests/bpf/progs/sendmsg6_prog.c | |||
| @@ -41,8 +41,7 @@ int sendmsg_v6_prog(struct bpf_sock_addr *ctx) | |||
| 41 | } | 41 | } |
| 42 | 42 | ||
| 43 | /* Rewrite destination. */ | 43 | /* Rewrite destination. */ |
| 44 | if ((ctx->user_ip6[0] & 0xFFFF) == bpf_htons(0xFACE) && | 44 | if (ctx->user_ip6[0] == bpf_htonl(0xFACEB00C)) { |
| 45 | ctx->user_ip6[0] >> 16 == bpf_htons(0xB00C)) { | ||
| 46 | ctx->user_ip6[0] = bpf_htonl(DST_REWRITE_IP6_0); | 45 | ctx->user_ip6[0] = bpf_htonl(DST_REWRITE_IP6_0); |
| 47 | ctx->user_ip6[1] = bpf_htonl(DST_REWRITE_IP6_1); | 46 | ctx->user_ip6[1] = bpf_htonl(DST_REWRITE_IP6_1); |
| 48 | ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2); | 47 | ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2); |