Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."

This reverts commit f1e3be15.

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>