xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'wireless-next/master' into mac80211-next

Browse Source
This commit is contained in:
Johannes Berg
2012-06-28 13:45:58 +02:00
parent bf0c111ec8 bf52592fe4
commit b1fbd46976
237 changed files with 12886 additions and 9384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/mac80211/mlme.c
View File

@@ -1331,6 +1331,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
if (WARN_ON(!ifmgd->associated))
return;
ieee80211_stop_poll(sdata);
memcpy(bssid, ifmgd->associated->bssid, ETH_ALEN);
ifmgd->associated = NULL;
@@ -2589,8 +2591,6 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,
struct ieee80211_if_managed *ifmgd = &sdata->u.mgd;
u8 frame_buf[DEAUTH_DISASSOC_LEN];
ieee80211_stop_poll(sdata);
ieee80211_set_disassoc(sdata, IEEE80211_STYPE_DEAUTH, reason,
false, frame_buf);
mutex_unlock(&ifmgd->mtx);
@@ -3081,7 +3081,7 @@ static int ieee80211_prep_connection(struct ieee80211_sub_if_data *sdata,
}
local->oper_channel = cbss->channel;
ieee80211_hw_config(local, 0);
ieee80211_hw_config(local, IEEE80211_CONF_CHANGE_CHANNEL);
if (sta) {
u32 rates = 0, basic_rates = 0;