From patchwork Sun Feb 14 23:33:54 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benoit PAPILLAULT X-Patchwork-Id: 79333 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o1ENWeDh030200 for ; Sun, 14 Feb 2010 23:34:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751654Ab0BNXeH (ORCPT ); Sun, 14 Feb 2010 18:34:07 -0500 Received: from smtp1-g21.free.fr ([212.27.42.1]:40319 "EHLO smtp1-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752723Ab0BNXeE (ORCPT ); Sun, 14 Feb 2010 18:34:04 -0500 Received: from smtp1-g21.free.fr (localhost [127.0.0.1]) by smtp1-g21.free.fr (Postfix) with ESMTP id 1001F9400B1; Mon, 15 Feb 2010 00:33:57 +0100 (CET) Received: from xian.sabine-et-benoit.com (ns.popipo.fr [88.163.232.53]) by smtp1-g21.free.fr (Postfix) with ESMTP id 2BD779400D0; Mon, 15 Feb 2010 00:33:55 +0100 (CET) Received: by xian.sabine-et-benoit.com (Postfix, from userid 1000) id 1012B701A8; Mon, 15 Feb 2010 00:33:55 +0100 (CET) From: Benoit Papillault To: johannes@sipsolutions.net Cc: linux-wireless@vger.kernel.org, Benoit Papillault Subject: [PATCH 1/2] mac80211: Improved IBSS merges Date: Mon, 15 Feb 2010 00:33:54 +0100 Message-Id: <1266190435-2355-1-git-send-email-benoit.papillault@free.fr> X-Mailer: git-send-email 1.5.6.5 Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Sun, 14 Feb 2010 23:34:08 +0000 (UTC) diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index 423befa..9328395 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c @@ -77,9 +77,6 @@ static void __ieee80211_sta_join_ibss(struct ieee80211_sub_if_data *sdata, u32 bss_change; u8 supp_rates[IEEE80211_MAX_SUPP_RATES]; - /* Reset own TSF to allow time synchronization work. */ - drv_reset_tsf(local); - skb = ifibss->skb; rcu_assign_pointer(ifibss->presp, NULL); synchronize_rcu(); @@ -579,6 +576,8 @@ static void ieee80211_sta_create_ibss(struct ieee80211_sub_if_data *sdata) else sdata->drop_unencrypted = 0; + drv_reset_tsf(local); + __ieee80211_sta_join_ibss(sdata, bssid, sdata->vif.bss_conf.beacon_int, ifibss->channel, 3, /* first two are basic */ capability, 0); @@ -634,6 +633,7 @@ static void ieee80211_sta_find_ibss(struct ieee80211_sub_if_data *sdata) " based on configured SSID\n", sdata->name, cbss->bssid); + drv_reset_tsf(local); ieee80211_sta_join_ibss(sdata, bss); ieee80211_rx_bss_put(local, bss); return;