On Wed, Jan 03, 2024 at 11:24:45AM +0100, Arnd Bergmann wrote: > From: Arnd Bergmann <[email protected]> > > The newly added function fails to build when struct xsk_cb_desc is > not defined: > > drivers/net/ethernet/intel/ice/ice_base.c: In function 'ice_xsk_pool_fill_cb': > drivers/net/ethernet/intel/ice/ice_base.c:525:16: error: variable 'desc' has > initializer but incomplete type > > Hide this part in the same #ifdef that controls the structure definition.
Hey Arnd, this has been fixed by Vladimir: https://lore.kernel.org/netdev/[email protected]/ in a way that we don't have to wrap driver code with ifdefs. Thanks! > > Fixes: d68d707dcbbf ("ice: Support XDP hints in AF_XDP ZC mode") > Signed-off-by: Arnd Bergmann <[email protected]> > --- > drivers/net/ethernet/intel/ice/ice_base.c | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/drivers/net/ethernet/intel/ice/ice_base.c > b/drivers/net/ethernet/intel/ice/ice_base.c > index 6e3694145f59..0d1aeb7ca108 100644 > --- a/drivers/net/ethernet/intel/ice/ice_base.c > +++ b/drivers/net/ethernet/intel/ice/ice_base.c > @@ -521,6 +521,7 @@ static int ice_setup_rx_ctx(struct ice_rx_ring *ring) > > static void ice_xsk_pool_fill_cb(struct ice_rx_ring *ring) > { > +#ifdef CONFIG_XDP_SOCKETS > void *ctx_ptr = &ring->pkt_ctx; > struct xsk_cb_desc desc = {}; > > @@ -530,6 +531,7 @@ static void ice_xsk_pool_fill_cb(struct ice_rx_ring *ring) > sizeof(struct xdp_buff); > desc.bytes = sizeof(ctx_ptr); > xsk_pool_fill_cb(ring->xsk_pool, &desc); > +#endif > } > > /** > -- > 2.39.2 >
