aboutsummaryrefslogtreecommitdiff
path: root/net/wireless
diff options
context:
space:
mode:
authorSujith <Sujith.Manoharan@atheros.com>2009-11-02 12:33:23 +0530
committerGreg Kroah-Hartman <gregkh@suse.de>2010-01-06 15:04:08 -0800
commit9f7028e71d940aadcdea9f777286b066971ba5da (patch)
tree9e2ea9ca82522ae409410deef74e1d3863d802cc /net/wireless
parent0b41c5a957e4fb2be4a8ef960e4e50c8791999f3 (diff)
mac80211: Fix IBSS merge
commit 450aae3d7b60a970f266349a837dfb30a539198b upstream. 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> Cc: Luis Rodriguez <lrodriguez@atheros.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/wireless')
0 files changed, 0 insertions, 0 deletions