diff options
| author | Magnus Karlsson <magnus.karlsson@intel.com> | 2018-08-31 13:40:02 +0200 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2018-09-01 01:38:16 +0200 |
| commit | 93ee30f3e8b412c5fc2d2f7d9d002529d9a209ad (patch) | |
| tree | 6e4d21960cc9532238731eecc6e483059ae06d6f /include/net/xdp_sock.h | |
| parent | i40e: fix possible compiler warning in xsk TX path (diff) | |
| download | linux-93ee30f3e8b412c5fc2d2f7d9d002529d9a209ad.tar.xz linux-93ee30f3e8b412c5fc2d2f7d9d002529d9a209ad.zip | |
xsk: i40e: get rid of useless struct xdp_umem_props
This commit gets rid of the structure xdp_umem_props. It was there to
be able to break a dependency at one point, but this is no longer
needed. The values in the struct are instead stored directly in the
xdp_umem structure. This simplifies the xsk code as well as af_xdp
zero-copy drivers and as a bonus gets rid of one internal header file.
The i40e driver is also adapted to the new interface in this commit.
Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Diffstat (limited to 'include/net/xdp_sock.h')
| -rw-r--r-- | include/net/xdp_sock.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/include/net/xdp_sock.h b/include/net/xdp_sock.h index 56994ad1ab40..932ca0dad6f3 100644 --- a/include/net/xdp_sock.h +++ b/include/net/xdp_sock.h @@ -16,11 +16,6 @@ struct net_device; struct xsk_queue; -struct xdp_umem_props { - u64 chunk_mask; - u64 size; -}; - struct xdp_umem_page { void *addr; dma_addr_t dma; @@ -30,7 +25,8 @@ struct xdp_umem { struct xsk_queue *fq; struct xsk_queue *cq; struct xdp_umem_page *pages; - struct xdp_umem_props props; + u64 chunk_mask; + u64 size; u32 headroom; u32 chunk_size_nohr; struct user_struct *user; |