Whoops, there was actually never a version one or two posted here ...
Please consider this version 1.
Sorry,
Simon
On Tue, Nov 13, 2012 at 06:43:03PM +0100, Simon Wunderlich wrote:
> The check whether the IBSS is active and can be removed should be
> performed before deinitializing the fields used for the check/search.
> Otherwise, the configured BSS will not be found and removed properly.
>
> To make it more clear for the future, rename sdata->u.ibss to the
> local pointer ifibss which is used within the checks.
>
> This behaviour was introduced by
> f3209bea110cade12e2b133da8b8499689cb0e2e
> ("mac80211: fix IBSS teardown race")
>
> Cc: Ignacy Gawedzki <i@xxxxxx>
> Cc: Johannes Berg <johannes@xxxxxxxxxxxxxxxx>
> Signed-off-by: Simon Wunderlich <siwu@xxxxxxxxxxxxxxxxxx>
> ---
> net/mac80211/ibss.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c
> index c7386b2..67774b0 100644
> --- a/net/mac80211/ibss.c
> +++ b/net/mac80211/ibss.c
> @@ -1156,10 +1156,6 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
>
> mutex_lock(&sdata->u.ibss.mtx);
>
> - sdata->u.ibss.state = IEEE80211_IBSS_MLME_SEARCH;
> - memset(sdata->u.ibss.bssid, 0, ETH_ALEN);
> - sdata->u.ibss.ssid_len = 0;
> -
> active_ibss = ieee80211_sta_active_ibss(sdata);
>
> if (!active_ibss && !is_zero_ether_addr(ifibss->bssid)) {
> @@ -1180,6 +1176,10 @@ int ieee80211_ibss_leave(struct ieee80211_sub_if_data *sdata)
> }
> }
>
> + ifibss->state = IEEE80211_IBSS_MLME_SEARCH;
> + memset(ifibss->bssid, 0, ETH_ALEN);
> + ifibss->ssid_len = 0;
> +
> sta_info_flush(sdata->local, sdata);
>
> spin_lock_bh(&ifibss->incomplete_lock);
> --
> 1.7.10
>
>
Attachment:
signature.asc
Description: Digital signature
