From cd267bf119d0da55922eeb823ea90d7bf10f57e9 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Sun, 13 May 2012 18:07:04 +0300 Subject: [PATCH] --- yaml --- r: 313963 b: refs/heads/master c: dac211ec10d268b9d09000093a9fa2ac1773894f h: refs/heads/master i: 313961: dc45a7584f4b2a734bd8d59d970cf346d1056070 313959: f0831944d24ce60202fdf2124aca65a2a27478c5 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c48b6cd48f0a..de1efacd36df 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c53f7e150e178b62b9904428ccbe3ae6f3553fdd +refs/heads/master: dac211ec10d268b9d09000093a9fa2ac1773894f diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 04c306308987..a2f18b7e6858 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -1791,7 +1791,8 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, if (status_code != WLAN_STATUS_SUCCESS) { printk(KERN_DEBUG "%s: %pM denied authentication (status %d)\n", sdata->name, mgmt->sa, status_code); - goto out; + ieee80211_destroy_auth_data(sdata, false); + return RX_MGMT_CFG80211_RX_AUTH; } switch (ifmgd->auth_data->algorithm) { @@ -1813,7 +1814,6 @@ ieee80211_rx_mgmt_auth(struct ieee80211_sub_if_data *sdata, } printk(KERN_DEBUG "%s: authenticated\n", sdata->name); - out: ifmgd->auth_data->done = true; ifmgd->auth_data->timeout = jiffies + IEEE80211_AUTH_WAIT_ASSOC; run_again(ifmgd, ifmgd->auth_data->timeout);