Commit b78442d1 authored by Roland Vossen's avatar Roland Vossen Committed by Greg Kroah-Hartman

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 <brudley@broadcom.com>
Cc: Henry Ptasinski <henryp@broadcom.com>
Cc: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 155142fc
...@@ -520,8 +520,6 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi, ...@@ -520,8 +520,6 @@ wlc_sendampdu(struct ampdu_info *ampdu, struct wlc_txq_info *qi,
f = ampdu->fifo_tb + prio2fifo[tid]; f = ampdu->fifo_tb + prio2fifo[tid];
scb = wlc->pub->global_scb; scb = wlc->pub->global_scb;
ASSERT(scb->magic == SCB_MAGIC);
scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb); scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);
ini = &scb_ampdu->ini[tid]; ini = &scb_ampdu->ini[tid];
...@@ -900,7 +898,6 @@ wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb, ...@@ -900,7 +898,6 @@ wlc_ampdu_dotxstatus(struct ampdu_info *ampdu, struct scb *scb,
if (likely(scb)) { if (likely(scb)) {
scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb); scb_ampdu = SCB_AMPDU_CUBBY(ampdu, scb);
ini = SCB_AMPDU_INI(scb_ampdu, p->priority); ini = SCB_AMPDU_INI(scb_ampdu, p->priority);
ASSERT(ini->scb == scb);
wlc_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2); wlc_ampdu_dotxstatus_complete(ampdu, scb, p, txs, s1, s2);
} else { } else {
/* loop through all pkts and free */ /* loop through all pkts and free */
...@@ -983,13 +980,13 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb, ...@@ -983,13 +980,13 @@ wlc_ampdu_dotxstatus_complete(struct ampdu_info *ampdu, struct scb *scb,
update_rate = false; update_rate = false;
} }
ASSERT(txs->status & TX_STATUS_INTERMEDIATE); WARN_ON(!(txs->status & TX_STATUS_INTERMEDIATE));
start_seq = txs->sequence >> SEQNUM_SHIFT; start_seq = txs->sequence >> SEQNUM_SHIFT;
bitmap[0] = (txs->status & TX_STATUS_BA_BMAP03_MASK) >> bitmap[0] = (txs->status & TX_STATUS_BA_BMAP03_MASK) >>
TX_STATUS_BA_BMAP03_SHIFT; TX_STATUS_BA_BMAP03_SHIFT;
ASSERT(!(s1 & TX_STATUS_INTERMEDIATE)); WARN_ON(s1 & TX_STATUS_INTERMEDIATE);
ASSERT(s1 & TX_STATUS_AMPDU); WARN_ON(!(s1 & TX_STATUS_AMPDU));
bitmap[0] |= bitmap[0] |=
(s1 & TX_STATUS_BA_BMAP47_MASK) << (s1 & TX_STATUS_BA_BMAP47_MASK) <<
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment