diff options
author | Sujith <Sujith.Manoharan@atheros.com> | 2009-01-28 23:04:22 -0500 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2009-02-09 15:03:38 -0500 |
commit | e374055afbf92c8d128d8538aafc7e765838206e (patch) | |
tree | 942efa867048375320dcac4794e4e374828285c1 /net/mac80211 | |
parent | 7519a8f0778bdb14f07cf685fa5fee6ab07e734c (diff) |
mac80211: Reset assoc_scan_tries after an unsuccessful scan run
Trying to associate with a non-existent SSID stops the
state machine after the first run. Subsequent association
requests fail to start the scan engine. Fix this by resetting
assoc_scan_tries to zero after completing a scan run.
Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
-rw-r--r-- | net/mac80211/mlme.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 9d51e278c1e5..a8755df0cf74 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
@@ -2415,8 +2415,10 @@ static int ieee80211_sta_config_auth(struct ieee80211_sub_if_data *sdata, | |||
2415 | ifsta->ssid_len); | 2415 | ifsta->ssid_len); |
2416 | ifsta->state = IEEE80211_STA_MLME_AUTHENTICATE; | 2416 | ifsta->state = IEEE80211_STA_MLME_AUTHENTICATE; |
2417 | set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request); | 2417 | set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request); |
2418 | } else | 2418 | } else { |
2419 | ifsta->assoc_scan_tries = 0; | ||
2419 | ifsta->state = IEEE80211_STA_MLME_DISABLED; | 2420 | ifsta->state = IEEE80211_STA_MLME_DISABLED; |
2421 | } | ||
2420 | } | 2422 | } |
2421 | return -1; | 2423 | return -1; |
2422 | } | 2424 | } |