From: Sujith <Sujith.Manoharan@atheros.com>
Date: Mon, 2 Nov 2009 07:03:23 +0000 (+0530)
Subject: mac80211: Fix IBSS merge
X-Git-Tag: v2.6.33-rc1~388^2~449^2~53
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=450aae3d7b60a970f266349a837dfb30a539198b;p=pandora-kernel.git

mac80211: Fix IBSS merge

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.

Signed-off-by: Sujith <Sujith.Manoharan@atheros.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed