From patchwork Tue Dec 7 21:37:56 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Cardona X-Patchwork-Id: 384182 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 oB7Lc8xF024981 for ; Tue, 7 Dec 2010 21:38:09 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752886Ab0LGViG (ORCPT ); Tue, 7 Dec 2010 16:38:06 -0500 Received: from mail-yx0-f174.google.com ([209.85.213.174]:42691 "EHLO mail-yx0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752288Ab0LGViF (ORCPT ); Tue, 7 Dec 2010 16:38:05 -0500 Received: by yxt3 with SMTP id 3so277534yxt.19 for ; Tue, 07 Dec 2010 13:38:04 -0800 (PST) Received: by 10.42.218.74 with SMTP id hp10mr1229894icb.266.1291757884418; Tue, 07 Dec 2010 13:38:04 -0800 (PST) Received: from localhost.localdomain (adsl-99-114-136-65.dsl.pltn13.sbcglobal.net [99.114.136.65]) by mx.google.com with ESMTPS id 34sm6325141ibi.20.2010.12.07.13.38.01 (version=TLSv1/SSLv3 cipher=RC4-MD5); Tue, 07 Dec 2010 13:38:02 -0800 (PST) From: Javier Cardona To: "John W. Linville" Cc: Javier Cardona , Steve Derosier , devel@lists.open80211s.org, linux-wireless@vger.kernel.org, Jiri Slaby , Nick Kossifidis , "Luis R. Rodriguez" , Bob Copeland Subject: [PATCH 3/3] ath5k: Put the right tsf value in mesh beacons Date: Tue, 7 Dec 2010 13:37:56 -0800 Message-Id: <1291757876-29936-1-git-send-email-javier@cozybit.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <20101207205751.GJ2700@tuxdriver.com> References: <20101207205751.GJ2700@tuxdriver.com> 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 (demeter1.kernel.org [140.211.167.41]); Tue, 07 Dec 2010 21:38:09 +0000 (UTC) diff --git a/drivers/net/wireless/ath/ath5k/base.c b/drivers/net/wireless/ath/ath5k/base.c index 2bf2e28..ac7da50 100644 --- a/drivers/net/wireless/ath/ath5k/base.c +++ b/drivers/net/wireless/ath/ath5k/base.c @@ -1881,7 +1881,8 @@ ath5k_beacon_send(struct ath5k_softc *sc) sc->bmisscount = 0; } - if (sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) { + if ((sc->opmode == NL80211_IFTYPE_AP && sc->num_ap_vifs > 1) || + sc->opmode == NL80211_IFTYPE_MESH_POINT) { u64 tsf = ath5k_hw_get_tsf64(ah); u32 tsftu = TSF_TO_TU(tsf); int slot = ((tsftu % sc->bintval) * ATH_BCBUF) / sc->bintval;