From 504f9108a4a0c24fd74f3673319989980bb7d7d5 Mon Sep 17 00:00:00 2001 From: Amit Beka Date: Mon, 6 Aug 2012 17:01:05 +0300 Subject: [PATCH] --- yaml --- r: 327687 b: refs/heads/master c: 40503f7b48260a91ab65a4f8b00a2c6f004fa807 h: refs/heads/master i: 327685: 4ced8d6cf0cf2c1e9706c2f5686623fe73a2904c 327683: 78d8c55a3dae24f29011479d9dc77b36fb8c5b23 327679: 9dd685fb495fdbf23aef974fab57f7f04898b12a v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/dvm/main.c | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 83d1fe452b77..3b23a18df7f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 289e5501c3141191dd830957f1d764d3dc14a54f +refs/heads/master: 40503f7b48260a91ab65a4f8b00a2c6f004fa807 diff --git a/trunk/drivers/net/wireless/iwlwifi/dvm/main.c b/trunk/drivers/net/wireless/iwlwifi/dvm/main.c index ab7b9ed00b8f..7ff3f1430678 100644 --- a/trunk/drivers/net/wireless/iwlwifi/dvm/main.c +++ b/trunk/drivers/net/wireless/iwlwifi/dvm/main.c @@ -862,7 +862,8 @@ void iwl_down(struct iwl_priv *priv) * No race since we hold the mutex here and a new one * can't come in at this time. */ - ieee80211_remain_on_channel_expired(priv->hw); + if (priv->ucode_loaded && priv->cur_ucode != IWL_UCODE_INIT) + ieee80211_remain_on_channel_expired(priv->hw); exit_pending = test_and_set_bit(STATUS_EXIT_PENDING, &priv->status); @@ -994,7 +995,11 @@ static void iwl_bg_restart(struct work_struct *data) iwlagn_prepare_restart(priv); mutex_unlock(&priv->mutex); iwl_cancel_deferred_work(priv); - ieee80211_restart_hw(priv->hw); + if (priv->mac80211_registered) + ieee80211_restart_hw(priv->hw); + else + IWL_ERR(priv, + "Cannot request restart before registrating with mac80211"); } else { WARN_ON(1); }