mirror of https://gitee.com/openkylin/linux.git
iwlwifi: fix suspend to RAM in iwlwifi
This patch fixes suspend to RAM after by moving notify_mac out of iwlwifi mutex http://bugzilla.kernel.org/show_bug.cgi?id=11845 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com> Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Tested-by: Carlos R. Mafra <crmafra2@gmail.com> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> Cc: Rafael J. Wysocki <rjw@sisk.pl> Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
parent
882716604e
commit
10d0bd5696
|
@ -2090,7 +2090,6 @@ static void iwl_alive_start(struct iwl_priv *priv)
|
||||||
iwl4965_error_recovery(priv);
|
iwl4965_error_recovery(priv);
|
||||||
|
|
||||||
iwl_power_update_mode(priv, 1);
|
iwl_power_update_mode(priv, 1);
|
||||||
ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
|
|
||||||
|
|
||||||
if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
|
if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
|
||||||
iwl4965_set_mode(priv, priv->iw_mode);
|
iwl4965_set_mode(priv, priv->iw_mode);
|
||||||
|
@ -2342,6 +2341,7 @@ static void iwl_bg_alive_start(struct work_struct *data)
|
||||||
mutex_lock(&priv->mutex);
|
mutex_lock(&priv->mutex);
|
||||||
iwl_alive_start(priv);
|
iwl_alive_start(priv);
|
||||||
mutex_unlock(&priv->mutex);
|
mutex_unlock(&priv->mutex);
|
||||||
|
ieee80211_notify_mac(priv->hw, IEEE80211_NOTIFY_RE_ASSOC);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void iwl4965_bg_rf_kill(struct work_struct *work)
|
static void iwl4965_bg_rf_kill(struct work_struct *work)
|
||||||
|
|
Loading…
Reference in New Issue