diff options
| author | David S. Miller <davem@davemloft.net> | 2021-03-05 12:29:36 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2021-03-05 12:29:36 -0800 |
| commit | 638526bb41643292aed808c3294c89b441656740 (patch) | |
| tree | 280a2242b4019a3aded27ad3632c13bf3dfd3888 /include | |
| parent | ad5d07f4a9cd671233ae20983848874731102c08 (diff) | |
| parent | 39491867ace594b4912c35f576864d204beed2b3 (diff) | |
| download | linux-stable-638526bb41643292aed808c3294c89b441656740.tar.gz linux-stable-638526bb41643292aed808c3294c89b441656740.tar.bz2 linux-stable-638526bb41643292aed808c3294c89b441656740.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf
Alexei Starovoitov says:
====================
pull-request: bpf 2021-03-04
The following pull-request contains BPF updates for your *net* tree.
We've added 7 non-merge commits during the last 4 day(s) which contain
a total of 9 files changed, 128 insertions(+), 40 deletions(-).
The main changes are:
1) Fix 32-bit cmpxchg, from Brendan.
2) Fix atomic+fetch logic, from Ilya.
3) Fix usage of bpf_csum_diff in selftests, from Yauheni.
====================
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index f06fbee8638e..5b67ea89d5f2 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -3959,8 +3959,6 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog); u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode); -int xdp_umem_query(struct net_device *dev, u16 queue_id); - int __dev_forward_skb(struct net_device *dev, struct sk_buff *skb); int dev_forward_skb(struct net_device *dev, struct sk_buff *skb); int dev_forward_skb_nomtu(struct net_device *dev, struct sk_buff *skb); |