mac80211: Fixed a bug in IBSS merge
authorBenoit Papillault <benoit.papillault@free.fr>
Sun, 17 Jan 2010 21:45:24 +0000 (22:45 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 19 Jan 2010 21:43:10 +0000 (16:43 -0500)
commita98bfec2985221d8e0904a526cbe88590eaad2a6
tree62f44c77e246e3bd1173cb1c79eeadc62e3cb2d1
parentce9058aedd75f14785400dcc49a2bc352ca38871
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>
net/mac80211/ibss.c