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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 69FEFC678D4 for ; Tue, 7 Mar 2023 17:23:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231451AbjCGRXZ (ORCPT ); Tue, 7 Mar 2023 12:23:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41406 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231455AbjCGRW4 (ORCPT ); Tue, 7 Mar 2023 12:22:56 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7818E92BF7 for ; Tue, 7 Mar 2023 09:18:41 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 069D0614FF for ; Tue, 7 Mar 2023 17:18:41 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EE163C433D2; Tue, 7 Mar 2023 17:18:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678209520; bh=bnsJzPUpSXIZCzh0Rg9jQSjAKnyAM+T5QrW/clb2z5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AtkAhogZ5XPmp5bjmKW7vuZfe9u1wxgxHvOjBvU4c77S0EXaossB7A86Z8B99K9vB li1d6ExKnkiXKFDMsAShP6nW6QptrWx0k1IsaktkB7zvuT85Xsohkt7qNWiEIDQqM2 mODk/PGUA/P3z/ws5M6mUnqTH8yhwLjF8M5DTnhU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Deren Wu , AngeloGioacchino Del Regno , Felix Fietkau , Sasha Levin Subject: [PATCH 6.2 0245/1001] wifi: mt76: mt7921: fix invalid remain_on_channel duration Date: Tue, 7 Mar 2023 17:50:17 +0100 Message-Id: <20230307170032.431051121@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170022.094103862@linuxfoundation.org> References: <20230307170022.094103862@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Deren Wu [ Upstream commit c36457a8f34d1e0fc55fbbd7b8b2d716af3f6289 ] round_jiffies_up() may change the duration reported from chip. We should take the real timeout for current channel privilege. Fixes: 034ae28b56f1 ("wifi: mt76: mt7921: introduce remain_on_channel support") Signed-off-by: Deren Wu Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Felix Fietkau Signed-off-by: Sasha Levin --- drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c index bd929b5f2504f..7253ce90234ef 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/mcu.c @@ -174,7 +174,7 @@ mt7921_mcu_uni_roc_event(struct mt7921_dev *dev, struct sk_buff *skb) wake_up(&dev->phy.roc_wait); duration = le32_to_cpu(grant->max_interval); mod_timer(&dev->phy.roc_timer, - round_jiffies_up(jiffies + msecs_to_jiffies(duration))); + jiffies + msecs_to_jiffies(duration)); } static void -- 2.39.2