From: Alina Friedrichsen Date: Sat, 21 Feb 2009 23:07:28 +0000 (+0100) Subject: mac80211: Don't merge with the same BSSID X-Git-Tag: v2.6.30-rc1~662^2~460^2~8 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=34e8f08231388f9e16c6f1e2461f53afaf7f1e5e;p=pandora-kernel.git mac80211: Don't merge with the same BSSID It was not a good idea to do a TSF reset on strange IBSS merges to the same BSSID. For example it will break the TSF sync of ath9k completely and it is unnecessary as all hardware I have tested do a TSF sync to a higher value automatically and IBSS merges are only done to higher TSF values. It only need a TSF reset to accept a lower value, when the IBSS network is changed manually. Signed-off-by: Alina Friedrichsen Signed-off-by: John W. Linville --- Reading git-diff-tree failed