diff options
author | Zhu Yi <yi.zhu@intel.com> | 2009-07-16 05:34:14 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-07-24 15:05:21 -0400 |
commit | d4b1a6876f99ae1886cd254f649506af6692ac9f (patch) | |
tree | 4fa5d9e4404defa325b6813a78668fc5437c3d4a /net | |
parent | 6e5db0a8454b44bf88fa74cf437a507ec08f436d (diff) |
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/wireless/sme.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index 10ed36621bd7..e7a8851093a7 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) | |||
227 | if (wdev->sme_state != CFG80211_SME_CONNECTING) | 227 | if (wdev->sme_state != CFG80211_SME_CONNECTING) |
228 | return; | 228 | return; |
229 | 229 | ||
230 | if (WARN_ON(!wdev->conn)) | 230 | if (!wdev->conn) |
231 | return; | 231 | return; |
232 | 232 | ||
233 | if (wdev->conn->state != CFG80211_CONN_SCANNING && | 233 | if (wdev->conn->state != CFG80211_CONN_SCANNING && |