Received: by 2002:a05:7412:8d09:b0:fa:4c10:6cad with SMTP id bj9csp682074rdb; Tue, 16 Jan 2024 12:27:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHBCexlU4TlfiXn9FhGkqmJOIt65FjmeYL80pRQwj0rAxpueRFIOglLYpyq7Z1Eg7QSz4XS X-Received: by 2002:a17:906:c196:b0:a2c:69ab:ca4c with SMTP id g22-20020a170906c19600b00a2c69abca4cmr4058874ejz.93.1705436836392; Tue, 16 Jan 2024 12:27:16 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705436836; cv=pass; d=google.com; s=arc-20160816; b=knDgKT3ZUf5k8DQF7oH5qm4Pm2lOEzNq/Q7BWCp82y6yUTvV+76TkFpsb4A1kQcuBy +6sMOeIZWTX3lH4YlaNajfhnQGCcPfVxLti2HFVAzuRdpmtMYlJAtnXMYHDgVzyeKgjl 71Mol6UHQ/BJEWlMoP454mHqs5gto43yIMxK/FnAO2DFnwCfMrjt7ZPG8HCEHGEbRw3c vfi5e0NQ4+tBKWvMwFYd2WfTIBIV8zrjJV7SGLJVpcRbliPVzb7uwpWIphgLBALVp4Qn Dvwp2ghbymzw6ev1DSfyoSxy/QdJijVvlXP9ZLxqUijv+nSY3XT7mlx2nKX/VTO5h9mF YT2g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=VPYs3JnBNUiNKDZEPyXTwBNmrZB2swlSwJP9n+rRjoY=; fh=lFCSVkEdWicoFlhblZAHwUC2Mmlgj421kwS2r7YCF14=; b=FmeNoOCyL1IQEL/HG0l3N6aOvjCHZ0YqQGJDAJakR8ir7v52vsXwqfYPtjepaiYv/F uKirHHYjsAdATrMt0QeEZ+9+H+5wEz8/wj3SgpxVdFln1rpTR36q+I1zMx7FE2IwH6XH PlEJ97bHCzhojtnSiNJsUJ6AkzQjzVG8HdgoOeM32XV6YnbYsXWnT3XId49jrByhufwO hNzNRPwDM7THjGfBqqtxNsWTNcT8I/UhYnFLRELLWHiH8IgfjOMekQviQenGKKqc9crH JOtgy6Yu54GTLQhXpYhQZTrNmvcEKwnPM2DFlzMgkzwgcQI6kNSB0+OAIfbO9S3hO2xK 1UOQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="XLI9u5r/"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-27908-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27908-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id n26-20020a170906b31a00b00a2776d4d8aesi4934974ejz.69.2024.01.16.12.27.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 12:27:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-27908-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b="XLI9u5r/"; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-27908-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-27908-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 25E411F25B95 for ; Tue, 16 Jan 2024 20:27:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 17526225D9; Tue, 16 Jan 2024 19:49:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="XLI9u5r/" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A2248509C; Tue, 16 Jan 2024 19:49:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434552; cv=none; b=MORz5/0X+Gm2e7HFcSRG82CBIYFRx3fmCyN4R9mSvCfygYuIqi3EY21USmhjvzeYBTqjZoYVPx4EfgEPJkMgrfCrW/TbMRMi+DPB2++RWLZVM8i8xAsT8ZXJrqlMQKRCBNKFZrPCkhivuVLfwMh6iYZnheWCZ3Ci4nrXoJsY55k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705434552; c=relaxed/simple; bh=tIH1Lv0iXYkXYNFVwBt7OBZPs5FAlwpQhvwCM6EyewA=; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID: X-Mailer:MIME-Version:X-stable:X-Patchwork-Hint:X-stable-base: Content-Transfer-Encoding; b=VlT6eoedUhfEHL50HJET90jCwbLWCSlhNhqSNNUyJHWU/WDPLYAsOdJHj4ADFwhZrHT3Bls5mpXO79o4XlDPZZv29Y7osqOrcDzkt43Dsb3zPq+vzATBcBIjrcsKw72cV2Nu+pFQ32SEShbbWC6RwbDy6WNotyidES9d/I3S/Ow= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=XLI9u5r/; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id F09BDC433F1; Tue, 16 Jan 2024 19:49:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1705434551; bh=tIH1Lv0iXYkXYNFVwBt7OBZPs5FAlwpQhvwCM6EyewA=; h=From:To:Cc:Subject:Date:From; b=XLI9u5r/V+u1GQJN/HBzr5kKhnSEEaxWUoEszCK2bvk0OlcdNc94wHCFFv6p+2xp+ dWt4b97Tn+ZLsghV8GQjbHo0FGfXKkQBIZB1Bi4gk//HrTqAldVSaY2+pmTAU0Wq1V nRFx5Y7AgB1NedZBtYfADr2Nc+kSayxfjSlB3YEv3GuVjfdii7xpu151hAz6A7Jmkb ez/ynrspvmzUaZfpP4zj/BgbMo5lYOCmj/jqNkiuZdNK5KMuucyfyV0xWGsLxeqVE5 RNHCeFIt86MjnAI34Eelgyp+DOdx9oLKMKkGWcmqGG1tfzper1etrw28ikgX5xHdfC vL8YpDPVP1+AQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Antipov , Ping-Ke Shih , Kalle Valo , Sasha Levin , linux-wireless@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 001/104] wifi: rtw89: fix timeout calculation in rtw89_roc_end() Date: Tue, 16 Jan 2024 14:45:27 -0500 Message-ID: <20240116194908.253437-1-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.12 Content-Transfer-Encoding: 8bit From: Dmitry Antipov [ Upstream commit e416514e309f7e25e577fee45a65f246f67b2261 ] Since 'rtw89_core_tx_kick_off_and_wait()' assumes timeout (actually RTW89_ROC_TX_TIMEOUT) in milliseconds, I suppose that RTW89_ROC_IDLE_TIMEOUT is in milliseconds as well. If so, 'msecs_to_jiffies()' should be used in a call to 'ieee80211_queue_delayed_work()' from 'rtw89_roc_end()'. Compile tested only. Signed-off-by: Dmitry Antipov Acked-by: Ping-Ke Shih Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/20231024143137.30393-1-dmantipov@yandex.ru Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtw89/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index 133bf289bacb..535393eca564 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -2548,7 +2548,7 @@ void rtw89_roc_end(struct rtw89_dev *rtwdev, struct rtw89_vif *rtwvif) if (hw->conf.flags & IEEE80211_CONF_IDLE) ieee80211_queue_delayed_work(hw, &roc->roc_work, - RTW89_ROC_IDLE_TIMEOUT); + msecs_to_jiffies(RTW89_ROC_IDLE_TIMEOUT)); } void rtw89_roc_work(struct work_struct *work) -- 2.43.0