From 34e8f08231388f9e16c6f1e2461f53afaf7f1e5e Mon Sep 17 00:00:00 2001
From: Alina Friedrichsen <x-alina@gmx.net>
Date: Sun, 22 Feb 2009 00:07:28 +0100
Subject: [PATCH] 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 <x-alina@gmx.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---
Reading git-format-patch failed