diff options
| author |   Jeff Garzik <jeff@garzik.org> | 2007-07-16 17:59:03 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-07-16 17:59:03 -0400 |
| commit | 5be808467347fc99bdd216883c5dbd123d6ad9d6 (patch) | |
| tree | 7fe3f1ee051d261bb3739c5f9f1bb8489a0d6f71 /net | |
| parent | Fix a potential NULL pointer dereference in free_shared_mem() in drivers/net/s2io.c (diff) | |
| parent | [PATCH] softmac: Fix ESSID problem (diff) | |
| download | linux-dev-5be808467347fc99bdd216883c5dbd123d6ad9d6.tar.xz linux-dev-5be808467347fc99bdd216883c5dbd123d6ad9d6.zip | |
Merge branch 'upstream-jgarzik' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream
Diffstat (limited to 'net')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_assoc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c index cc8110bdd579..afb6c6698b27 100644 --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c @@ -271,8 +271,11 @@ ieee80211softmac_assoc_work(struct work_struct *work) */ dprintk(KERN_INFO PFX "Associate: Scanning for networks first.\n"); ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL); - if (ieee80211softmac_start_scan(mac)) + if (ieee80211softmac_start_scan(mac)) { dprintk(KERN_INFO PFX "Associate: failed to initiate scan. Is device up?\n"); + mac->associnfo.associating = 0; + mac->associnfo.associated = 0; + } goto out; } else { mac->associnfo.associating = 0; |