[PATCH 3.5] mac80211: stop polling in disassociation

[PATCH 3.5] mac80211: stop polling in disassociation

[Johannes Berg]

From: David Spinadel <david.spinadel@intel.com>

Stop connection monitor poll during disassociation.
This clears the polling flags and if a scan was
deferred it will be run.

Without this fix, if a scan was deferred due to
connection monitoring while disassociation happens,
this scan blocks further scan requests until interface
down/up which causes problems connecting to another AP.

Signed-off-by: David Spinadel <david.spinadel@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
Will apply this soon to fix the bug.

 net/mac80211/mlme.c |    4 ++--
 1 file 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.10

Re: [PATCH 3.5] mac80211: stop polling in disassociation

[Eliad Peller]

On Wed, Jun 13, 2012 at 9:51 AM, Johannes Berg
<johannes@sipsolutions.net> wrote:
> From: David Spinadel <david.spinadel@intel.com>
>
> Stop connection monitor poll during disassociation.
> This clears the polling flags and if a scan was
> deferred it will be run.
>
> Without this fix, if a scan was deferred due to
> connection monitoring while disassociation happens,
> this scan blocks further scan requests until interface
> down/up which causes problems connecting to another AP.
>
> Signed-off-by: David Spinadel <david.spinadel@intel.com>
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
[...]

> @@ -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);

it doesn't matter much, but maybe better add the call after the
function "prologue" (lockdep, WARN_ONs, ...)?

Eliad.

Re: [PATCH 3.5] mac80211: stop polling in disassociation

[Johannes Berg]

On Wed, 2012-06-13 at 11:00 +0300, Eliad Peller wrote:

> > @@ -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);
> 
> it doesn't matter much, but maybe better add the call after the
> function "prologue" (lockdep, WARN_ONs, ...)?

I think we shouldn't do it after the warnings since those affect the
control flow. OTOH, they should never happen ...

johannes

Re: [PATCH 3.5] mac80211: stop polling in disassociation

[Johannes Berg]

On Wed, 2012-06-13 at 10:08 +0200, Johannes Berg wrote:
> On Wed, 2012-06-13 at 11:00 +0300, Eliad Peller wrote:
> 
> > > @@ -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);
> > 
> > it doesn't matter much, but maybe better add the call after the
> > function "prologue" (lockdep, WARN_ONs, ...)?
> 
> I think we shouldn't do it after the warnings since those affect the
> control flow. OTOH, they should never happen ...

I'll change it, makes it look better :-)

johannes