linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Berg <johannes@sipsolutions.net>
To: greearb@candelatech.com
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH] mac80211:  Clean up work-queues on disassociation.
Date: Wed, 20 Feb 2013 10:59:54 +0100	[thread overview]
Message-ID: <1361354394.8629.11.camel@jlt4.sipsolutions.net> (raw)
In-Reply-To: <1361326267-16847-1-git-send-email-greearb@candelatech.com> (sfid-20130220_031220_995074_BF5628B4)


> In addition, re-order the quiesce code so that timers are
> always stopped before work-items are flushed.  This was
> not the problem I saw, but I think it may still be more
> correct.

I'd prefer this to be a separate patch, and then might not apply that
one for 3.9

> NOTE:  Please do not apply this until it is reviewed by Johannes,
> at least.

No worries - I have my own mac80211 tree so nobody else will apply it
anyway :)

> @@ -2618,6 +2625,12 @@ void ieee80211_sta_rx_queued_mgmt(struct ieee80211_sub_if_data *sdata,
>  	}
>  	mutex_unlock(&ifmgd->mtx);
>  
> +	if (cancel_work) {
> +		/* Have to do this outside the ifmgd->mtx lock. */
> +		cancel_work_sync(&ifmgd->monitor_work);
> +		cancel_work_sync(&ifmgd->beacon_connection_loss_work);
> +	}

It might make more sense to move this into the disassoc/deauth case
below?

>  	switch (rma) {
>  	case RX_MGMT_NONE:
>  		/* no action */

> @@ -2668,6 +2681,10 @@ static void ieee80211_sta_connection_lost(struct ieee80211_sub_if_data *sdata,
>  			       false, frame_buf);
>  	mutex_unlock(&ifmgd->mtx);
>  
> +	/* Have to do this outside the ifmgd->mtx lock. */
> +	cancel_work_sync(&ifmgd->monitor_work);
> +	cancel_work_sync(&ifmgd->beacon_connection_loss_work);

OTOH, you do this many many times, and that doesn't seem necessary...

If the work structs run when we disconnected, that's ok, they just
musn't run after we destroy the interface, so I think it'd be much
better to just put the two lines into ieee80211_mgd_stop() instead of
all the other places.

johannes


  parent reply	other threads:[~2013-02-20 10:00 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-02-20  2:11 [PATCH] mac80211: Clean up work-queues on disassociation greearb
2013-02-20  6:23 ` Julian Calaby
2013-02-20 14:04   ` Ben Greear
2013-02-20 22:08     ` Julian Calaby
2013-02-20  9:59 ` Johannes Berg [this message]
2013-02-20 14:09   ` Ben Greear
2013-02-20 14:13     ` Johannes Berg
2013-02-20 14:24       ` Ben Greear
2013-02-20 14:27         ` Johannes Berg
2013-02-25 10:20 ` Stanislaw Gruszka
2013-02-25 16:55   ` Ben Greear
2013-02-26 15:55     ` Stanislaw Gruszka
2013-02-26 16:51       ` Ben Greear

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1361354394.8629.11.camel@jlt4.sipsolutions.net \
    --to=johannes@sipsolutions.net \
    --cc=greearb@candelatech.com \
    --cc=linux-wireless@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).