diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-12-05 23:06:13 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2012-12-05 23:07:13 +0700 |
| commit | adbff11f9517c5296e452a1034d05864cf3dbfb3 (patch) | |
| tree | ebe89558e8db50e70c91f316c0f322216f307be7 /net/mac80211 | |
| parent | 15ced1fb4a207c2e99ea007ce447d9b5cd676435 (diff) | |
| parent | 7cd2d7c8aa6c52fbb7c846ab785ef752dd923116 (diff) | |
| download | kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.zip kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.tar.gz kernel_samsung_aries-adbff11f9517c5296e452a1034d05864cf3dbfb3.tar.bz2 | |
Merge 3.0.54
Change-Id: I68316b1f2af49f27e3462384592d3bba217302b6
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/ibss.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 8adcc9e..c6399f6 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -965,10 +965,6 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) mutex_lock(&sdata->u.ibss.mtx); - sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH; - memset(sdata->u.ibss.bssid, 0, ETH_ALEN); - sdata->u.ibss.ssid_len = 0; - active_ibss = ieee80211_sta_active_ibss(sdata); if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) { @@ -989,6 +985,10 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata) } } + ifibss->state = IEEE80211_IBSS_MLME_SEARCH; + memset(ifibss->bssid, 0, ETH_ALEN); + ifibss->ssid_len = 0; + sta_info_flush(sdata->local, sdata); /* remove beacon */ |