diff mbox series

[v2,1/4] samples/bpf: add missing <linux/if_vlan.h>

Message ID 20180704133639.11855-2-treeze.taeung@gmail.com
State Accepted, archived
Delegated to: BPF Maintainers
Headers show
Series samples/bpf: simple fixes | expand

Commit Message

Taeung Song July 4, 2018, 1:36 p.m. UTC 
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 <treeze.taeung@gmail.com>
---
 samples/bpf/parse_varlen.c | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

Comments

David Miller July 5, 2018, 5:24 a.m. UTC | #1 
From: Taeung Song <treeze.taeung@gmail.com>
Date: Wed,  4 Jul 2018 22:36:36 +0900

> 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 <treeze.taeung@gmail.com>

Acked-by: David S. Miller <davem@davemloft.net>
diff mbox series

Patch

diff --git a/samples/bpf/parse_varlen.c b/samples/bpf/parse_varlen.c
index 95c16324760c..0b6f22feb2c9 100644
--- a/samples/bpf/parse_varlen.c
+++ b/samples/bpf/parse_varlen.c
@@ -6,6 +6,7 @@ 
  */
 #define KBUILD_MODNAME "foo"
 #include <linux/if_ether.h>
+#include <linux/if_vlan.h>
 #include <linux/ip.h>
 #include <linux/ipv6.h>
 #include <linux/in.h>
@@ -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)
 {