Hi Camaleón,
Camaleón wrote:
> Since the last days, I'm experiencing some unstability with the brcmsmac
> driver
> and get kernel traces like this in the logs:
>
> [ 210.896074] ------------[ cut here ]------------
> [ 210.896138] WARNING: at
> [...]/drivers/net/wireless/brcm80211/brcmsmac/main.c:8234
> brcms_c_wait_for_tx_completion+0x73/0x7d [brcmsmac]()
Context: https://bugzilla.kernel.org/show_bug.cgi?id=42576
Does the attached patch change anything?
From: Arend van Spriel <ar...@broadcom.com>
Date: Thu, 23 Feb 2012 18:38:22 +0100
Subject: brcm80211: smac: fix endless retry of A-MPDU transmissions
commit 85091fc0a75653e239dc8379658515e577544927 upstream.
The A-MPDU code checked against a retry limit, but it was using
the wrong variable to do so. This patch fixes this to assure
proper retry mechanism.
This problem had a side-effect causing the mac80211 flush callback
to remain waiting forever as well. That side effect has been fixed
by commit by Stanislaw Gruszka:
commit f96b08a7e6f69c0f0a576554df3df5b1b519c479
Date: Tue Jan 17 12:38:50 2012 +0100
brcmsmac: fix tx queue flush infinite loop
Reference:
https://bugzilla.kernel.org/show_bug.cgi?id=42576
Cc: Stanislaw Gruszka <sgrus...@redhat.com>
Reviewed-by: Pieter-Paul Giesberts <piete...@broadcom.com>
Reviewed-by: Alwin Beukers <al...@broadcom.com>
Signed-off-by: Arend van Spriel <ar...@broadcom.com>
Signed-off-by: John W. Linville <linvi...@tuxdriver.com>
Signed-off-by: Jonathan Nieder <jrnie...@gmail.com>
---
drivers/net/wireless/brcm80211/brcmsmac/ampdu.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
index 7f27dbdb6b60..051586275f14 100644
--- a/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
+++ b/drivers/net/wireless/brcm80211/brcmsmac/ampdu.c
@@ -1053,17 +1053,13 @@ brcms_c_ampdu_dotxstatus_complete(struct ampdu_info
*ampdu, struct scb *scb,
}
/* either retransmit or send bar if ack not recd */
if (!ack_recd) {
- struct ieee80211_tx_rate *txrate =
- tx_info->status.rates;
- if (retry && (txrate[0].count < (int)retry_limit)) {
+ if (retry && (ini->txretry[index] < (int)retry_limit)) {
ini->txretry[index]++;
ini->tx_in_transit--;
/*
* Use high prededence for retransmit to
* give some punch
*/
- /* brcms_c_txq_enq(wlc, scb, p,
- * BRCMS_PRIO_TO_PREC(tid)); */
brcms_c_txq_enq(wlc, scb, p,
BRCMS_PRIO_TO_HI_PREC(tid));
} else {
--
1.7.10.rc1
