Skip to content

L
linux
Commit 3685eed5 authored by Moshe Tal's avatar Moshe Tal Committed by Saeed Mahameed
Browse files
Options

net/mlx5e: HTB, change functions name to follow convention 

Following the change of the functions to be object like, change also
the names.
Signed-off-by: default avatarMoshe Tal <moshet@nvidia.com>
Reviewed-by: default avatarTariq Toukan <tariqt@nvidia.com>
Reviewed-by: default avatarMaxim Mikityanskiy <maximmi@nvidia.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@nvidia.com>
parent 28df4a01
Show whitespace changes
Inline Side-by-side
Showing with 36 additions and 36 deletions
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c
View file @ 3685eed5
...@@ -38,7 +38,7 @@ int mlx5e_qos_max_leaf_nodes(struct mlx5_core_dev *mdev) ...@@ -38,7 +38,7 @@ int mlx5e_qos_max_leaf_nodes(struct mlx5_core_dev *mdev)
return min(MLX5E_QOS_MAX_LEAF_NODES, mlx5_qos_max_leaf_nodes(mdev)); return min(MLX5E_QOS_MAX_LEAF_NODES, mlx5_qos_max_leaf_nodes(mdev));
} }
int mlx5e_qos_cur_leaf_nodes(struct mlx5e_htb *htb) int mlx5e_htb_cur_leaf_nodes(struct mlx5e_htb *htb)
{ {
int last; int last;
...@@ -75,7 +75,7 @@ struct mlx5e_qos_node { ...@@ -75,7 +75,7 @@ struct mlx5e_qos_node {
#define MLX5E_HTB_CLASSID_ROOT 0xffffffff #define MLX5E_HTB_CLASSID_ROOT 0xffffffff
static struct mlx5e_qos_node * static struct mlx5e_qos_node *
mlx5e_sw_node_create_leaf(struct mlx5e_htb *htb, u16 classid, u16 qid, mlx5e_htb_node_create_leaf(struct mlx5e_htb *htb, u16 classid, u16 qid,
struct mlx5e_qos_node *parent) struct mlx5e_qos_node *parent)
{ {
struct mlx5e_qos_node *node; struct mlx5e_qos_node *node;
...@@ -97,7 +97,7 @@ mlx5e_sw_node_create_leaf(struct mlx5e_htb *htb, u16 classid, u16 qid, ...@@ -97,7 +97,7 @@ mlx5e_sw_node_create_leaf(struct mlx5e_htb *htb, u16 classid, u16 qid,
return node; return node;
} }
static struct mlx5e_qos_node *mlx5e_sw_node_create_root(struct mlx5e_htb *htb) static struct mlx5e_qos_node *mlx5e_htb_node_create_root(struct mlx5e_htb *htb)
{ {
struct mlx5e_qos_node *node; struct mlx5e_qos_node *node;
...@@ -112,7 +112,7 @@ static struct mlx5e_qos_node *mlx5e_sw_node_create_root(struct mlx5e_htb *htb) ...@@ -112,7 +112,7 @@ static struct mlx5e_qos_node *mlx5e_sw_node_create_root(struct mlx5e_htb *htb)
return node; return node;
} }
static struct mlx5e_qos_node *mlx5e_sw_node_find(struct mlx5e_htb *htb, u32 classid) static struct mlx5e_qos_node *mlx5e_htb_node_find(struct mlx5e_htb *htb, u32 classid)
{ {
struct mlx5e_qos_node *node = NULL; struct mlx5e_qos_node *node = NULL;
...@@ -124,7 +124,7 @@ static struct mlx5e_qos_node *mlx5e_sw_node_find(struct mlx5e_htb *htb, u32 clas ...@@ -124,7 +124,7 @@ static struct mlx5e_qos_node *mlx5e_sw_node_find(struct mlx5e_htb *htb, u32 clas
return node; return node;
} }
static struct mlx5e_qos_node *mlx5e_sw_node_find_rcu(struct mlx5e_htb *htb, u32 classid) static struct mlx5e_qos_node *mlx5e_htb_node_find_rcu(struct mlx5e_htb *htb, u32 classid)
{ {
struct mlx5e_qos_node *node = NULL; struct mlx5e_qos_node *node = NULL;
...@@ -136,7 +136,7 @@ static struct mlx5e_qos_node *mlx5e_sw_node_find_rcu(struct mlx5e_htb *htb, u32 ...@@ -136,7 +136,7 @@ static struct mlx5e_qos_node *mlx5e_sw_node_find_rcu(struct mlx5e_htb *htb, u32
return node; return node;
} }
static void mlx5e_sw_node_delete(struct mlx5e_htb *htb, struct mlx5e_qos_node *node) static void mlx5e_htb_node_delete(struct mlx5e_htb *htb, struct mlx5e_qos_node *node)
{ {
hash_del_rcu(&node->hnode); hash_del_rcu(&node->hnode);
if (node->qid != MLX5E_QOS_QID_INNER) { if (node->qid != MLX5E_QOS_QID_INNER) {
...@@ -166,7 +166,7 @@ static u16 mlx5e_qid_from_qos(struct mlx5e_channels *chs, u16 qid) ...@@ -166,7 +166,7 @@ static u16 mlx5e_qid_from_qos(struct mlx5e_channels *chs, u16 qid)
return (chs->params.num_channels + is_ptp) * mlx5e_get_dcb_num_tc(&chs->params) + qid; return (chs->params.num_channels + is_ptp) * mlx5e_get_dcb_num_tc(&chs->params) + qid;
} }
int mlx5e_get_txq_by_classid(struct mlx5e_htb *htb, u16 classid) int mlx5e_htb_get_txq_by_classid(struct mlx5e_htb *htb, u16 classid)
{ {
struct mlx5e_qos_node *node; struct mlx5e_qos_node *node;
u16 qid; u16 qid;
...@@ -174,7 +174,7 @@ int mlx5e_get_txq_by_classid(struct mlx5e_htb *htb, u16 classid) ...@@ -174,7 +174,7 @@ int mlx5e_get_txq_by_classid(struct mlx5e_htb *htb, u16 classid)
rcu_read_lock(); rcu_read_lock();
node = mlx5e_sw_node_find_rcu(htb, classid); node = mlx5e_htb_node_find_rcu(htb, classid);
if (!node) { if (!node) {
res = -ENOENT; res = -ENOENT;
goto out; goto out;
...@@ -513,7 +513,7 @@ mlx5e_htb_root_add(struct mlx5e_htb *htb, u16 htb_maj_id, u16 htb_defcls, ...@@ -513,7 +513,7 @@ mlx5e_htb_root_add(struct mlx5e_htb *htb, u16 htb_maj_id, u16 htb_defcls,
goto err_cancel_selq; goto err_cancel_selq;
} }
root = mlx5e_sw_node_create_root(htb); root = mlx5e_htb_node_create_root(htb);
if (IS_ERR(root)) { if (IS_ERR(root)) {
err = PTR_ERR(root); err = PTR_ERR(root);
goto err_free_queues; goto err_free_queues;
...@@ -530,7 +530,7 @@ mlx5e_htb_root_add(struct mlx5e_htb *htb, u16 htb_maj_id, u16 htb_defcls, ...@@ -530,7 +530,7 @@ mlx5e_htb_root_add(struct mlx5e_htb *htb, u16 htb_maj_id, u16 htb_defcls,
return 0; return 0;
err_sw_node_delete: err_sw_node_delete:
mlx5e_sw_node_delete(htb, root); mlx5e_htb_node_delete(htb, root);
err_free_queues: err_free_queues:
if (opened) if (opened)
...@@ -556,7 +556,7 @@ static int mlx5e_htb_root_del(struct mlx5e_htb *htb) ...@@ -556,7 +556,7 @@ static int mlx5e_htb_root_del(struct mlx5e_htb *htb)
mlx5e_selq_prepare_htb(htb->selq, 0, 0); mlx5e_selq_prepare_htb(htb->selq, 0, 0);
mlx5e_selq_apply(htb->selq); mlx5e_selq_apply(htb->selq);
root = mlx5e_sw_node_find(htb, MLX5E_HTB_CLASSID_ROOT); root = mlx5e_htb_node_find(htb, MLX5E_HTB_CLASSID_ROOT);
if (!root) { if (!root) {
qos_err(htb->mdev, "Failed to find the root node in the QoS tree\n"); qos_err(htb->mdev, "Failed to find the root node in the QoS tree\n");
return -ENOENT; return -ENOENT;
...@@ -565,7 +565,7 @@ static int mlx5e_htb_root_del(struct mlx5e_htb *htb) ...@@ -565,7 +565,7 @@ static int mlx5e_htb_root_del(struct mlx5e_htb *htb)
if (err) if (err)
qos_err(htb->mdev, "Failed to destroy root node %u, err = %d\n", qos_err(htb->mdev, "Failed to destroy root node %u, err = %d\n",
root->hw_id, err); root->hw_id, err);
mlx5e_sw_node_delete(htb, root); mlx5e_htb_node_delete(htb, root);
mlx5e_qos_deactivate_all_queues(&priv->channels); mlx5e_qos_deactivate_all_queues(&priv->channels);
mlx5e_qos_close_all_queues(&priv->channels); mlx5e_qos_close_all_queues(&priv->channels);
...@@ -623,11 +623,11 @@ mlx5e_htb_leaf_alloc_queue(struct mlx5e_htb *htb, u16 classid, ...@@ -623,11 +623,11 @@ mlx5e_htb_leaf_alloc_queue(struct mlx5e_htb *htb, u16 classid,
return qid; return qid;
} }
parent = mlx5e_sw_node_find(htb, parent_classid); parent = mlx5e_htb_node_find(htb, parent_classid);
if (!parent) if (!parent)
return -EINVAL; return -EINVAL;
node = mlx5e_sw_node_create_leaf(htb, classid, qid, parent); node = mlx5e_htb_node_create_leaf(htb, classid, qid, parent);
if (IS_ERR(node)) if (IS_ERR(node))
return PTR_ERR(node); return PTR_ERR(node);
...@@ -642,7 +642,7 @@ mlx5e_htb_leaf_alloc_queue(struct mlx5e_htb *htb, u16 classid, ...@@ -642,7 +642,7 @@ mlx5e_htb_leaf_alloc_queue(struct mlx5e_htb *htb, u16 classid,
NL_SET_ERR_MSG_MOD(extack, "Firmware error when creating a leaf node."); NL_SET_ERR_MSG_MOD(extack, "Firmware error when creating a leaf node.");
qos_err(htb->mdev, "Failed to create a leaf node (class %04x), err = %d\n", qos_err(htb->mdev, "Failed to create a leaf node (class %04x), err = %d\n",
classid, err); classid, err);
mlx5e_sw_node_delete(htb, node); mlx5e_htb_node_delete(htb, node);
return err; return err;
} }
...@@ -673,7 +673,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid, ...@@ -673,7 +673,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid,
qos_dbg(htb->mdev, "TC_HTB_LEAF_TO_INNER classid %04x, upcoming child %04x, rate %llu, ceil %llu\n", qos_dbg(htb->mdev, "TC_HTB_LEAF_TO_INNER classid %04x, upcoming child %04x, rate %llu, ceil %llu\n",
classid, child_classid, rate, ceil); classid, child_classid, rate, ceil);
node = mlx5e_sw_node_find(htb, classid); node = mlx5e_htb_node_find(htb, classid);
if (!node) if (!node)
return -ENOENT; return -ENOENT;
...@@ -688,7 +688,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid, ...@@ -688,7 +688,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid,
} }
/* Intentionally reuse the qid for the upcoming first child. */ /* Intentionally reuse the qid for the upcoming first child. */
child = mlx5e_sw_node_create_leaf(htb, child_classid, node->qid, node); child = mlx5e_htb_node_create_leaf(htb, child_classid, node->qid, node);
if (IS_ERR(child)) { if (IS_ERR(child)) {
err = PTR_ERR(child); err = PTR_ERR(child);
goto err_destroy_hw_node; goto err_destroy_hw_node;
...@@ -710,7 +710,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid, ...@@ -710,7 +710,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid,
/* No fail point. */ /* No fail point. */
qid = node->qid; qid = node->qid;
/* Pairs with mlx5e_get_txq_by_classid. */ /* Pairs with mlx5e_htb_get_txq_by_classid. */
WRITE_ONCE(node->qid, MLX5E_QOS_QID_INNER); WRITE_ONCE(node->qid, MLX5E_QOS_QID_INNER);
if (test_bit(MLX5E_STATE_OPENED, &priv->state)) { if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {
...@@ -740,7 +740,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid, ...@@ -740,7 +740,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid,
err_delete_sw_node: err_delete_sw_node:
child->qid = MLX5E_QOS_QID_INNER; child->qid = MLX5E_QOS_QID_INNER;
mlx5e_sw_node_delete(htb, child); mlx5e_htb_node_delete(htb, child);
err_destroy_hw_node: err_destroy_hw_node:
tmp_err = mlx5_qos_destroy_node(htb->mdev, new_hw_id); tmp_err = mlx5_qos_destroy_node(htb->mdev, new_hw_id);
...@@ -750,7 +750,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid, ...@@ -750,7 +750,7 @@ mlx5e_htb_leaf_to_inner(struct mlx5e_htb *htb, u16 classid, u16 child_classid,
return err; return err;
} }
static struct mlx5e_qos_node *mlx5e_sw_node_find_by_qid(struct mlx5e_htb *htb, u16 qid) static struct mlx5e_qos_node *mlx5e_htb_node_find_by_qid(struct mlx5e_htb *htb, u16 qid)
{ {
struct mlx5e_qos_node *node = NULL; struct mlx5e_qos_node *node = NULL;
int bkt; int bkt;
...@@ -794,7 +794,7 @@ static int mlx5e_htb_leaf_del(struct mlx5e_htb *htb, u16 *classid, ...@@ -794,7 +794,7 @@ static int mlx5e_htb_leaf_del(struct mlx5e_htb *htb, u16 *classid,
qos_dbg(htb->mdev, "TC_HTB_LEAF_DEL classid %04x\n", *classid); qos_dbg(htb->mdev, "TC_HTB_LEAF_DEL classid %04x\n", *classid);
node = mlx5e_sw_node_find(htb, *classid); node = mlx5e_htb_node_find(htb, *classid);
if (!node) if (!node)
return -ENOENT; return -ENOENT;
...@@ -814,9 +814,9 @@ static int mlx5e_htb_leaf_del(struct mlx5e_htb *htb, u16 *classid, ...@@ -814,9 +814,9 @@ static int mlx5e_htb_leaf_del(struct mlx5e_htb *htb, u16 *classid,
qos_warn(htb->mdev, "Failed to destroy leaf node %u (class %04x), err = %d\n", qos_warn(htb->mdev, "Failed to destroy leaf node %u (class %04x), err = %d\n",
node->hw_id, *classid, err); node->hw_id, *classid, err);
mlx5e_sw_node_delete(htb, node); mlx5e_htb_node_delete(htb, node);
moved_qid = mlx5e_qos_cur_leaf_nodes(htb); moved_qid = mlx5e_htb_cur_leaf_nodes(htb);
if (moved_qid == 0) { if (moved_qid == 0) {
/* The last QoS SQ was just destroyed. */ /* The last QoS SQ was just destroyed. */
...@@ -838,7 +838,7 @@ static int mlx5e_htb_leaf_del(struct mlx5e_htb *htb, u16 *classid, ...@@ -838,7 +838,7 @@ static int mlx5e_htb_leaf_del(struct mlx5e_htb *htb, u16 *classid,
WARN(moved_qid == qid, "Can't move node with qid %u to itself", qid); WARN(moved_qid == qid, "Can't move node with qid %u to itself", qid);
qos_dbg(htb->mdev, "Moving QoS SQ %u to %u\n", moved_qid, qid); qos_dbg(htb->mdev, "Moving QoS SQ %u to %u\n", moved_qid, qid);
node = mlx5e_sw_node_find_by_qid(htb, moved_qid); node = mlx5e_htb_node_find_by_qid(htb, moved_qid);
WARN(!node, "Could not find a node with qid %u to move to queue %u", WARN(!node, "Could not find a node with qid %u to move to queue %u",
moved_qid, qid); moved_qid, qid);
...@@ -891,7 +891,7 @@ mlx5e_htb_leaf_del_last(struct mlx5e_htb *htb, u16 classid, bool force, ...@@ -891,7 +891,7 @@ mlx5e_htb_leaf_del_last(struct mlx5e_htb *htb, u16 classid, bool force,
qos_dbg(htb->mdev, "TC_HTB_LEAF_DEL_LAST%s classid %04x\n", qos_dbg(htb->mdev, "TC_HTB_LEAF_DEL_LAST%s classid %04x\n",
force ? "_FORCE" : "", classid); force ? "_FORCE" : "", classid);
node = mlx5e_sw_node_find(htb, classid); node = mlx5e_htb_node_find(htb, classid);
if (!node) if (!node)
return -ENOENT; return -ENOENT;
...@@ -910,7 +910,7 @@ mlx5e_htb_leaf_del_last(struct mlx5e_htb *htb, u16 classid, bool force, ...@@ -910,7 +910,7 @@ mlx5e_htb_leaf_del_last(struct mlx5e_htb *htb, u16 classid, bool force,
/* Store qid for reuse and prevent clearing the bit. */ /* Store qid for reuse and prevent clearing the bit. */
qid = node->qid; qid = node->qid;
/* Pairs with mlx5e_get_txq_by_classid. */ /* Pairs with mlx5e_htb_get_txq_by_classid. */
WRITE_ONCE(node->qid, MLX5E_QOS_QID_INNER); WRITE_ONCE(node->qid, MLX5E_QOS_QID_INNER);
if (test_bit(MLX5E_STATE_OPENED, &priv->state)) { if (test_bit(MLX5E_STATE_OPENED, &priv->state)) {
...@@ -927,7 +927,7 @@ mlx5e_htb_leaf_del_last(struct mlx5e_htb *htb, u16 classid, bool force, ...@@ -927,7 +927,7 @@ mlx5e_htb_leaf_del_last(struct mlx5e_htb *htb, u16 classid, bool force,
node->hw_id, classid, err); node->hw_id, classid, err);
parent = node->parent; parent = node->parent;
mlx5e_sw_node_delete(htb, node); mlx5e_htb_node_delete(htb, node);
node = parent; node = parent;
WRITE_ONCE(node->qid, qid); WRITE_ONCE(node->qid, qid);
...@@ -961,7 +961,7 @@ mlx5e_htb_leaf_del_last(struct mlx5e_htb *htb, u16 classid, bool force, ...@@ -961,7 +961,7 @@ mlx5e_htb_leaf_del_last(struct mlx5e_htb *htb, u16 classid, bool force,
} }
static int static int
mlx5e_qos_update_children(struct mlx5e_htb *htb, struct mlx5e_qos_node *node, mlx5e_htb_update_children(struct mlx5e_htb *htb, struct mlx5e_qos_node *node,
struct netlink_ext_ack *extack) struct netlink_ext_ack *extack)
{ {
struct mlx5e_qos_node *child; struct mlx5e_qos_node *child;
...@@ -1005,7 +1005,7 @@ mlx5e_htb_node_modify(struct mlx5e_htb *htb, u16 classid, u64 rate, u64 ceil, ...@@ -1005,7 +1005,7 @@ mlx5e_htb_node_modify(struct mlx5e_htb *htb, u16 classid, u64 rate, u64 ceil,
qos_dbg(htb->mdev, "TC_HTB_LEAF_MODIFY classid %04x, rate %llu, ceil %llu\n", qos_dbg(htb->mdev, "TC_HTB_LEAF_MODIFY classid %04x, rate %llu, ceil %llu\n",
classid, rate, ceil); classid, rate, ceil);
node = mlx5e_sw_node_find(htb, classid); node = mlx5e_htb_node_find(htb, classid);
if (!node) if (!node)
return -ENOENT; return -ENOENT;
...@@ -1029,7 +1029,7 @@ mlx5e_htb_node_modify(struct mlx5e_htb *htb, u16 classid, u64 rate, u64 ceil, ...@@ -1029,7 +1029,7 @@ mlx5e_htb_node_modify(struct mlx5e_htb *htb, u16 classid, u64 rate, u64 ceil,
node->max_average_bw = max_average_bw; node->max_average_bw = max_average_bw;
if (ceil_changed) if (ceil_changed)
err = mlx5e_qos_update_children(htb, node, extack); err = mlx5e_htb_update_children(htb, node, extack);
return err; return err;
} }
...@@ -1117,7 +1117,7 @@ int mlx5e_htb_setup_tc(struct mlx5e_priv *priv, struct tc_htb_qopt_offload *htb_ ...@@ -1117,7 +1117,7 @@ int mlx5e_htb_setup_tc(struct mlx5e_priv *priv, struct tc_htb_qopt_offload *htb_
return mlx5e_htb_node_modify(htb, htb_qopt->classid, htb_qopt->rate, htb_qopt->ceil, return mlx5e_htb_node_modify(htb, htb_qopt->classid, htb_qopt->rate, htb_qopt->ceil,
htb_qopt->extack); htb_qopt->extack);
case TC_HTB_LEAF_QUERY_QUEUE: case TC_HTB_LEAF_QUERY_QUEUE:
res = mlx5e_get_txq_by_classid(htb, htb_qopt->classid); res = mlx5e_htb_get_txq_by_classid(htb, htb_qopt->classid);
if (res < 0) if (res < 0)
return res; return res;
htb_qopt->qid = res; htb_qopt->qid = res;
......
drivers/net/ethernet/mellanox/mlx5/core/en/qos.h
View file @ 3685eed5
...@@ -16,10 +16,9 @@ struct tc_htb_qopt_offload; ...@@ -16,10 +16,9 @@ struct tc_htb_qopt_offload;
int mlx5e_qos_bytes_rate_check(struct mlx5_core_dev *mdev, u64 nbytes); int mlx5e_qos_bytes_rate_check(struct mlx5_core_dev *mdev, u64 nbytes);
int mlx5e_qos_max_leaf_nodes(struct mlx5_core_dev *mdev); int mlx5e_qos_max_leaf_nodes(struct mlx5_core_dev *mdev);
int mlx5e_qos_cur_leaf_nodes(struct mlx5e_htb *htb);
/* TX datapath API */ /* TX datapath API */
int mlx5e_get_txq_by_classid(struct mlx5e_htb *htb, u16 classid); int mlx5e_htb_get_txq_by_classid(struct mlx5e_htb *htb, u16 classid);
/* SQ lifecycle */ /* SQ lifecycle */
int mlx5e_qos_open_queues(struct mlx5e_priv *priv, struct mlx5e_channels *chs); int mlx5e_qos_open_queues(struct mlx5e_priv *priv, struct mlx5e_channels *chs);
...@@ -28,6 +27,7 @@ void mlx5e_qos_deactivate_queues(struct mlx5e_channel *c); ...@@ -28,6 +27,7 @@ void mlx5e_qos_deactivate_queues(struct mlx5e_channel *c);
void mlx5e_qos_close_queues(struct mlx5e_channel *c); void mlx5e_qos_close_queues(struct mlx5e_channel *c);
/* HTB API */ /* HTB API */
int mlx5e_htb_cur_leaf_nodes(struct mlx5e_htb *htb);
int mlx5e_htb_setup_tc(struct mlx5e_priv *priv, struct tc_htb_qopt_offload *htb); int mlx5e_htb_setup_tc(struct mlx5e_priv *priv, struct tc_htb_qopt_offload *htb);
/* MQPRIO TX rate limit */ /* MQPRIO TX rate limit */
......
drivers/net/ethernet/mellanox/mlx5/core/en/selq.c
View file @ 3685eed5
...@@ -184,7 +184,7 @@ static int mlx5e_select_htb_queue(struct mlx5e_priv *priv, struct sk_buff *skb, ...@@ -184,7 +184,7 @@ static int mlx5e_select_htb_queue(struct mlx5e_priv *priv, struct sk_buff *skb,
if (!classid) if (!classid)
return 0; return 0;
return mlx5e_get_txq_by_classid(priv->htb, classid); return mlx5e_htb_get_txq_by_classid(priv->htb, classid);
} }
u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb, u16 mlx5e_select_queue(struct net_device *dev, struct sk_buff *skb,
......
drivers/net/ethernet/mellanox/mlx5/core/en_main.c
View file @ 3685eed5
...@@ -2578,7 +2578,7 @@ int mlx5e_update_tx_netdev_queues(struct mlx5e_priv *priv) ...@@ -2578,7 +2578,7 @@ int mlx5e_update_tx_netdev_queues(struct mlx5e_priv *priv)
int qos_queues = 0; int qos_queues = 0;
if (priv->htb) if (priv->htb)
qos_queues = mlx5e_qos_cur_leaf_nodes(priv->htb); qos_queues = mlx5e_htb_cur_leaf_nodes(priv->htb);
nch = priv->channels.params.num_channels; nch = priv->channels.params.num_channels;
ntc = mlx5e_get_dcb_num_tc(&priv->channels.params); ntc = mlx5e_get_dcb_num_tc(&priv->channels.params);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7