tree f4d8da7c2f6b0338a3c433425a7a2c976db45e75
parent 137f9f46a4edf8a937ffe9e3dba498b5cfaa1e5b
author Alina Friedrichsen <x-alina@gmx.net> 1231207690 +0100
committer John W. Linville <linville@tuxdriver.com> 1233262789 -0500

mac80211: Don't merge if BSSID is set manually

If you set a fixed BSSID manually, you never want that the driver
change it back, or your ad-hoc mesh network will break into peaces. So
don't do it.

Signed-off-by: Alina Friedrichsen <x-alina@gmx.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>