Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net

Just minor overlapping changes in the conflicts here.

Signed-off-by: David S. Miller <davem@davemloft.net>

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)
         }
 
         /* Rewrite destination. */
-        if ((ctx->user_ip6[0] & 0xFFFF) == bpf_htons(0xFACE) &&
-             ctx->user_ip6[0] >> 16 == bpf_htons(0xB00C)) {
+        if (ctx->user_ip6[0] == bpf_htonl(0xFACEB00C)) {
                 ctx->user_ip6[0] = bpf_htonl(DST_REWRITE_IP6_0);
                 ctx->user_ip6[1] = bpf_htonl(DST_REWRITE_IP6_1);
                 ctx->user_ip6[2] = bpf_htonl(DST_REWRITE_IP6_2);