diff options
| author | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-26 19:20:34 +0300 |
|---|---|---|
| committer | Emmanuel Grumbach <emmanuel.grumbach@intel.com> | 2015-05-26 19:20:57 +0300 |
| commit | 04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c (patch) | |
| tree | 9863c0473469c5b594ad0e5dab29d37b6900bdf8 /drivers/net/wireless/iwlwifi/mvm/mac80211.c | |
| parent | 05c3274d56ee783cb291a779ec2b369e9d172450 (diff) | |
| parent | 292208914d8ca5a41cf68c2f1d2810a2ea2044e9 (diff) | |
| download | linux-04c9599d1a4cdd91b4c0bded3b12cc8203b68a2c.tar.xz | |
Merge remote-tracking branch 'iwlwifi-fixes/master' into iwlwifi-next
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Conflicts:
drivers/net/wireless/iwlwifi/Kconfig
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/mac80211.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/mac80211.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/iwlwifi/mvm/mac80211.c index b56a445b5d0c..c131ce6d168a 100644 --- a/drivers/net/wireless/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/iwlwifi/mvm/mac80211.c @@ -3928,9 +3928,6 @@ static void iwl_mvm_mac_event_callback(struct ieee80211_hw *hw, if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_MLME)) return; - if (event->u.mlme.status == MLME_SUCCESS) - return; - trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_MLME); trig_mlme = (void *)trig->data; if (!iwl_fw_dbg_trigger_check_stop(mvm, vif, trig)) |