From patchwork Fri Jan 21 03:02:01 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sujith Manoharan X-Patchwork-Id: 493731 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0L32nCv006078 for ; Fri, 21 Jan 2011 03:02:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752643Ab1AUDCr (ORCPT ); Thu, 20 Jan 2011 22:02:47 -0500 Received: from mail-iy0-f174.google.com ([209.85.210.174]:56009 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751496Ab1AUDCr (ORCPT ); Thu, 20 Jan 2011 22:02:47 -0500 Received: by mail-iy0-f174.google.com with SMTP id 18so1246881iyj.19 for ; Thu, 20 Jan 2011 19:02:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:mime-version:content-type :content-transfer-encoding:message-id:date:to:x-mailer:cc:subject; bh=TRbJUyJPAfIB59JFDmmWnftX2Te+I2kjd2kS4m444DQ=; b=XbaS/DtRvP967jrWIwzC6QIdoxTpGzAuI2nUWctrNe7w6sf8LURFAlgxxB4gKsZAR7 RsL7+N42tIRHiw3MiJzICtdKSTxp1l4GNLfzYD/VbMqwojLWfGPr9+UeP6zCgOXGq+8N lXaIZ+9/+AWxVClRWVLiPJ6bbQGMKVoElDCDk= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:mime-version:content-type:content-transfer-encoding:message-id :date:to:x-mailer:cc:subject; b=wKT6bWRdZhSh/hS7x+g21FcGm7x0Rze0ZlhD8dM9/nQTmDGuW0rp35RZ3HzcQJwJ/P LN6WOq6ZrglrsRC6gGHfiaGRgXY0RDsLNwK6hu1HUR9BF8e6b/yyQUW3FgrV8slRThO9 TBP+l2vcGb7bPF30QKrG2E+ANc7LFGH184jkc= Received: by 10.42.229.7 with SMTP id jg7mr105704icb.58.1295578966981; Thu, 20 Jan 2011 19:02:46 -0800 (PST) Received: from bodhi ([117.205.82.212]) by mx.google.com with ESMTPS id g4sm5675447ick.11.2011.01.20.19.02.43 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 20 Jan 2011 19:02:46 -0800 (PST) From: Sujith MIME-Version: 1.0 Message-ID: <19768.63273.407923.407455@gargle.gargle.HOWL> Date: Fri, 21 Jan 2011 08:32:01 +0530 To: linux-wireless@vger.kernel.org X-Mailer: VM 8.1.1 under 23.2.1 (x86_64-unknown-linux-gnu) CC: ath9k-devel@venema.h4ckr.net Subject: [RFC/WIP 19/33] ath9k_htc: Fix TBTT calculation for IBSS mode 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.6 (demeter1.kernel.org [140.211.167.41]); Fri, 21 Jan 2011 03:02:49 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c index b4431a9..0803c25 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c @@ -190,20 +190,31 @@ static void ath9k_htc_beacon_config_adhoc(struct ath9k_htc_priv *priv, { struct ath_common *common = ath9k_hw_common(priv->ah); enum ath9k_int imask = 0; - u32 nexttbtt, intval; + u32 nexttbtt, intval, tsftu; __be32 htc_imask = 0; int ret; u8 cmd_rsp; + u64 tsf; intval = bss_conf->beacon_interval & ATH9K_BEACON_PERIOD; nexttbtt = intval; + + /* + * Pull nexttbtt forward to reflect the current TSF. + */ + tsf = ath9k_hw_gettsf64(priv->ah); + tsftu = TSF_TO_TU(tsf >> 32, tsf) + FUDGE; + do { + nexttbtt += intval; + } while (nexttbtt < tsftu); + intval |= ATH9K_BEACON_ENA; if (priv->op_flags & OP_ENABLE_BEACON) imask |= ATH9K_INT_SWBA; - ath_dbg(common, ATH_DBG_BEACON, - "IBSS Beacon config, intval: %d, imask: 0x%x\n", - bss_conf->beacon_interval, imask); + ath_dbg(common, ATH_DBG_CONFIG, + "IBSS Beacon config, intval: %d, nexttbtt: %u, imask: 0x%x\n", + bss_conf->beacon_interval, nexttbtt, imask); WMI_CMD(WMI_DISABLE_INTR_CMDID); ath9k_hw_beaconinit(priv->ah, nexttbtt, intval);