From mboxrd@z Thu Jan  1 00:00:00 1970
From: Daniel Borkmann <daniel@iogearbox.net>
Subject: Re: [PATCH bpf-next] samples/bpf: fix a compilation failure
Date: Tue, 18 Sep 2018 17:51:40 +0200
Message-ID: <a218d676-efdd-26ed-a2ca-d15dfb80d3b2@iogearbox.net>
References: <20180918050813.2138154-1-yhs@fb.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Cc: kernel-team@fb.com
To: Yonghong Song <yhs@fb.com>, ast@fb.com, netdev@vger.kernel.org
Return-path: <netdev-owner@vger.kernel.org>
Received: from www62.your-server.de ([213.133.104.62]:41971 "EHLO
        www62.your-server.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1729249AbeIRVYx (ORCPT
        <rfc822;netdev@vger.kernel.org>); Tue, 18 Sep 2018 17:24:53 -0400
In-Reply-To: <20180918050813.2138154-1-yhs@fb.com>
Content-Language: en-US
Sender: netdev-owner@vger.kernel.org
List-ID: <netdev.vger.kernel.org>

On 09/18/2018 07:08 AM, Yonghong Song wrote:
> samples/bpf build failed with the following errors:
> 
>   $ make samples/bpf/
>   ...
>   HOSTCC  samples/bpf/sockex3_user.o
>   /data/users/yhs/work/net-next/samples/bpf/sockex3_user.c:16:8: error: redefinition of ‘struct bpf_flow_keys’
>    struct bpf_flow_keys {
>           ^
>   In file included from /data/users/yhs/work/net-next/samples/bpf/sockex3_user.c:4:0:
>   ./usr/include/linux/bpf.h:2338:9: note: originally defined here
>     struct bpf_flow_keys *flow_keys;
>            ^
>   make[3]: *** [samples/bpf/sockex3_user.o] Error 1
> 
> Commit d58e468b1112d ("flow_dissector: implements flow dissector BPF hook")
> introduced struct bpf_flow_keys in include/uapi/linux/bpf.h and hence
> caused the naming conflict with samples/bpf/sockex3_user.c.
> 
> The fix is to rename struct bpf_flow_keys in samples/bpf/sockex3_user.c
> to flow_keys to avoid the conflict.
> 
> Signed-off-by: Yonghong Song <yhs@fb.com>

Applied to bpf-next, thanks!