mac80211: make CALL_TXH a statement
Johannes Berg
maintainerPATCH 1/1 mac80211: make CALL_TXH a statement
The multi-line code in this macro wasn't wrapped
in do {} while (0) so we cannot use it in an if()
branch safely in the future -- fix that.
--- net/mac80211/tx.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-)
net/mac80211/tx.c +18 -16
@@ -1201,23 +1201,25 @@ static int invoke_tx_handlers(struct ieestruct sk_buff *skb = tx->skb;ieee80211_tx_result res =TX_DROP ; -#define CALL_TXH (txh) \ - res = txh(tx); \ - if (res != TX_CONTINUE) \ - goto txh_done; - - CALL_TXH(ieee80211_tx_h_check_assoc) - CALL_TXH(ieee80211_tx_h_ps_buf) - CALL_TXH(ieee80211_tx_h_select_key) - CALL_TXH(ieee80211_tx_h_michael_mic_add) - CALL_TXH(ieee80211_tx_h_rate_ctrl) - CALL_TXH(ieee80211_tx_h_misc) - CALL_TXH(ieee80211_tx_h_sequence) - CALL_TXH(ieee80211_tx_h_fragment) +#define CALL_TXH (txh) \ + do { \ + res = txh(tx); \ + if (res != TX_CONTINUE) \ + goto txh_done; \ + } while (0) + +CALL_TXH (ieee80211_tx_h_check_assoc); +CALL_TXH (ieee80211_tx_h_ps_buf); +CALL_TXH (ieee80211_tx_h_select_key); +CALL_TXH (ieee80211_tx_h_michael_mic_add); +CALL_TXH (ieee80211_tx_h_rate_ctrl); +CALL_TXH (ieee80211_tx_h_misc); +CALL_TXH (ieee80211_tx_h_sequence); +CALL_TXH (ieee80211_tx_h_fragment);/* handlers after fragment must be aware of tx info fragmentation! */ - CALL_TXH(ieee80211_tx_h_stats) - CALL_TXH(ieee80211_tx_h_encrypt) - CALL_TXH(ieee80211_tx_h_calculate_duration) +CALL_TXH (ieee80211_tx_h_stats); +CALL_TXH (ieee80211_tx_h_encrypt); +CALL_TXH (ieee80211_tx_h_calculate_duration);#undef CALL_TXH txh_done:
Quoted 5 lines · Johannes Berg
The multi-line code in this macro wasn't wrapped
in do {} while (0) so we cannot use it in anif()
branch safely in the future -- fix that.Signed-off-by Johannes Berg <[email protected]>
do {...} while (0) won't work for that either, right? You need ({...}) instead if you want to return a value. Is that what you want?
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.
Johannes Berg
maintainerQuoted 9 lines · John W. Linville
Quoted 5 lines · Johannes Berg
The multi-line code in this macro wasn't wrapped
in do {} while (0) so we cannot use it in anif()
branch safely in the future -- fix that.Signed-off-by Johannes Berg <[email protected]>do {...} while (0) won't work for that either, right? You need ({...}) instead if you want to return a value. Is that what you want?
No, I just want to be able to do
if (...)
CALL_TXH(...)
johannes
Quoted 8 lines · Johannes Berg
Quoted 7 lines · John W. Linville
Quoted 5 lines · Johannes Berg
The multi-line code in this macro wasn't wrapped
in do {} while (0) so we cannot use it in anif()
branch safely in the future -- fix that.Signed-off-by Johannes Berg <[email protected]>
Quoted 7 lines
Quoted 2 lines
do {...} while (0) won't work for that either, right? You need ({...}) instead if you want to return a value. Is that what you want?
No, I just want to be able to do
if (...)
CALL_TXH(...)
Oh, I see -- I misunderstood you.
John
Signature · 2 lines
John W. Linville Someday the world will need a hero, and you [email protected] might be all we have. Be ready.