diff options
author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2009-09-14 02:28:00 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-10-07 16:39:30 -0400 |
commit | 9680e8a391078a2bfa099b2c59542a6916a023ed (patch) | |
tree | 23167a05d19e72826bd35c661bd702b463294789 /drivers/net/wireless/ath/ath9k/xmit.c | |
parent | e3d01bfc3ea4f17c9e91bb930f10062efb0c86eb (diff) |
ath9k: remove driver ASSERT, just use BUG_ON()
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ath/ath9k/xmit.c')
-rw-r--r-- | drivers/net/wireless/ath/ath9k/xmit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c index f302652af396..a8620b1d091b 100644 --- a/drivers/net/wireless/ath/ath9k/xmit.c +++ b/drivers/net/wireless/ath/ath9k/xmit.c | |||
@@ -107,7 +107,7 @@ static void ath_tx_resume_tid(struct ath_softc *sc, struct ath_atx_tid *tid) | |||
107 | { | 107 | { |
108 | struct ath_txq *txq = &sc->tx.txq[tid->ac->qnum]; | 108 | struct ath_txq *txq = &sc->tx.txq[tid->ac->qnum]; |
109 | 109 | ||
110 | ASSERT(tid->paused > 0); | 110 | BUG_ON(tid->paused <= 0); |
111 | spin_lock_bh(&txq->axq_lock); | 111 | spin_lock_bh(&txq->axq_lock); |
112 | 112 | ||
113 | tid->paused--; | 113 | tid->paused--; |
@@ -131,7 +131,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid) | |||
131 | struct list_head bf_head; | 131 | struct list_head bf_head; |
132 | INIT_LIST_HEAD(&bf_head); | 132 | INIT_LIST_HEAD(&bf_head); |
133 | 133 | ||
134 | ASSERT(tid->paused > 0); | 134 | BUG_ON(tid->paused <= 0); |
135 | spin_lock_bh(&txq->axq_lock); | 135 | spin_lock_bh(&txq->axq_lock); |
136 | 136 | ||
137 | tid->paused--; | 137 | tid->paused--; |
@@ -143,7 +143,7 @@ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid) | |||
143 | 143 | ||
144 | while (!list_empty(&tid->buf_q)) { | 144 | while (!list_empty(&tid->buf_q)) { |
145 | bf = list_first_entry(&tid->buf_q, struct ath_buf, list); | 145 | bf = list_first_entry(&tid->buf_q, struct ath_buf, list); |
146 | ASSERT(!bf_isretried(bf)); | 146 | BUG_ON(bf_isretried(bf)); |
147 | list_move_tail(&bf->list, &bf_head); | 147 | list_move_tail(&bf->list, &bf_head); |
148 | ath_tx_send_ht_normal(sc, txq, tid, &bf_head); | 148 | ath_tx_send_ht_normal(sc, txq, tid, &bf_head); |
149 | } | 149 | } |
@@ -178,7 +178,7 @@ static void ath_tx_addto_baw(struct ath_softc *sc, struct ath_atx_tid *tid, | |||
178 | index = ATH_BA_INDEX(tid->seq_start, bf->bf_seqno); | 178 | index = ATH_BA_INDEX(tid->seq_start, bf->bf_seqno); |
179 | cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1); | 179 | cindex = (tid->baw_head + index) & (ATH_TID_MAX_BUFS - 1); |
180 | 180 | ||
181 | ASSERT(tid->tx_buf[cindex] == NULL); | 181 | BUG_ON(tid->tx_buf[cindex] != NULL); |
182 | tid->tx_buf[cindex] = bf; | 182 | tid->tx_buf[cindex] = bf; |
183 | 183 | ||
184 | if (index >= ((tid->baw_tail - tid->baw_head) & | 184 | if (index >= ((tid->baw_tail - tid->baw_head) & |
@@ -358,7 +358,7 @@ static void ath_tx_complete_aggr(struct ath_softc *sc, struct ath_txq *txq, | |||
358 | else | 358 | else |
359 | INIT_LIST_HEAD(&bf_head); | 359 | INIT_LIST_HEAD(&bf_head); |
360 | } else { | 360 | } else { |
361 | ASSERT(!list_empty(bf_q)); | 361 | BUG_ON(list_empty(bf_q)); |
362 | list_move_tail(&bf->list, &bf_head); | 362 | list_move_tail(&bf->list, &bf_head); |
363 | } | 363 | } |
364 | 364 | ||
@@ -946,7 +946,7 @@ int ath_txq_update(struct ath_softc *sc, int qnum, | |||
946 | return 0; | 946 | return 0; |
947 | } | 947 | } |
948 | 948 | ||
949 | ASSERT(sc->tx.txq[qnum].axq_qnum == qnum); | 949 | BUG_ON(sc->tx.txq[qnum].axq_qnum != qnum); |
950 | 950 | ||
951 | ath9k_hw_get_txq_props(ah, qnum, &qi); | 951 | ath9k_hw_get_txq_props(ah, qnum, &qi); |
952 | qi.tqi_aifs = qinfo->tqi_aifs; | 952 | qi.tqi_aifs = qinfo->tqi_aifs; |