summaryrefslogtreecommitdiffstats
path: root/net/mac80211/mlme.c
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2009-01-29 09:34:22 +0530
committerJohn W. Linville <linville@tuxdriver.com>2009-02-09 15:03:38 -0500
commite374055afbf92c8d128d8538aafc7e765838206e (patch)
tree942efa867048375320dcac4794e4e374828285c1 /net/mac80211/mlme.c
parent7519a8f0778bdb14f07cf685fa5fee6ab07e734c (diff)
downloadop-kernel-dev-e374055afbf92c8d128d8538aafc7e765838206e.zip
op-kernel-dev-e374055afbf92c8d128d8538aafc7e765838206e.tar.gz
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/mlme.c')
-rw-r--r--net/mac80211/mlme.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 9d51e27..a8755df 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,
ifsta->ssid_len);
ifsta->state = IEEE80211_STA_MLME_AUTHENTICATE;
set_bit(IEEE80211_STA_REQ_AUTH, &ifsta->request);
- } else
+ } else {
+ ifsta->assoc_scan_tries = 0;
ifsta->state = IEEE80211_STA_MLME_DISABLED;
+ }
}
return -1;
}
OpenPOWER on IntegriCloud