Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d5d33a0 authored by Taeung Song's avatar Taeung Song Committed by Daniel Borkmann
Browse files

samples/bpf: add missing <linux/if_vlan.h> 



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: default avatarTaeung Song <treeze.taeung@gmail.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent ed2b82c0

samples/bpf/parse_varlen.c

+1 −5
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ 
 */

 */

#define KBUILD_MODNAME "foo"

#define KBUILD_MODNAME "foo"

#include <linux/if_ether.h>

#include <linux/if_ether.h>

#include <linux/if_vlan.h>

#include <linux/ip.h>

#include <linux/ip.h>

#include <linux/ipv6.h>

#include <linux/ipv6.h>

#include <linux/in.h>

#include <linux/in.h>
@@ -108,11 +109,6 @@ static int parse_ipv6(void *data, uint64_t nh_off, void *data_end) 
	return 0;

	return 0;

}

}





struct vlan_hdr {

	uint16_t h_vlan_TCI;

	uint16_t h_vlan_encapsulated_proto;

};



SEC("varlen")

SEC("varlen")

int handle_ingress(struct __sk_buff *skb)

int handle_ingress(struct __sk_buff *skb)

{

{