diff options
| author | David S. Miller <davem@davemloft.net> | 2018-02-04 16:46:58 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2018-02-04 16:46:58 -0500 |
| commit | a6b88814ab541d386d793f6df260a3e4d5cccb11 (patch) | |
| tree | a7c633be819bb450edab3beebd1a9a0cfba8bb72 /samples/bpf/bpf_load.h | |
| parent | 35277995e17919ab838beae765f440674e8576eb (diff) | |
| parent | 09c0656dfabd0b15e410eca67dc45cb14ec9c13a (diff) | |
| download | linux-a6b88814ab541d386d793f6df260a3e4d5cccb11.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2018-02-02
The following pull-request contains BPF updates for your *net* tree.
The main changes are:
1) support XDP attach in libbpf, from Eric.
2) minor fixes, from Daniel, Jakub, Yonghong, Alexei.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'samples/bpf/bpf_load.h')
| -rw-r--r-- | samples/bpf/bpf_load.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/bpf/bpf_load.h b/samples/bpf/bpf_load.h index 7d57a4248893..453c200b389b 100644 --- a/samples/bpf/bpf_load.h +++ b/samples/bpf/bpf_load.h @@ -61,5 +61,5 @@ struct ksym { int load_kallsyms(void); struct ksym *ksym_search(long key); -int set_link_xdp_fd(int ifindex, int fd, __u32 flags); +int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags); #endif |