From: Zhu Yi <yi.zhu@intel.com>
Date: Thu, 16 Jul 2009 09:34:14 +0000 (+0800)
Subject: cfg80211: remove WARN_ON in __cfg80211_sme_scan_done
X-Git-Tag: v2.6.32-rc1~703^2~544^2~44
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=d4b1a6876f99ae1886cd254f649506af6692ac9f;p=~shefty%2Frdma-dev.git

cfg80211: remove WARN_ON in __cfg80211_sme_scan_done

cfg80211_sme_scan_done() can be called (by fullmac cards) with
wdev->conn == NULL when CFG80211_SME_CONNECTING. We quit silently
instead of WARN_ON in this case.

Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/net/wireless/sme.c b/net/wireless/sme.c
index 10ed36621bd..e7a8851093a 100644
--- a/net/wireless/sme.c
+++ b/net/wireless/sme.c
@@ -227,7 +227,7 @@ static void __cfg80211_sme_scan_done(struct net_device *dev)
 	if (wdev->sme_state != CFG80211_SME_CONNECTING)
 		return;
 
-	if (WARN_ON(!wdev->conn))
+	if (!wdev->conn)
 		return;
 
 	if (wdev->conn->state != CFG80211_CONN_SCANNING &&