From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 87634C83000 for ; Tue, 28 Apr 2020 18:44:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 66DAE2085B for ; Tue, 28 Apr 2020 18:44:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099492; bh=Z9GXC0/XLwNjb1iPpdohN1i5r0SvWXCpY+w0cYhMuFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Lji+t5MgOTPL5B/2iWL9rfwxK358w0/hK9/nsLst5/eOgWRtPid7K5GWMN0nKKIGi 6Fs7GR0fBlACjruA/rEyHvUQ+AtDA09VPjz3XnGhaoY/TWkq/TljMQypFp32feTo2Z 6MSJphWo3ev7KU4ZglDIDcqEd5ehk/Pcv24XRqSo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731474AbgD1Sov (ORCPT ); Tue, 28 Apr 2020 14:44:51 -0400 Received: from mail.kernel.org ([198.145.29.99]:37860 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731422AbgD1Sot (ORCPT ); Tue, 28 Apr 2020 14:44:49 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5745A20575; Tue, 28 Apr 2020 18:44:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588099488; bh=Z9GXC0/XLwNjb1iPpdohN1i5r0SvWXCpY+w0cYhMuFA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YRve5BbomtVvpWfjXOC4Y5gwC6pDVp2ZpTX0U1MBc+x7JBHKdoLx3hLhbTjnk8+ww AiUv3EuFNHb3EJ41HS0VOTJ+kQzwDaG3BHlx5zTONFTmYDIz5VK7fENH2w88T/ostn 6IKUBZB3QEXcGruKfqgvIiezL1b6LY+yc7LWIZ4c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Malcolm Priestley Subject: [PATCH 5.4 142/168] staging: vt6656: Fix drivers TBTT timing counter. Date: Tue, 28 Apr 2020 20:25:16 +0200 Message-Id: <20200428182249.675555147@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Malcolm Priestley commit 09057742af98a39ebffa27fac4f889dc873132de upstream. The drivers TBTT counter is not synchronized with mac80211 timestamp. Reorder the functions and use vnt_update_next_tbtt to do the final synchronize. Fixes: c15158797df6 ("staging: vt6656: implement TSF counter") Cc: stable Signed-off-by: Malcolm Priestley Link: https://lore.kernel.org/r/375d0b25-e8bc-c8f7-9b10-6cc705d486ee@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/main_usb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -778,12 +778,15 @@ static void vnt_bss_info_changed(struct vnt_mac_reg_bits_on(priv, MAC_REG_TFTCTL, TFTCTL_TSFCNTREN); - vnt_adjust_tsf(priv, conf->beacon_rate->hw_value, - conf->sync_tsf, priv->current_tsf); - vnt_mac_set_beacon_interval(priv, conf->beacon_int); vnt_reset_next_tbtt(priv, conf->beacon_int); + + vnt_adjust_tsf(priv, conf->beacon_rate->hw_value, + conf->sync_tsf, priv->current_tsf); + + vnt_update_next_tbtt(priv, + conf->sync_tsf, conf->beacon_int); } else { vnt_clear_current_tsf(priv);