Commit-ID: a11741383ba6eef707b8330f0d3c1da6a7478ee3
Gitweb: http://git.kernel.org/tip/a11741383ba6eef707b8330f0d3c1da6a7478ee3
Author: Johannes Berg <johannes.berg@xxxxxxxxx>
AuthorDate: Mon, 23 Aug 2010 07:56:59 -0700
Committer: John W. Linville <linville@xxxxxxxxxxxxx>
CommitDate: Wed, 25 Aug 2010 14:33:22 -0400
iwlwifi: reset BT when going down
When we turn off the device, reset BT
data so that we don't have outdated
information when we come up again.
Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@xxxxxxxxx>
Signed-off-by: John W. Linville <linville@xxxxxxxxxxxxx>
---
drivers/net/wireless/iwlwifi/iwl-agn.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/iwl-agn.c b/drivers/net/wireless/iwlwifi/iwl-agn.c
index 26bc048..a8a5a5b 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn.c
@@ -2773,6 +2773,10 @@ static void __iwl_down(struct iwl_priv *priv)
iwl_dealloc_bcast_station(priv);
iwl_clear_driver_stations(priv);
+ /* reset BT coex data */
+ priv->bt_traffic_load = 0;
+ priv->bt_sco_active = false;
+
/* Unblock any waiting calls */
wake_up_interruptible_all(&priv->wait_command_queue);
@@ -3078,8 +3082,9 @@ static void iwl_bg_restart(struct work_struct *data)
mutex_lock(&priv->mutex);
priv->vif = NULL;
priv->is_open = 0;
+ __iwl_down(priv);
mutex_unlock(&priv->mutex);
- iwl_down(priv);
+ iwl_cancel_deferred_work(priv);
ieee80211_restart_hw(priv->hw);
} else {
iwl_down(priv);
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|