git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b35686d) | patch
mac80211: Fix IBSS merge
authorSujith <Sujith.Manoharan@atheros.com>
Mon, 2 Nov 2009 07:03:23 +0000 (12:33 +0530)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 4 Nov 2009 23:44:52 +0000 (18:44 -0500)
commit450aae3d7b60a970f266349a837dfb30a539198b
tree1d45c9bca4c34736eef9d9772edea798c9c66fa6tree | snapshot
parentb35686d0b2d754d627aeb0c4340884aeaed8e4f3commit | diff
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>
net/mac80211/ibss.c diff | blob | history
Full containers within linux kernel