| commit | 2973773775ec05d18e4b942a28604120cb15bbf2 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Thu Feb 24 14:46:13 2011 +0100 |
| committer | John W. Linville <linville@tuxdriver.com> | Fri Feb 25 15:32:34 2011 -0500 |
| tree | 8dcb5e76698f168723966066322a136e4aac5de9 | |
| parent | 7bb4568372856688bc070917265bce0b88bb7d4d [diff] |
mac80211: remove IBSS merge delay
This reverts 4a332a38
("mac80211: Give it some time to do the TSF sync").
There's no point in waiting with a new IBSS merge
just because the hardware hasn't merged up with
the old IBSS yet, and since 34e8f082 we no longer
attempt to merge with the IBSS we're already in.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>