]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3558e6f) | patch
mac80211: remove IBSS merge delay
authorJohannes Berg <johannes.berg@intel.com>
Thu, 24 Feb 2011 13:46:13 +0000 (14:46 +0100)
committerJohn W. Linville <linville@tuxdriver.com>
Fri, 25 Feb 2011 20:32:34 +0000 (15:32 -0500)
commit0c8b9224eaf7f9e2c8bf25bc7b03e6064f7d45ee
tree8dcb5e76698f168723966066322a136e4aac5de9tree | snapshot
parent3558e6f323a770bf298b6a1c184df664ef059c64commit | diff
mac80211: remove IBSS merge delay

This reverts 772a0fc4
("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 edda272c 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>
net/mac80211/ibss.c diff | blob | history
Linux Kernel Source Tree.