From b70e9076e1f272b5f4ed9d23f6b110165dcd63b1 Mon Sep 17 00:00:00 2001 From: Alina Friedrichsen Date: Thu, 29 Jan 2009 09:59:43 +0100 Subject: [PATCH] --- yaml --- r: 134381 b: refs/heads/master c: c0415b547d37e8065ad4adf289d11db2f3b16dfd h: refs/heads/master i: 134379: c62247b94421a75a783d274b1c02d718a0b7f0b6 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index a4e8b798894e..40839d819c36 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 547c3763765654f9a796e628692d9e7d5c1039af +refs/heads/master: c0415b547d37e8065ad4adf289d11db2f3b16dfd diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index a8755df0cf74..0ece151659c0 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/net/mac80211/mlme.c @@ -2722,9 +2722,8 @@ void ieee80211_mlme_notify_scan_completed(struct ieee80211_local *local) if (sdata && sdata->vif.type == NL80211_IFTYPE_ADHOC) { ifsta = &sdata->u.sta; - if (!(ifsta->flags & IEEE80211_STA_BSSID_SET) || - (!(ifsta->state == IEEE80211_STA_MLME_IBSS_JOINED) && - !ieee80211_sta_active_ibss(sdata))) + if ((!(ifsta->flags & IEEE80211_STA_PREV_BSSID_SET)) || + !ieee80211_sta_active_ibss(sdata)) ieee80211_sta_find_ibss(sdata, ifsta); }