linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 2/2] Don't destroy authentication algorithm before authenticating.
@ 2008-09-15 15:50 Ortwin Glück
  2008-09-15 15:53 ` Johannes Berg
  0 siblings, 1 reply; 8+ messages in thread
From: Ortwin Glück @ 2008-09-15 15:50 UTC (permalink / raw)
  To: linux-wireless

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

^ permalink raw reply related	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2008-09-15 20:49 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-09-15 15:50 [PATCH 2/2] Don't destroy authentication algorithm before authenticating Ortwin Glück
2008-09-15 15:53 ` Johannes Berg
2008-09-15 16:00   ` Ortwin Glück
2008-09-15 16:04     ` Johannes Berg
2008-09-15 16:39       ` Ortwin Glück
2008-09-15 18:15         ` Johannes Berg
2008-09-15 19:02           ` Ortwin Glück
2008-09-15 20:49             ` Luis R. Rodriguez

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).