ath5k: remove some unneeded error handling code
Subsystems (2)
PATCH 1/1 ath5k: remove some unneeded error handling code
th5k_hw_setup_tx_queue() returns a valid offset into the ah->ah_txq[] array. The ah->ah_txq[] and the ah->txqs[] array are the same size. Both have AR5K_NUM_TX_QUEUES elements. So this error handling code will never trigger.
Also it's wrong. The call to ath5k_hw_release_tx_queue() with a qnum of AR5K_NUM_TX_QUEUES or more will just trigger a WARN_ON() and return. Or if it missed the WARN_ON(), it would just corrupt some memory and return.
drivers/net/wireless/ath/ath5k/base.c +0 -6
@@ -921,12 +921,6 @@ ath5k_txq_setup(struct ath5k_hw *ah,*/ return ERR_PTR (qnum); } -if (qnum >=ARRAY_SIZE (ah->txqs)) { -ATH5K_ERR (ah,"hw qnum %u out of range, max %tu!\n" , - qnum,ARRAY_SIZE (ah->txqs)); -ath5k_hw_release_tx_queue (ah, qnum); -return ERR_PTR (-EINVAL ); - } txq = &ah->txqs[qnum];if (!txq->setup) { txq->qnum = qnum;
Quoted 1 line · Dan Carpenter
th5k_hw_setup_tx_queue()returns a valid offset into the ah->ah_txq[]
ath5k_....
Quoted 3 lines
array. The ah->ah_txq[] and the ah->txqs[] array are the same size. Both have
AR5K_NUM_TX_QUEUESelements. So this error handling code will never trigger.
This originally came from the HAL. I concur that this code will not be executed, since the enum from which ath5k_hw_setup_tx_queue() selects qnum has all elements less than AR5K_NUM_TX_QUEUES, which in turn is equal to ARRAY_SIZE(ah->txqs). ath5k_hw_setup_tx_queue() already uses qnum in a memset of a same-sized array (ah->txq).
Quoted 4 lines
Also it's wrong. The call to
ath5k_hw_release_tx_queue()with a qnum ofAR5K_NUM_TX_QUEUESor more will just trigger aWARN_ON()and return. Or if it missed theWARN_ON(), it would just corrupt some memory and return.
"corrupt memory and return" sounds undeserving of the adverb 'just' :) I guess you are trying to say that it should not have called ath5k_hw_release_tx_queue() but I read this comment as saying the ATH5K_ERR() was superfluous?
ath5k_hw_release_tx_queue() compares against the queue capabilities instead of AR5K_NUM_TX_QUEUES, so there's extra potential for the "just corrupt memory and return" case -- but since those are also initialized to AR5K_NUM_TX_QUEUES{,_NO_QCU}, that case won't happen either.
All that to say the patch is fine, but the patch description didn't convince me so I double-checked. My comments above reflect how I might have worded it.
Thanks for the patch!
Quoted 21 lines
Signed-off-by Dan Carpenter <[email protected]>drivers/net/wireless/ath/ath5k/base.c +0
-6@@ -921,12 +921,6 @@ ath5k_txq_setup(struct ath5k_hw *ah,*/ return ERR_PTR (qnum); } -if (qnum >=ARRAY_SIZE (ah->txqs)) { -ATH5K_ERR (ah,"hw qnum %u out of range, max %tu!\n" , - qnum,ARRAY_SIZE (ah->txqs)); -ath5k_hw_release_tx_queue (ah, qnum); -return ERR_PTR (-EINVAL ); - } txq = &ah->txqs[qnum];if (!txq->setup) { txq->qnum = qnum;
Signature · 1 line
Bob Copeland %% www.bobcopeland.com