From: Nicolas Cavallari Date: Thu, 26 Jan 2012 12:36:34 +0000 (+0100) Subject: mac80211: Do not scan for IBSS merge with a fixed BSSID. X-Git-Tag: v3.4-rc1~177^2~376^2^2~18 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1e3be1561c43b6bbe2426e34849fb1486dc313b;p=pandora-kernel.git 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 Signed-off-by: John W. Linville --- Reading git-diff-tree failed