From 20e9cf54e58aa4e0bfdb7afc964e59a939ca96a5 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 24 Feb 2012 13:50:53 +0100 Subject: [PATCH] --- yaml --- r: 290767 b: refs/heads/master c: 02d83e60b9864e7920d87b49e1fbedffd32470f8 h: refs/heads/master i: 290765: 05cf112eebff1b778d239f6a585245f33a834488 290763: 28fdbae0f4d49d64514a7349b81cf6608b42036e 290759: 0125aa68a20a18ba0a697dbc0e910352fc34d983 290751: 5182bf94ac77568c224b28bcd146f0b6a07aae33 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 07f6a2890e22..46f517ab3605 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5fef7dbcadbb85079d3bf56625dd12e6d2816e3d +refs/heads/master: 02d83e60b9864e7920d87b49e1fbedffd32470f8 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index 82d49341eaa0..379a1d140161 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -1684,7 +1684,7 @@ static void __ieee80211_connection_loss(struct ieee80211_sub_if_data *sdata) printk(KERN_DEBUG "%s: Connection to AP %pM lost.\n", sdata->name, bssid); - ieee80211_set_disassoc(sdata, true, true); + ieee80211_set_disassoc(sdata, true, false); mutex_unlock(&ifmgd->mtx); /* @@ -2699,7 +2699,7 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata, ifmgd->flags &= ~(IEEE80211_STA_CONNECTION_POLL | IEEE80211_STA_BEACON_POLL); - ieee80211_set_disassoc(sdata, true, true); + ieee80211_set_disassoc(sdata, true, false); mutex_unlock(&ifmgd->mtx); /* * must be outside lock due to cfg80211, @@ -3500,7 +3500,7 @@ int ieee80211_mgd_disassoc(struct ieee80211_sub_if_data *sdata, sdata->name, req->bss->bssid, req->reason_code); memcpy(bssid, req->bss->bssid, ETH_ALEN); - ieee80211_set_disassoc(sdata, false, true); + ieee80211_set_disassoc(sdata, false, !req->local_state_change); mutex_unlock(&ifmgd->mtx);