From: Benoit Papillault Date: Sun, 17 Jan 2010 21:45:24 +0000 (+0100) Subject: mac80211: Fixed a bug in IBSS merge X-Git-Tag: v2.6.34-rc1~233^2~421^2~102 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a98bfec2985221d8e0904a526cbe88590eaad2a6;p=pandora-kernel.git 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 Signed-off-by: John W. Linville --- Reading git-diff-tree failed