From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 11 Nov 2010 02:25:47 +0000 (-0800)
Subject: iwlagn: avoid crash if vif is not assigned
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=893654de3ff41a4f5037397d06a3f853bbbb3484;p=mv-sheeva.git

iwlagn: avoid crash if vif is not assigned

For reasons that aren't entirely clear to me,
we sometimes get here during hardware reset
without the interface being set. Don't crash,
but keep a warning.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
---

diff --git a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
index 2d927a94074..fbaa8d29365 100644
--- a/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
+++ b/drivers/net/wireless/iwlwifi/iwl-agn-rxon.c
@@ -507,6 +507,11 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw,
 
 	mutex_lock(&priv->mutex);
 
+	if (WARN_ON(!ctx->vif)) {
+		mutex_unlock(&priv->mutex);
+		return;
+	}
+
 	if (changes & BSS_CHANGED_BEACON_INT)
 		force = true;