mac80211: tell SME about real auth state

When the auth algorithm is rejected, but we don't have
another one to try, we will eventually retry but that
isn't useful -- we'll then do it again and again until
we eventually give up. Instead, we should let the SME
know and go into disabled state. The same applies for
situations where the AP rejects with any other status
code.

Additionally, when trying the next auth algorithm, we
should reset the auth_tries so that just a single lost
frame doesn't lead to us giving up on the third auth
algorithm.

Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 383392b04282561112feca710e31ea015efea8f6..58135a5096afb25db0f1ec7c8ed3c4815e6b29d1 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1511,9 +1511,15 @@ static void ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata,
                                    !ieee80211_sta_wep_configured(sdata))
                                        continue;
                                ifmgd->auth_alg = algs[pos];
-                               break;
+                               ifmgd->auth_tries = 0;
+                               return;
                        }
                }
+               /* nothing else to try -- give up */
+               cfg80211_send_rx_auth(sdata->dev, (u8 *) mgmt, len,
+                                     GFP_KERNEL);
+               ifmgd->state = IEEE80211_STA_MLME_DISABLED;
+               ieee80211_recalc_idle(sdata->local);
                return;
        }