projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7bb4568) | 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)
commit2973773775ec05d18e4b942a28604120cb15bbf2
tree8dcb5e76698f168723966066322a136e4aac5de9tree | snapshot
parent7bb4568372856688bc070917265bce0b88bb7d4dcommit | 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>
net/mac80211/ibss.c diff | blob | history
John Crispins staging tree