diff options
| author | Larry Finger <Larry.Finger@lwfinger.net> | 2007-09-19 05:00:52 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2007-09-21 17:26:33 +0200 |
| commit | efe870f9f4ad74410a18ecbf0d9ba7c14b50a0fb (patch) | |
| tree | 3b6ad109bc0e0da5f648858e0785ee8c927c98c1 /net/ieee80211/softmac/ieee80211softmac_assoc.c | |
| parent | Linux 2.6.23-rc7 (diff) | |
| download | linux-efe870f9f4ad74410a18ecbf0d9ba7c14b50a0fb.tar.xz linux-efe870f9f4ad74410a18ecbf0d9ba7c14b50a0fb.zip | |
[PATCH] softmac: Fix inability to associate with WEP networks
Commit 4cf92a3c was submitted as a fix for bug #8686 at bugzilla.kernel.org
(http://bugzilla.kernel.org/show_bug.cgi?id=8686). Unfortunately, the fix led to
a new bug, reported by Yoshifuji Hideaki, that prevented association for WEP
encrypted networks that use ifconfig to control the device. This patch effectively
reverts the earlier commit and does a proper fix for bug #8686.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/ieee80211/softmac/ieee80211softmac_assoc.c')
| -rw-r--r-- | net/ieee80211/softmac/ieee80211softmac_assoc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/net/ieee80211/softmac/ieee80211softmac_assoc.c b/net/ieee80211/softmac/ieee80211softmac_assoc.c index afb6c6698b27..e475f2e1be13 100644 --- a/net/ieee80211/softmac/ieee80211softmac_assoc.c +++ b/net/ieee80211/softmac/ieee80211softmac_assoc.c @@ -273,8 +273,6 @@ ieee80211softmac_assoc_work(struct work_struct *work) ieee80211softmac_notify(mac->dev, IEEE80211SOFTMAC_EVENT_SCAN_FINISHED, ieee80211softmac_assoc_notify_scan, NULL); 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 { |