diff options
| author |   Magnus Karlsson <magnus.karlsson@intel.com> | 2018-10-01 14:51:37 +0200 |
|---|---|---|
| committer |   Daniel Borkmann <daniel@iogearbox.net> | 2018-10-05 09:31:01 +0200 |
| commit | a41b4f3c58dddcb39b7072a97ac8cb9036ce53f6 (patch) | |
| tree | 0b48b06adbcd305542c9e6d526bebdc522d8343a | |
| parent | ethtool: don't allow disabling queues with umem installed (diff) | |
| download | linux-dev-a41b4f3c58dddcb39b7072a97ac8cb9036ce53f6.tar.xz linux-dev-a41b4f3c58dddcb39b7072a97ac8cb9036ce53f6.zip | |
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 <magnus.karlsson@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
| -rw-r--r-- | net/xdp/xdp_umem.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/xdp/xdp_umem.c b/net/xdp/xdp_umem.c index 773326f682b1..c6007c58231c 100644 --- 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; } |