diff options
| author | David S. Miller <davem@davemloft.net> | 2009-10-30 00:28:59 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-10-30 00:28:59 -0400 |
| commit | 0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (patch) | |
| tree | 2e336be8a4bd2e59bcd4b69b00feb77c6672a9cb /net/mac80211/mlme.c | |
| parent | 38bfd8f5bec496e8e0db8849e01c99a33479418a (diff) | |
| parent | b5dd884e682cae6b8c037f9d11f3b623b4cf2011 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 71220a5d1406..dcc14e99227c 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c | |||
| @@ -1463,8 +1463,7 @@ ieee80211_rx_mgmt_assoc_resp(struct ieee80211_sub_if_data *sdata, | |||
| 1463 | if (status_code != WLAN_STATUS_SUCCESS) { | 1463 | if (status_code != WLAN_STATUS_SUCCESS) { |
| 1464 | printk(KERN_DEBUG "%s: AP denied association (code=%d)\n", | 1464 | printk(KERN_DEBUG "%s: AP denied association (code=%d)\n", |
| 1465 | sdata->dev->name, status_code); | 1465 | sdata->dev->name, status_code); |
| 1466 | list_del(&wk->list); | 1466 | wk->state = IEEE80211_MGD_STATE_IDLE; |
| 1467 | kfree(wk); | ||
| 1468 | return RX_MGMT_CFG80211_ASSOC; | 1467 | return RX_MGMT_CFG80211_ASSOC; |
| 1469 | } | 1468 | } |
| 1470 | 1469 | ||