On Mon, 2009-11-02 at 12:33 +0530, Sujith wrote: > Currently, in IBSS mode, a single creator would go into > a loop trying to merge/scan. This happens because the IBSS timer is > rearmed on finishing a scan and the subsequent > timer invocation requests another scan immediately. > > This patch fixes this issue by checking if we have just completed > a scan run trying to merge with other IBSS networks. Heh, how many people do we need to fix IBSS? :) Looks sane to me. johannes > Signed-off-by: Sujith <Sujith.Manoharan@xxxxxxxxxxx> > --- > net/mac80211/ibss.c | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c > index f1362f3..fbffce9 100644 > --- a/net/mac80211/ibss.c > +++ b/net/mac80211/ibss.c > @@ -455,6 +455,10 @@ static void ieee80211_sta_merge_ibss(struct ieee80211_sub_if_data *sdata) > > ieee80211_sta_expire(sdata, IEEE80211_IBSS_INACTIVITY_LIMIT); > > + if (time_before(jiffies, ifibss->last_scan_completed + > + IEEE80211_IBSS_MERGE_INTERVAL)) > + return; > + > if (ieee80211_sta_active_ibss(sdata)) > return; >
Attachment:
signature.asc
Description: This is a digitally signed message part
