diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-02-16 22:56:34 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-02-16 22:56:34 -0800 |
| commit | 885e63195980ab25abc67336f0c44d4cb4e6e72b (patch) | |
| tree | e16c90fe7e0400646dc73771790b5be47d143012 /drivers/net/ethernet/intel/i40e/i40e_xsk.h | |
| parent | net: stmmac: use correct define to get rx timestamp on GMAC4 (diff) | |
| parent | tools/libbpf: support bigger BTF data sizes (diff) | |
| download | linux-dev-885e63195980ab25abc67336f0c44d4cb4e6e72b.tar.xz linux-dev-885e63195980ab25abc67336f0c44d4cb4e6e72b.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next
Alexei Starovoitov says:
====================
pull-request: bpf-next 2019-02-16
The following pull-request contains BPF updates for your *net-next* tree.
The main changes are:
1) numerous libbpf API improvements, from Andrii, Andrey, Yonghong.
2) test all bpf progs in alu32 mode, from Jiong.
3) skb->sk access and bpf_sk_fullsock(), bpf_tcp_sock() helpers, from Martin.
4) support for IP encap in lwt bpf progs, from Peter.
5) remove XDP_QUERY_XSK_UMEM dead code, from Jan.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e/i40e_xsk.h')
| -rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_xsk.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.h b/drivers/net/ethernet/intel/i40e/i40e_xsk.h index 9038c5d5cf08..8cc0a2e7d9a2 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.h +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.h @@ -10,8 +10,6 @@ struct zero_copy_allocator; int i40e_queue_pair_disable(struct i40e_vsi *vsi, int queue_pair); int i40e_queue_pair_enable(struct i40e_vsi *vsi, int queue_pair); -int i40e_xsk_umem_query(struct i40e_vsi *vsi, struct xdp_umem **umem, - u16 qid); int i40e_xsk_umem_setup(struct i40e_vsi *vsi, struct xdp_umem *umem, u16 qid); void i40e_zca_free(struct zero_copy_allocator *alloc, unsigned long handle); |