From bb1b6745a1e60556168a08b644e61808a664649f Mon Sep 17 00:00:00 2001 From: Shanyu Zhao Date: Thu, 2 Dec 2010 11:02:28 -0800 Subject: [PATCH] --- yaml --- r: 225288 b: refs/heads/master c: ae0b693c12cc78913085733d28e0e0e6020db6f4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 994e8f12fc86..ef4e18f1d1fd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a1da077bc36368eb7d6312e7e49260f0a3d92c77 +refs/heads/master: ae0b693c12cc78913085733d28e0e0e6020db6f4 diff --git a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c index 4865b82355d7..769479eb6ea9 100644 --- a/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c +++ b/trunk/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c @@ -518,7 +518,14 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, mutex_lock(&priv->mutex); - if (WARN_ON(!ctx->vif)) { + if (unlikely(!iwl_is_ready(priv))) { + IWL_DEBUG_MAC80211(priv, "leave - not ready\n"); + mutex_unlock(&priv->mutex); + return; + } + + if (unlikely(!ctx->vif)) { + IWL_DEBUG_MAC80211(priv, "leave - vif is NULL\n"); mutex_unlock(&priv->mutex); return; }