From: Roland Vossen Date: Tue, 3 May 2011 09:35:26 +0000 (+0200) Subject: staging: brcm80211: removed all ASSERTs from wlc_ampdu.c X-Git-Tag: v3.0-rc1~336^2~567 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b78442d12bfccad78e94102f02ef87f143b950c8;p=karo-tx-linux.git staging: brcm80211: removed all ASSERTs from wlc_ampdu.c Either removed ASSERTs or replaced with WARN_ON in case of HW failure. Cc: devel@linuxdriverproject.org Cc: linux-wireless@vger.kernel.org Cc: Brett Rudley Cc: Henry Ptasinski Cc: Roland Vossen Signed-off-by: Arend van Spriel Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c index b3e12f7398f9..04493e9730ee 100644 --- a/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c +++ b/drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c @@ -520,8 +520,6 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi, f = ampdu->fifo_tb + prio2fifo[tid]; scb = wlc->pub->global_scb; - ASSERT(scb->magic == SCB_MAGIC); - scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb); ini = &scb_ampdu->ini[tid]; @@ -900,7 +898,6 @@ wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb, if (likely(scb)) { scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb); ini = SCB_AMPDU_INI(scb_ampdu, p->priority); - ASSERT(ini->scb == scb); wlc_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2); } else { /* loop through all pkts and free */ @@ -983,13 +980,13 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, update_rate = false; } - ASSERT(txs->status & TX_STATUS_INTERMEDIATE); + WARN_ON(!(txs->status & TX_STATUS_INTERMEDIATE)); start_seq = txs->sequence >> SEQNUM_SHIFT; bitmap[0] = (txs->status & TX_STATUS_BA_BMAP03_MASK) >> TX_STATUS_BA_BMAP03_SHIFT; - ASSERT(!(s1 & TX_STATUS_INTERMEDIATE)); - ASSERT(s1 & TX_STATUS_AMPDU); + WARN_ON(s1 & TX_STATUS_INTERMEDIATE); + WARN_ON(!(s1 & TX_STATUS_AMPDU)); bitmap[0] |= (s1 & TX_STATUS_BA_BMAP47_MASK) <<