diff options
author | David S. Miller <davem@davemloft.net> | 2020-12-11 01:29:30 +0300 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2020-12-11 01:29:30 +0300 |
commit | d9838b1d39283c1200c13f9076474c7624b8ec34 (patch) | |
tree | 5c2e468337362ff4e0f7197a4ec3990a008fd599 /include | |
parent | 38bf8cd821be292e7d8e6f6283d67c5d9708f887 (diff) | |
parent | 3615bdf6d9b19db12b1589861609b4f1c6a8d303 (diff) | |
download | linux-d9838b1d39283c1200c13f9076474c7624b8ec34.tar.xz |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2020-12-10
The following pull-request contains BPF updates for your *net* tree.
We've added 21 non-merge commits during the last 12 day(s) which contain
a total of 21 files changed, 163 insertions(+), 88 deletions(-).
The main changes are:
1) Fix propagation of 32-bit signed bounds from 64-bit bounds, from Alexei.
2) Fix ring_buffer__poll() return value, from Andrii.
3) Fix race in lwt_bpf, from Cong.
4) Fix test_offload, from Toke.
5) Various xsk fixes.
Please consider pulling these changes from:
git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git
Thanks a lot!
Also thanks to reporters, reviewers and testers of commits in this pull-request:
Cong Wang, Hulk Robot, Jakub Kicinski, Jean-Philippe Brucker, John
Fastabend, Magnus Karlsson, Maxim Mikityanskiy, Yonghong Song
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r-- | include/net/xdp.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/net/xdp.h b/include/net/xdp.h index 3814fb631d52..9dab2bc6f187 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -240,8 +240,6 @@ struct xdp_attachment_info { }; struct netdev_bpf; -bool xdp_attachment_flags_ok(struct xdp_attachment_info *info, - struct netdev_bpf *bpf); void xdp_attachment_setup(struct xdp_attachment_info *info, struct netdev_bpf *bpf); |