xsk: simplify xdp_clear_umem_at_qid implementation

As we now do not allow ethtool to deactivate the queue id we are
running an AF_XDP socket on, we can simplify the implementation of
xdp_clear_umem_at_qid().

Signed-off-by: Magnus Karlsson <[email protected]>
Signed-off-by: Daniel Borkmann <[email protected]>

diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c
index 773326f682b1c2a6359f03607de61e0a88959ae7..c6007c58231c07657479f08492e85def3dfdd65b 100644 (file)
--- a/net/xdp/xdp_umem.c
+++ b/net/xdp/xdp_umem.c
@@ -68,12 +68,9 @@ struct xdp_umem *xdp_get_umem_from_qid(struct net_device *dev,
 
 static void xdp_clear_umem_at_qid(struct net_device *dev, u16 queue_id)
 {
-       /* Zero out the entry independent on how many queues are configured
-        * at this point in time, as it might be used in the future.
-        */
-       if (queue_id < dev->num_rx_queues)
+       if (queue_id < dev->real_num_rx_queues)
                dev->_rx[queue_id].umem = NULL;
-       if (queue_id < dev->num_tx_queues)
+       if (queue_id < dev->real_num_tx_queues)
                dev->_tx[queue_id].umem = NULL;
 }