From: Johannes Berg Date: Thu, 24 Feb 2011 13:46:13 +0000 (+0100) Subject: mac80211: remove IBSS merge delay X-Git-Tag: v2.6.39-rc1~468^2~158^2^2~30 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2973773775ec05d18e4b942a28604120cb15bbf2;p=pandora-kernel.git 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 Signed-off-by: John W. Linville --- Reading git-diff-tree failed