Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."
authorJohn W. Linville <linville@tuxdriver.com>
Mon, 30 Jan 2012 20:28:11 +0000 (15:28 -0500)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 30 Jan 2012 20:28:11 +0000 (15:28 -0500)
commitc037b8367c7e2b775a99d74037f5df014d2fbf06
tree7355a2162d6b8ac7de1cc3cb29e34aec723a68b1
parent41b2d62702730b0c6bc5a40722e423bb0338311a
Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."

This reverts commit f1e3be1561c43b6bbe2426e34849fb1486dc313b.

Johannes Berg <johannes@sipsolutions.net> thinks that this patch is
incorrect.  I'll defer to his judgment.

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