Commit f0863eab authored by Björn Töpel's avatar Björn Töpel Committed by Daniel Borkmann
Browse files

xsk: Fold xp_assign_dev and __xp_assign_dev 



Fold xp_assign_dev and __xp_assign_dev. The former directly calls the
latter.

Signed-off-by: default avatarBjörn Töpel <bjorn.topel@intel.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reviewed-by: default avatarMaciej Fijalkowski <maciej.fijalkowski@intel.com>
Link: https://lore.kernel.org/bpf/20210122105351.11751-3-bjorn.topel@gmail.com
parent 458f7272

net/xdp/xsk_buff_pool.c

+3 −9
Original line number Original line Diff line number Diff line
@@ -119,7 +119,7 @@ static void xp_disable_drv_zc(struct xsk_buff_pool *pool) 
	}

	}

}

}





static int __xp_assign_dev(struct xsk_buff_pool *pool,

int xp_assign_dev(struct xsk_buff_pool *pool,

		  struct net_device *netdev, u16 queue_id, u16 flags)

		  struct net_device *netdev, u16 queue_id, u16 flags)

{

{

	bool force_zc, force_copy;

	bool force_zc, force_copy;
@@ -191,12 +191,6 @@ static int __xp_assign_dev(struct xsk_buff_pool *pool, 
	return err;

	return err;

}

}





int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev,

		  u16 queue_id, u16 flags)

{

	return __xp_assign_dev(pool, dev, queue_id, flags);

}



int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem,

int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem,

			 struct net_device *dev, u16 queue_id)

			 struct net_device *dev, u16 queue_id)

{

{
@@ -210,7 +204,7 @@ int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem, 
	if (pool->uses_need_wakeup)

	if (pool->uses_need_wakeup)

		flags |= XDP_USE_NEED_WAKEUP;

		flags |= XDP_USE_NEED_WAKEUP;





	return __xp_assign_dev(pool, dev, queue_id, flags);

	return xp_assign_dev(pool, dev, queue_id, flags);

}

}





void xp_clear_dev(struct xsk_buff_pool *pool)

void xp_clear_dev(struct xsk_buff_pool *pool)