[PATCH 2/2] Don't destroy authentication algorithm before authenticating.

["Ortwin Glück" <odi@odi.ch>]

reset_auth is called before each authentication try. So it should not destroy
the auth_alg that was set before.

NB: this may have side-effects with automatic algorithm selection if AP responds 
with alg not supported.

Signed-off-by: Ortwin Glueck <odi@odi.ch>
---
  net/mac80211/mlme.c |   10 +---------
  1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 902cac1..5dbe012 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -3420,6 +3420,7 @@ static void ieee80211_sta_reset_auth(struct net_device *dev,
  				     struct ieee80211_if_sta *ifsta)
  {
  	struct ieee80211_local *local = wdev_priv(dev->ieee80211_ptr);
+	struct ieee80211_sub_if_data *sdata = IEEE80211_DEV_TO_SUB_IF(dev);

  	if (local->ops->reset_tsf) {
  		/* Reset own TSF to allow time synchronization work. */
@@ -3428,15 +3429,6 @@ static void ieee80211_sta_reset_auth(struct net_device *dev,

  	ifsta->wmm_last_param_set = -1; /* allow any WMM update */

-
-	if (ifsta->auth_algs & IEEE80211_AUTH_ALG_OPEN)
-		ifsta->auth_alg = WLAN_AUTH_OPEN;
-	else if (ifsta->auth_algs & IEEE80211_AUTH_ALG_SHARED_KEY)
-		ifsta->auth_alg = WLAN_AUTH_SHARED_KEY;
-	else if (ifsta->auth_algs & IEEE80211_AUTH_ALG_LEAP)
-		ifsta->auth_alg = WLAN_AUTH_LEAP;
-	else
-		ifsta->auth_alg = WLAN_AUTH_OPEN;
  	ifsta->auth_transaction = -1;
  	ifsta->flags &= ~IEEE80211_STA_ASSOCIATED;
  	ifsta->auth_tries = ifsta->assoc_tries = 0;
-- 
1.5.6.4