diff options
| author | Eytan Lifshitz <eytan.lifshitz@intel.com> | 2013-02-15 16:31:45 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-02-18 20:19:01 +0100 |
| commit | 3104ba151eb9df1bc14878cfd2e4356bf537d18c (patch) | |
| tree | ee4b83f794b23617fdc2c0ab36fa261b682dcf7b /drivers/net/wireless | |
| parent | ec8b6885b543ceeb47fdb0c0e6981bb7420ab59e (diff) | |
| download | blackbird-op-linux-3104ba151eb9df1bc14878cfd2e4356bf537d18c.tar.gz blackbird-op-linux-3104ba151eb9df1bc14878cfd2e4356bf537d18c.zip | |
iwlwifi: dvm: fix delayed enter to CT-kill bug
Theoretically, the card may not enter CTKILL:
In case the timer that iwl_prepare_ct_kill_task is setting,
will expire before tt->state revert to its previous state.
Signed-off-by: Eytan Lifshitz <eytan.lifshitz@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'drivers/net/wireless')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/dvm/tt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/dvm/tt.c b/drivers/net/wireless/iwlwifi/dvm/tt.c index 67e2e1321b40..03f9bc01c0cc 100644 --- a/drivers/net/wireless/iwlwifi/dvm/tt.c +++ b/drivers/net/wireless/iwlwifi/dvm/tt.c @@ -471,8 +471,8 @@ static void iwl_advance_tt_handler(struct iwl_priv *priv, s32 temp, bool force) set_bit(STATUS_CT_KILL, &priv->status); iwl_perform_ct_kill_task(priv, true); } else { - iwl_prepare_ct_kill_task(priv); tt->state = old_state; + iwl_prepare_ct_kill_task(priv); } } else if (old_state == IWL_TI_CT_KILL && tt->state != IWL_TI_CT_KILL) { |
