samples: bpf: rename libbpf.h to bpf_insn.h
The libbpf.h file in samples is clashing with libbpf's header. Since it only includes a subset of filter.h instruction helpers rename it to bpf_insn.h. Drop the unnecessary include of bpf/bpf.h. Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com> Acked-by: Jesper Dangaard Brouer <brouer@redhat.com> Signed-off-by: Alexei Starovoitov <ast@kernel.org>
This commit is contained in:
parent
2bf3e2ef42
commit
8d93045077
|
@ -1,9 +1,7 @@
|
|||
/* SPDX-License-Identifier: GPL-2.0 */
|
||||
/* eBPF mini library */
|
||||
#ifndef __LIBBPF_H
|
||||
#define __LIBBPF_H
|
||||
|
||||
#include <bpf/bpf.h>
|
||||
/* eBPF instruction mini library */
|
||||
#ifndef __BPF_INSN_H
|
||||
#define __BPF_INSN_H
|
||||
|
||||
struct bpf_insn;
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <bpf/bpf.h>
|
||||
#include "libbpf.h"
|
||||
#include "bpf_insn.h"
|
||||
|
||||
#define PORT 8888
|
||||
|
||||
|
|
|
@ -12,8 +12,10 @@
|
|||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <bpf/bpf.h>
|
||||
|
||||
#include "bpf_insn.h"
|
||||
#include "bpf_load.h"
|
||||
#include "libbpf.h"
|
||||
#include "sock_example.h"
|
||||
|
||||
#define BPF_F_PIN (1 << 0)
|
||||
|
|
|
@ -26,7 +26,8 @@
|
|||
#include <linux/if_ether.h>
|
||||
#include <linux/ip.h>
|
||||
#include <stddef.h>
|
||||
#include "libbpf.h"
|
||||
#include <bpf/bpf.h>
|
||||
#include "bpf_insn.h"
|
||||
#include "sock_example.h"
|
||||
|
||||
char bpf_log_buf[BPF_LOG_BUF_SIZE];
|
||||
|
|
|
@ -28,8 +28,9 @@
|
|||
#include <fcntl.h>
|
||||
|
||||
#include <linux/bpf.h>
|
||||
#include <bpf/bpf.h>
|
||||
|
||||
#include "libbpf.h"
|
||||
#include "bpf_insn.h"
|
||||
|
||||
enum {
|
||||
MAP_KEY_PACKETS,
|
||||
|
|
|
@ -24,8 +24,9 @@
|
|||
#include <unistd.h>
|
||||
|
||||
#include <linux/bpf.h>
|
||||
#include <bpf/bpf.h>
|
||||
|
||||
#include "libbpf.h"
|
||||
#include "bpf_insn.h"
|
||||
#include "cgroup_helpers.h"
|
||||
|
||||
#define FOO "/foo"
|
||||
|
|
|
@ -21,8 +21,9 @@
|
|||
#include <net/if.h>
|
||||
#include <inttypes.h>
|
||||
#include <linux/bpf.h>
|
||||
#include <bpf/bpf.h>
|
||||
|
||||
#include "libbpf.h"
|
||||
#include "bpf_insn.h"
|
||||
|
||||
char bpf_log_buf[BPF_LOG_BUF_SIZE];
|
||||
|
||||
|
|
|
@ -19,8 +19,9 @@
|
|||
#include <fcntl.h>
|
||||
#include <net/if.h>
|
||||
#include <linux/bpf.h>
|
||||
#include <bpf/bpf.h>
|
||||
|
||||
#include "libbpf.h"
|
||||
#include "bpf_insn.h"
|
||||
#include "bpf_load.h"
|
||||
|
||||
static int usage(const char *argv0)
|
||||
|
|
Loading…
Reference in a new issue