This fixes a bug when creating a new IBSS network with a fixed BSSID. T=
he fixed BSSID situation is now with one of my last patches handled in =
ieee80211_sta_find_ibss() function.
It's more robust to test against (ifsta->flags & IEEE80211_STA_PREV_BSS=
ID_SET), because ifsta->state is not seted right in every situation and=
so the creating of the new IBSS network sometimes hangs after the firs=
t try to scan for a network to merge.
Signed-off-by: Alina Friedrichsen <[email protected]>
---
diff -urN wireless-testing.orig/net/mac80211/mlme.c wireless-testing/ne=
t/mac80211/mlme.c
--- wireless-testing.orig/net/mac80211/mlme.c 2009-01-27 05:12:43.00000=
0000 +0000
+++ wireless-testing/net/mac80211/mlme.c 2009-01-28 15:47:19.000000000 =
+0000
@@ -2720,9 +2720,8 @@
=20
if (sdata && sdata->vif.type =3D=3D NL80211_IFTYPE_ADHOC) {
ifsta =3D &sdata->u.sta;
- if (!(ifsta->flags & IEEE80211_STA_BSSID_SET) ||
- (!(ifsta->state =3D=3D 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);
}
=20
--=20
Psssst! Schon vom neuen GMX MultiMessenger geh=F6rt? Der kann`s mit all=
en: http://www.gmx.net/de/go/multimessenger
"Alina Friedrichsen" <[email protected]> writes:
> This fixes a bug when creating a new IBSS network with a fixed BSSID. The fixed BSSID situation is now with one of my last patches handled in ieee80211_sta_find_ibss() function.
>
> It's more robust to test against (ifsta->flags & IEEE80211_STA_PREV_BSSID_SET), because ifsta->state is not seted right in every situation and so the creating of the new IBSS network sometimes hangs after the first try to scan for a network to merge.
Please line wrap your commit logs. Now you had very long lines.
--
Kalle Valo
On Wed, Jan 28, 2009 at 07:00:07PM +0200, Kalle Valo wrote:
> "Alina Friedrichsen" <[email protected]> writes:
>
> > This fixes a bug when creating a new IBSS network with a fixed BSSID. The fixed BSSID situation is now with one of my last patches handled in ieee80211_sta_find_ibss() function.
> >
> > It's more robust to test against (ifsta->flags & IEEE80211_STA_PREV_BSSID_SET), because ifsta->state is not seted right in every situation and so the creating of the new IBSS network sometimes hangs after the first try to scan for a network to merge.
>
> Please line wrap your commit logs. Now you had very long lines.
ACK, please.
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.