Small refactor to move the pool registration into xsk_reg_pool_at_qid, such that the netdev and queue_id can be registered there. No change in functionality. Signed-off-by: Daniel Borkmann Co-developed-by: David Wei Signed-off-by: David Wei --- net/xdp/xsk.c | 5 +++++ net/xdp/xsk_buff_pool.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 7b0c68a70888..0e9a385f5680 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -141,6 +141,11 @@ int xsk_reg_pool_at_qid(struct net_device *dev, struct xsk_buff_pool *pool, dev->real_num_rx_queues, dev->real_num_tx_queues)) return -EINVAL; + if (xsk_get_pool_from_qid(dev, queue_id)) + return -EBUSY; + + pool->netdev = dev; + pool->queue_id = queue_id; if (queue_id < dev->real_num_rx_queues) dev->_rx[queue_id].pool = pool; diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index 26165baf99f4..62a176996f02 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -173,11 +173,6 @@ int xp_assign_dev(struct xsk_buff_pool *pool, if (force_zc && force_copy) return -EINVAL; - if (xsk_get_pool_from_qid(netdev, queue_id)) - return -EBUSY; - - pool->netdev = netdev; - pool->queue_id = queue_id; err = xsk_reg_pool_at_qid(netdev, pool, queue_id); if (err) return err; -- 2.43.0