leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iwlwifi: mvm: simplify CHECK_MLME_TRIGGER macro

Browse Source 
There's no reason to pass mvm and trig as parameters to the macro,
since it will be expanded inside the function itself.  Also remove the
bogus buf parameter which doesn't exist and is not used.

Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
This commit is contained in:
Luca Coelho
2017-05-19 15:06:29 +03:00
parent 806911da64
commit 4c324a51b6
1 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
View File

@@ -4151,11 +4151,11 @@ static void iwl_mvm_event_mlme_callback(struct iwl_mvm *mvm,
struct ieee80211_vif *vif, struct ieee80211_vif *vif,
const struct ieee80211_event *event) const struct ieee80211_event *event)
{ {
#define CHECK_MLME_TRIGGER(_mvm, _trig, _buf, _cnt, _fmt...) \ #define CHECK_MLME_TRIGGER(_cnt, _fmt...) \
do { \ do { \
if ((_cnt) && --(_cnt)) \ if ((trig_mlme->_cnt) && --(trig_mlme->_cnt)) \
break; \ break; \
iwl_mvm_fw_dbg_collect_trig(_mvm, _trig, _fmt);\ iwl_mvm_fw_dbg_collect_trig(mvm, trig, _fmt); \
} while (0) } while (0)
struct iwl_fw_dbg_trigger_tlv *trig; struct iwl_fw_dbg_trigger_tlv *trig;
@@ -4171,31 +4171,25 @@ static void iwl_mvm_event_mlme_callback(struct iwl_mvm *mvm,
if (event->u.mlme.data == ASSOC_EVENT) { if (event->u.mlme.data == ASSOC_EVENT) {
if (event->u.mlme.status == MLME_DENIED) if (event->u.mlme.status == MLME_DENIED)
CHECK_MLME_TRIGGER(mvm, trig, buf, CHECK_MLME_TRIGGER(stop_assoc_denied,
trig_mlme->stop_assoc_denied,
"DENIED ASSOC: reason %d", "DENIED ASSOC: reason %d",
event->u.mlme.reason); event->u.mlme.reason);
else if (event->u.mlme.status == MLME_TIMEOUT) else if (event->u.mlme.status == MLME_TIMEOUT)
CHECK_MLME_TRIGGER(mvm, trig, buf, CHECK_MLME_TRIGGER(stop_assoc_timeout,
trig_mlme->stop_assoc_timeout,
"ASSOC TIMEOUT"); "ASSOC TIMEOUT");
} else if (event->u.mlme.data == AUTH_EVENT) { } else if (event->u.mlme.data == AUTH_EVENT) {
if (event->u.mlme.status == MLME_DENIED) if (event->u.mlme.status == MLME_DENIED)
CHECK_MLME_TRIGGER(mvm, trig, buf, CHECK_MLME_TRIGGER(stop_auth_denied,
trig_mlme->stop_auth_denied,
"DENIED AUTH: reason %d", "DENIED AUTH: reason %d",
event->u.mlme.reason); event->u.mlme.reason);
else if (event->u.mlme.status == MLME_TIMEOUT) else if (event->u.mlme.status == MLME_TIMEOUT)
CHECK_MLME_TRIGGER(mvm, trig, buf, CHECK_MLME_TRIGGER(stop_auth_timeout,
trig_mlme->stop_auth_timeout,
"AUTH TIMEOUT"); "AUTH TIMEOUT");
} else if (event->u.mlme.data == DEAUTH_RX_EVENT) { } else if (event->u.mlme.data == DEAUTH_RX_EVENT) {
CHECK_MLME_TRIGGER(mvm, trig, buf, CHECK_MLME_TRIGGER(stop_rx_deauth,
trig_mlme->stop_rx_deauth,
"DEAUTH RX %d", event->u.mlme.reason); "DEAUTH RX %d", event->u.mlme.reason);
} else if (event->u.mlme.data == DEAUTH_TX_EVENT) { } else if (event->u.mlme.data == DEAUTH_TX_EVENT) {
CHECK_MLME_TRIGGER(mvm, trig, buf, CHECK_MLME_TRIGGER(stop_tx_deauth,
trig_mlme->stop_tx_deauth,
"DEAUTH TX %d", event->u.mlme.reason); "DEAUTH TX %d", event->u.mlme.reason);
} }
#undef CHECK_MLME_TRIGGER #undef CHECK_MLME_TRIGGER