From mboxrd@z Thu Jan 1 00:00:00 1970 From: Taeung Song Subject: [PATCH 1/4] samples/bpf: add missing Date: Mon, 2 Jul 2018 18:14:50 +0900 Message-ID: <1530522893-8961-2-git-send-email-treeze.taeung@gmail.com> References: <1530522893-8961-1-git-send-email-treeze.taeung@gmail.com> Cc: Teng Qin , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, Taeung Song To: Alexei Starovoitov , Daniel Borkmann Return-path: In-Reply-To: <1530522893-8961-1-git-send-email-treeze.taeung@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: netdev.vger.kernel.org This fixes build error regarding redefinition: CLANG-bpf samples/bpf/parse_varlen.o samples/bpf/parse_varlen.c:111:8: error: redefinition of 'vlan_hdr' struct vlan_hdr { ^ ./include/linux/if_vlan.h:38:8: note: previous definition is here So remove duplicate 'struct vlan_hdr' in sample code and include if_vlan.h Signed-off-by: Taeung Song --- samples/bpf/parse_varlen.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/samples/bpf/parse_varlen.c b/samples/bpf/parse_varlen.c index 95c1632..0b6f22f 100644 --- a/samples/bpf/parse_varlen.c +++ b/samples/bpf/parse_varlen.c @@ -6,6 +6,7 @@ */ #define KBUILD_MODNAME "foo" #include +#include #include #include #include @@ -108,11 +109,6 @@ static int parse_ipv6(void *data, uint64_t nh_off, void *data_end) return 0; } -struct vlan_hdr { - uint16_t h_vlan_TCI; - uint16_t h_vlan_encapsulated_proto; -}; - SEC("varlen") int handle_ingress(struct __sk_buff *skb) { -- 2.7.4