[RFC/RFT] mac80211: stop connection monitor on dissassoc

[RFC/RFT] mac80211: stop connection monitor on dissassoc

[Stanislaw Gruszka]

Looks like is possible to do not kick of deferred scan when connection
monitoring is pending and on the same time we disconnect.

David, I can not recreate this problem locally, does below patch
fix the problem on your tests.

Thanks
Stanislaw

---
 net/mac80211/mlme.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index d7134c1..1e20748 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1425,6 +1425,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 	del_timer_sync(&sdata->u.mgd.bcn_mon_timer);
 	del_timer_sync(&sdata->u.mgd.timer);
 	del_timer_sync(&sdata->u.mgd.chswitch_timer);
+
+	ieee80211_stop_poll(sdata);
 }
 
 void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
-- 
1.7.1

RE: [RFC/RFT] mac80211: stop connection monitor on dissassoc

[Spinadel, David]

[-- Attachment #1: Type: text/plain, Size: 2925 bytes --]

Hi Stanislav.
This problem is not easy to reproduce.
Attached my patch I just sent to Johannes, it seems to work here. 
It basically the same change as yours, but I also removed stop_poll from ieee80211_sta_connection_lost().

Thanks,
David 

>From af52e5f1f6b7c5d89fdc1866f554a495717a61ad Mon Sep 17 00:00:00 2001
From: David Spinadel <david.spinadel@intel.com>
Date: Tue, 12 Jun 2012 09:59:45 +0300
Subject: [PATCH] mac80211: stop polling in disassocition

Change-Id: If16d1a2316259ced4f6647efba422203e9400179
Signed-off-by: David Spinadel <david.spinadel@intel.com>
---
 net/mac80211/mlme.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 0f45d02..9aefcc3 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1329,6 +1329,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 	u32 changed = 0;
 	u8 bssid[ETH_ALEN];
 
+	ieee80211_stop_poll(sdata);
+
 	ASSERT_MGD_MTX(ifmgd);
 
 	if (WARN_ON_ONCE(tx && !frame_buf))
@@ -2592,8 +2594,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);
-- 
1.7.1



-----Original Message-----
From: Stanislaw Gruszka [mailto:sgruszka@redhat.com] 
Sent: Tuesday, June 12, 2012 12:59
To: linux-wireless@vger.kernel.org; Spinadel, David
Cc: Johannes Berg
Subject: [RFC/RFT] mac80211: stop connection monitor on dissassoc

Looks like is possible to do not kick of deferred scan when connection monitoring is pending and on the same time we disconnect.

David, I can not recreate this problem locally, does below patch fix the problem on your tests.

Thanks
Stanislaw

---
 net/mac80211/mlme.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index d7134c1..1e20748 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1425,6 +1425,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 	del_timer_sync(&sdata->u.mgd.bcn_mon_timer);
 	del_timer_sync(&sdata->u.mgd.timer);
 	del_timer_sync(&sdata->u.mgd.chswitch_timer);
+
+	ieee80211_stop_poll(sdata);
 }
 
 void ieee80211_sta_rx_notify(struct ieee80211_sub_if_data *sdata,
--
1.7.1

---------------------------------------------------------------------
A member of the Intel Corporation group of companies

This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.

[-- Attachment #2: 0001-mac80211-stop-polling-in-disassocition.patch --]
[-- Type: application/octet-stream, Size: 1144 bytes --]

From af52e5f1f6b7c5d89fdc1866f554a495717a61ad Mon Sep 17 00:00:00 2001
From: David Spinadel <david.spinadel@intel.com>
Date: Tue, 12 Jun 2012 09:59:45 +0300
Subject: [PATCH] mac80211: stop polling in disassocition

Change-Id: If16d1a2316259ced4f6647efba422203e9400179
Signed-off-by: David Spinadel <david.spinadel@intel.com>
---
 net/mac80211/mlme.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 0f45d02..9aefcc3 100644
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
@@ -1329,6 +1329,8 @@ static void ieee80211_set_disassoc(struct ieee80211_sub_if_data *sdata,
 	u32 changed = 0;
 	u8 bssid[ETH_ALEN];
 
+	ieee80211_stop_poll(sdata);
+
 	ASSERT_MGD_MTX(ifmgd);
 
 	if (WARN_ON_ONCE(tx && !frame_buf))
@@ -2592,8 +2594,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);
-- 
1.7.1

Re: [RFC/RFT] mac80211: stop connection monitor on dissassoc

[Stanislaw Gruszka]

Hi.

On Tue, Jun 12, 2012 at 10:05:52AM +0000, Spinadel, David wrote:
> This problem is not easy to reproduce.
> Attached my patch I just sent to Johannes, it seems to work here. 
> It basically the same change as yours, but I also removed stop_poll from ieee80211_sta_connection_lost().

Make sense. Johannes plese process with David patch.

Thanks
Stanislaw

Re: [RFC/RFT] mac80211: stop connection monitor on dissassoc

[Johannes Berg]

On Tue, 2012-06-12 at 12:20 +0200, Stanislaw Gruszka wrote:
> Hi.
> 
> On Tue, Jun 12, 2012 at 10:05:52AM +0000, Spinadel, David wrote:
> > This problem is not easy to reproduce.
> > Attached my patch I just sent to Johannes, it seems to work here. 
> > It basically the same change as yours, but I also removed stop_poll from ieee80211_sta_connection_lost().
> 
> Make sense. Johannes plese process with David patch.

Ok, will do. David, can you please submit it internally, I'll take it
from there.

johannes

RE: [RFC/RFT] mac80211: stop connection monitor on dissassoc

[Spinadel, David]

T2ssIG9uZSBtaW51dGUuDQoNCkRhdmlkDQoNCg0KLS0tLS1PcmlnaW5hbCBNZXNzYWdlLS0tLS0N
CkZyb206IEpvaGFubmVzIEJlcmcgW21haWx0bzpqb2hhbm5lc0BzaXBzb2x1dGlvbnMubmV0XSAN
ClNlbnQ6IFR1ZXNkYXksIEp1bmUgMTIsIDIwMTIgMTQ6MDINClRvOiBTdGFuaXNsYXcgR3J1c3pr
YQ0KQ2M6IFNwaW5hZGVsLCBEYXZpZDsgbGludXgtd2lyZWxlc3NAdmdlci5rZXJuZWwub3JnDQpT
dWJqZWN0OiBSZTogW1JGQy9SRlRdIG1hYzgwMjExOiBzdG9wIGNvbm5lY3Rpb24gbW9uaXRvciBv
biBkaXNzYXNzb2MNCg0KT24gVHVlLCAyMDEyLTA2LTEyIGF0IDEyOjIwICswMjAwLCBTdGFuaXNs
YXcgR3J1c3prYSB3cm90ZToNCj4gSGkuDQo+IA0KPiBPbiBUdWUsIEp1biAxMiwgMjAxMiBhdCAx
MDowNTo1MkFNICswMDAwLCBTcGluYWRlbCwgRGF2aWQgd3JvdGU6DQo+ID4gVGhpcyBwcm9ibGVt
IGlzIG5vdCBlYXN5IHRvIHJlcHJvZHVjZS4NCj4gPiBBdHRhY2hlZCBteSBwYXRjaCBJIGp1c3Qg
c2VudCB0byBKb2hhbm5lcywgaXQgc2VlbXMgdG8gd29yayBoZXJlLiANCj4gPiBJdCBiYXNpY2Fs
bHkgdGhlIHNhbWUgY2hhbmdlIGFzIHlvdXJzLCBidXQgSSBhbHNvIHJlbW92ZWQgc3RvcF9wb2xs
IGZyb20gaWVlZTgwMjExX3N0YV9jb25uZWN0aW9uX2xvc3QoKS4NCj4gDQo+IE1ha2Ugc2Vuc2Uu
IEpvaGFubmVzIHBsZXNlIHByb2Nlc3Mgd2l0aCBEYXZpZCBwYXRjaC4NCg0KT2ssIHdpbGwgZG8u
IERhdmlkLCBjYW4geW91IHBsZWFzZSBzdWJtaXQgaXQgaW50ZXJuYWxseSwgSSdsbCB0YWtlIGl0
IGZyb20gdGhlcmUuDQoNCmpvaGFubmVzDQoNCi0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQpBIG1lbWJlciBvZiB0aGUg
SW50ZWwgQ29ycG9yYXRpb24gZ3JvdXAgb2YgY29tcGFuaWVzCgpUaGlzIGUtbWFpbCBhbmQgYW55
IGF0dGFjaG1lbnRzIG1heSBjb250YWluIGNvbmZpZGVudGlhbCBtYXRlcmlhbCBmb3IKdGhlIHNv
bGUgdXNlIG9mIHRoZSBpbnRlbmRlZCByZWNpcGllbnQocykuIEFueSByZXZpZXcgb3IgZGlzdHJp
YnV0aW9uCmJ5IG90aGVycyBpcyBzdHJpY3RseSBwcm9oaWJpdGVkLiBJZiB5b3UgYXJlIG5vdCB0
aGUgaW50ZW5kZWQKcmVjaXBpZW50LCBwbGVhc2UgY29udGFjdCB0aGUgc2VuZGVyIGFuZCBkZWxl
dGUgYWxsIGNvcGllcy4K