From: Danesh Petigara <danesh.petigara@broadcom.com>
To: justin.chen@broadcom.com, florian.fainelli@broadcom.com,
andrew+netdev@lunn.ch, davem@davemloft.net, edumazet@google.com,
kuba@kernel.org, pabeni@redhat.com
Cc: horms@kernel.org, bcm-kernel-feedback-list@broadcom.com,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Danesh Petigara <danesh.petigara@broadcom.com>
Subject: [PATCH net 2/2] net: bcmasp: fix tx_spb_ring_full() checking same slot cnt times
Date: Mon, 31 Aug 2026 11:42:35 -0700 [thread overview]
Message-ID: <20260831184235.4133351-3-danesh.petigara@broadcom.com> (raw)
In-Reply-To: <20260831184235.4133351-1-danesh.petigara@broadcom.com>
From: Justin Chen <justin.chen@broadcom.com>
The loop initialised next_index from intf->tx_spb_index on every
iteration, so incr_ring() always produced the same result and only
one slot was ever tested. Move the initialisation before the loop
so each iteration advances next_index and the function correctly
checks that cnt consecutive descriptor slots are available before
allowing a new transmission.
Fixes: 490cb412007d ("net: bcmasp: Add support for ASP2.0 Ethernet controller")
Signed-off-by: Justin Chen <justin.chen@broadcom.com>
Assisted-by: Claude:claude-sonnet-4-6 vscode
Signed-off-by: Danesh Petigara <danesh.petigara@broadcom.com>
---
drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
index 2bd035f74fa2..f2176ef3a127 100644
--- a/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
+++ b/drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c
@@ -148,8 +148,9 @@ static int tx_spb_ring_full(struct bcmasp_intf *intf, int cnt)
int next_index, i;
/* Check if we have enough room for cnt descriptors */
+ next_index = intf->tx_spb_index;
for (i = 0; i < cnt; i++) {
- next_index = incr_ring(intf->tx_spb_index, DESC_RING_COUNT);
+ next_index = incr_ring(next_index, DESC_RING_COUNT);
if (next_index == intf->tx_spb_clean_index)
return 1;
}
--
2.54.0
next prev parent reply other threads:[~2026-08-31 18:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-08-31 18:42 [PATCH net 0/2] net: bcmasp: fix TX ring accounting bugs Danesh Petigara
2026-08-31 18:42 ` [PATCH net 1/2] net: bcmasp: clear txcb->last before writing each descriptor Danesh Petigara
2026-09-03 22:39 ` Florian Fainelli
2026-08-31 18:42 ` Danesh Petigara [this message]
2026-09-03 22:39 ` [PATCH net 2/2] net: bcmasp: fix tx_spb_ring_full() checking same slot cnt times Florian Fainelli
2026-09-04 0:00 ` [PATCH net 0/2] net: bcmasp: fix TX ring accounting bugs patchwork-bot+netdevbpf
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=20260831184235.4133351-3-danesh.petigara@broadcom.com \
--to=danesh.petigara@broadcom.com \
--cc=andrew+netdev@lunn.ch \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=florian.fainelli@broadcom.com \
--cc=horms@kernel.org \
--cc=justin.chen@broadcom.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.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