mac80211: Do not scan for IBSS merge with a fixed BSSID.
authorNicolas Cavallari <Nicolas.Cavallari@lri.fr>
Thu, 26 Jan 2012 12:36:34 +0000 (13:36 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 27 Jan 2012 19:57:06 +0000 (14:57 -0500)
commitf1e3be1561c43b6bbe2426e34849fb1486dc313b
treedc0975fc229b57658cac34ed90e56cd7ccf6b822
parent6e1b1b246096fe04467f928973487fa47afaf2cc
mac80211: Do not scan for IBSS merge with a fixed BSSID.

Currently, when we are on an IBSS network with no active station,
we would scan for other BSSID, even if fixed_bssid is on,  due to
a bug in ibss.c,  where fixed_channel would be checked instead of
fixed_bssid.  This would trigger useless scans where scan results
would not be used anyway.

This patch also reverts commit 39d02a7d90602d4557ee05db2a157a4e0,
which assumed that the ifibss->fixed_channel check was legitimate
to disable single-channel scans.  IBSS single-channel scan should
now be fixed.

Signed-off-by: Nicolas Cavallari <cavallar@lri.fr>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
net/mac80211/ibss.c