On Sat, Dec 11, 2021 at 3:02 AM Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx> wrote: > > zero_copy_allocator has been removed back when Bjorn Topel introduced > xsk_buff_pool. Remove references to it that were dangling in the tree. Thanks Maciej. Acked-by: Magnus Karlsson <magnus.karlsson@xxxxxxxxx> > Signed-off-by: Maciej Fijalkowski <maciej.fijalkowski@xxxxxxxxx> > --- > drivers/net/ethernet/intel/i40e/i40e_xsk.h | 1 - > drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h | 2 -- > include/net/xdp_priv.h | 1 - > 3 files changed, 4 deletions(-) > > diff --git a/drivers/net/ethernet/intel/i40e/i40e_xsk.h b/drivers/net/ethernet/intel/i40e/i40e_xsk.h > index ea88f4597a07..bb962987f300 100644 > --- a/drivers/net/ethernet/intel/i40e/i40e_xsk.h > +++ b/drivers/net/ethernet/intel/i40e/i40e_xsk.h > @@ -22,7 +22,6 @@ > > struct i40e_vsi; > struct xsk_buff_pool; > -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); > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h > index a82533f21d36..bba3feaf3318 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_txrx_common.h > @@ -35,8 +35,6 @@ int ixgbe_xsk_pool_setup(struct ixgbe_adapter *adapter, > struct xsk_buff_pool *pool, > u16 qid); > > -void ixgbe_zca_free(struct zero_copy_allocator *alloc, unsigned long handle); > - > bool ixgbe_alloc_rx_buffers_zc(struct ixgbe_ring *rx_ring, u16 cleaned_count); > int ixgbe_clean_rx_irq_zc(struct ixgbe_q_vector *q_vector, > struct ixgbe_ring *rx_ring, > diff --git a/include/net/xdp_priv.h b/include/net/xdp_priv.h > index a9d5b7603b89..a2d58b1a12e1 100644 > --- a/include/net/xdp_priv.h > +++ b/include/net/xdp_priv.h > @@ -10,7 +10,6 @@ struct xdp_mem_allocator { > union { > void *allocator; > struct page_pool *page_pool; > - struct zero_copy_allocator *zc_alloc; > }; > struct rhash_head node; > struct rcu_head rcu; > -- > 2.33.1 >