tree 62f44c77e246e3bd1173cb1c79eeadc62e3cb2d1
parent ce9058aedd75f14785400dcc49a2bc352ca38871
author Benoit Papillault <benoit.papillault@free.fr> 1263764724 +0100
committer John W. Linville <linville@tuxdriver.com> 1263937390 -0500

mac80211: Fixed a bug in IBSS merge

First, both beacons and probe responses can be used for IBSS merge.
Next, sdata->u.ibss.bssid was always true (and thus IBSS merge was
disabled). We should use sdata->u.ibss.fixed_bssid instead.

Signed-off-by: Benoit Papillault <benoit.papillault@free.fr>
Signed-off-by: John W. Linville <linville@tuxdriver.com>