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

Commit 4d18f6de authored by Daniel T. Lee's avatar Daniel T. Lee Committed by Daniel Borkmann
Browse files

samples: bpf: refactor header include path 



Currently, header inclusion in each file is inconsistent.
For example, "libbpf.h" header is included as multiple ways.

    #include "bpf/libbpf.h"
    #include "libbpf.h"

Due to commit b552d33c ("samples/bpf: fix include path
in Makefile"), $(srctree)/tools/lib/bpf/ path had been included
during build, path "bpf/" in header isn't necessary anymore.

This commit removes path "bpf/" in header inclusion.

Signed-off-by: default avatarDaniel T. Lee <danieltimlee@gmail.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent fa206dcc

samples/bpf/fds_example.c

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include <bpf/bpf.h>



#include "bpf/libbpf.h"

#include "libbpf.h"

#include "bpf_insn.h"

#include "sock_example.h"

samples/bpf/hbm.c

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 
#include "cgroup_helpers.h"

#include "hbm.h"

#include "bpf_util.h"

#include "bpf/bpf.h"

#include "bpf/libbpf.h"

#include "bpf.h"

#include "libbpf.h"



bool outFlag = true;

int minRate = 1000;		/* cgroup rate limit in Mbps */

samples/bpf/ibumad_user.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include "bpf_load.h"

#include "bpf_util.h"

#include "bpf/libbpf.h"

#include "libbpf.h"



static void dump_counts(int fd)

{

samples/bpf/sockex1_user.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <assert.h>

#include <linux/bpf.h>

#include <bpf/bpf.h>

#include "bpf/libbpf.h"

#include "libbpf.h"

#include "sock_example.h"

#include <unistd.h>

#include <arpa/inet.h>

samples/bpf/sockex2_user.c

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 
#include <assert.h>

#include <linux/bpf.h>

#include <bpf/bpf.h>

#include "bpf/libbpf.h"

#include "libbpf.h"

#include "sock_example.h"

#include <unistd.h>

#include <arpa/inet.h>