From: Thierry Reding <thierry.reding@gmail•com>
To: Niklas Cassel <niklas.cassel@axis•com>
Cc: Joao Pinto <Joao.Pinto@synopsys•com>,
David Miller <davem@davemloft•net>,
clabbe.montjoie@gmail•com, peppe.cavallaro@st•com,
alexandre.torgue@st•com, sergei.shtylyov@cogentembedded•com,
f.fainelli@gmail•com, netdev@vger•kernel.org
Subject: [PATCH 2/3] net: stmmac: Always use the number of configured TX queues
Date: Tue, 28 Mar 2017 15:57:05 +0200 [thread overview]
Message-ID: <20170328135706.7605-2-thierry.reding@gmail.com> (raw)
In-Reply-To: <20170328135706.7605-1-thierry.reding@gmail.com>
From: Thierry Reding <treding@nvidia•com>
Even if hardware supports multiple queues, software can choose to only
use a subset of them. Make sure we never try to access uninitialized
queues.
Signed-off-by: Thierry Reding <treding@nvidia•com>
---
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
index 106ace3781b3..ec5bba85c529 100644
--- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
+++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -3423,7 +3423,7 @@ static int stmmac_poll(struct napi_struct *napi, int budget)
struct stmmac_rx_queue *rx_q =
container_of(napi, struct stmmac_rx_queue, napi);
struct stmmac_priv *priv = rx_q->priv_data;
- u32 tx_count = priv->dma_cap.number_tx_queues;
+ u32 tx_count = priv->plat->tx_queues_to_use;
u32 chan = rx_q->queue_index;
u32 work_done = 0;
u32 queue = 0;
--
2.12.0
next prev parent reply other threads:[~2017-03-28 13:58 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-24 17:16 [PATCH net-next 0/2] net: stmmac: multiple queue fixes Joao Pinto
2017-03-24 17:16 ` [PATCH net-next 1/2] net: stmmac: fix netdev release Joao Pinto
2017-03-24 17:16 ` [PATCH net-next 2/2] net: stmmac: fix number of tx queues in stmmac_poll Joao Pinto
2017-03-25 7:26 ` Corentin Labbe
2017-03-27 9:04 ` Joao Pinto
2017-03-27 9:09 ` Corentin Labbe
2017-03-27 9:12 ` Joao Pinto
2017-03-27 13:28 ` Niklas Cassel
2017-03-27 13:34 ` Joao Pinto
2017-03-27 13:36 ` Joao Pinto
2017-03-27 15:26 ` Joao Pinto
2017-03-27 17:00 ` Corentin Labbe
2017-03-27 17:06 ` Joao Pinto
2017-03-27 18:43 ` Corentin Labbe
2017-03-27 17:28 ` David Miller
2017-03-27 17:44 ` Joao Pinto
2017-03-27 18:49 ` Corentin Labbe
2017-03-27 21:00 ` David Miller
2017-03-28 13:34 ` Niklas Cassel
2017-03-28 13:56 ` Thierry Reding
2017-03-28 13:57 ` [PATCH 1/3] net: stmmac: Remove unneeded checks for NULL pointer Thierry Reding
2017-03-28 13:57 ` Thierry Reding [this message]
2017-03-28 14:10 ` [PATCH 2/3] net: stmmac: Always use the number of configured TX queues Niklas Cassel
2017-03-28 14:29 ` Thierry Reding
2017-03-28 13:57 ` [PATCH 3/3] net: stmmac: Prefer kcalloc() over kmalloc_array() Thierry Reding
2017-03-29 8:51 ` Niklas Cassel
2017-03-28 11:23 ` [PATCH net-next 0/2] net: stmmac: multiple queue fixes Niklas Cassel
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=20170328135706.7605-2-thierry.reding@gmail.com \
--to=thierry.reding@gmail$(echo .)com \
--cc=Joao.Pinto@synopsys$(echo .)com \
--cc=alexandre.torgue@st$(echo .)com \
--cc=clabbe.montjoie@gmail$(echo .)com \
--cc=davem@davemloft$(echo .)net \
--cc=f.fainelli@gmail$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=niklas.cassel@axis$(echo .)com \
--cc=peppe.cavallaro@st$(echo .)com \
--cc=sergei.shtylyov@cogentembedded$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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