From: Saeed Mahameed <saeedm@mellanox.com>
To: "David S. Miller" <davem@davemloft.net>
Cc: netdev@vger.kernel.org,
Jesper Dangaard Brouer <brouer@redhat.com>,
Jonathan Lemon <bsd@fb.com>,
Maxim Mikityanskiy <maximmi@mellanox.com>,
Tariq Toukan <tariqt@mellanox.com>,
Saeed Mahameed <saeedm@mellanox.com>
Subject: [net-next V2 13/13] net/mlx5e: Use #define for the WQE wait timeout constant
Date: Tue, 23 Apr 2019 12:15:00 -0700 [thread overview]
Message-ID: <20190423191500.16632-14-saeedm@mellanox.com> (raw)
In-Reply-To: <20190423191500.16632-1-saeedm@mellanox.com>
From: Maxim Mikityanskiy <maximmi@mellanox.com>
Create a #define for the timeout of mlx5e_wait_for_min_rx_wqes to
clarify the meaning of a magic number.
Signed-off-by: Maxim Mikityanskiy <maximmi@mellanox.com>
Reviewed-by: Tariq Toukan <tariqt@mellanox.com>
Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
---
drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
index 8ae17dcad487..69a9d67396ec 100644
--- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
+++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c
@@ -2256,14 +2256,18 @@ static void mlx5e_activate_channels(struct mlx5e_channels *chs)
mlx5e_activate_channel(chs->c[i]);
}
+#define MLX5E_RQ_WQES_TIMEOUT 20000 /* msecs */
+
static int mlx5e_wait_channels_min_rx_wqes(struct mlx5e_channels *chs)
{
int err = 0;
int i;
- for (i = 0; i < chs->num; i++)
- err |= mlx5e_wait_for_min_rx_wqes(&chs->c[i]->rq,
- err ? 0 : 20000);
+ for (i = 0; i < chs->num; i++) {
+ int timeout = err ? 0 : MLX5E_RQ_WQES_TIMEOUT;
+
+ err |= mlx5e_wait_for_min_rx_wqes(&chs->c[i]->rq, timeout);
+ }
return err ? -ETIMEDOUT : 0;
}
--
2.20.1
next prev parent reply other threads:[~2019-04-23 19:16 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-23 19:14 [pull request][net-next V2 00/13] Mellanox, mlx5 RX and XDP improvements Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 01/13] net/mlx5e: RX, Support multiple outstanding UMR posts Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 02/13] net/mlx5e: XDP, Fix shifted flag index in RQ bitmap Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 03/13] net/mlx5e: XDP, Enhance RQ indication for XDP redirect flush Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 04/13] net/mlx5e: XDP, Add TX MPWQE session counter Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 05/13] net/mlx5e: XDP, Inline small packets into the TX MPWQE in XDP xmit flow Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 06/13] net/mlx5e: Remove unused parameter Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 07/13] net/mlx5e: Report mlx5e_xdp_set errors Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 08/13] net/mlx5e: Move parameter calculation functions to en/params.c Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 09/13] net/mlx5e: Add an underflow warning comment Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 10/13] net/mlx5e: Remove unused parameter Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 11/13] net/mlx5e: Take HW interrupt trigger into a function Saeed Mahameed
2019-04-23 19:14 ` [net-next V2 12/13] net/mlx5e: Remove unused rx_page_reuse stat Saeed Mahameed
2019-04-23 19:15 ` Saeed Mahameed [this message]
2019-04-23 23:25 ` [pull request][net-next V2 00/13] Mellanox, mlx5 RX and XDP improvements Jakub Kicinski
2019-04-24 0:08 ` David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190423191500.16632-14-saeedm@mellanox.com \
--to=saeedm@mellanox.com \
--cc=brouer@redhat.com \
--cc=bsd@fb.com \
--cc=davem@davemloft.net \
--cc=maximmi@mellanox.com \
--cc=netdev@vger.kernel.org \
--cc=tariqt@mellanox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).