From patchwork Mon Oct 24 11:28:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9656 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp534394wru; Mon, 24 Oct 2022 09:11:02 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7sXdpv63CfWRPXyXGJ9PJ8A5MVvYzlN+DPBWGZtLp5u+pkBQyccOkgBKHZak4mw5S+AaLh X-Received: by 2002:a05:6402:2791:b0:461:c5b4:d114 with SMTP id b17-20020a056402279100b00461c5b4d114mr5413010ede.357.1666627862701; Mon, 24 Oct 2022 09:11:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627862; cv=none; d=google.com; s=arc-20160816; b=S2PXkEm4yZo3MOxobT/2bAj2ExOJeU+KViL8jJh/4zlALOmrXwoubHol5oKQxlRBRT 6ORGh1IiYloU8cNJqrJ5ksU9srC8avRQOuLK0x5mLtRgMBvyyPGv7f3U6MojHGSHrQKO nnamzQ4raiURG5GRgGHRSeyborIzshgeNIKrtwE/PfvkZyOgd3ADoczrBfwiW/+63ARy 5/Z0O3Qr3ZngH3tFHLOp9PpfEXL/G2X5yLKmIFfxxsl84uCf+xJfmxsiIL9vAT1bC86I 0/8PJ/tgZrYC8ZJJL9zUezaswG3X3wRjLFFZzXcvW+icWPtPauHGCK9e0zwMbLvEp7v2 K9bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=Ret1zIftOr+MzL6xN8H/XPNX9xYF5RdhDJbKOgDPKoo=; b=M/t4gtVGf9ngneJ6ojpPmrdeo6zfgtNq88XDe3s+67CtTQir/ggD/7E2g+WoHz4aH1 GJYb0hguWvA+CU19e+kIK9DolClslkh/XqQ3RdGhBHeDBkDq5pcfBD11sf2soOVY4/km 0I2ykO88paiy/8MBvs5X6FNfEBm5zDM/PGcKwUNTx2XHl29s+GlIgPHFisddrdPeChMF 6T6cf88iZEfwdF35uelBZp7pWNdqxYwDfrHxcW0mgKjD+5Xx5xyuFOlq8h/v/MUGOFti svmKnNutVcHEdaOnWjxEbn1BLgedmd3pVMdQIUf8ZNjqr6aGqauVW/dVYgDc29Q9grd9 ggIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZUijnd0b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id se12-20020a170906ce4c00b007417c6edb0asi121734ejb.402.2022.10.24.09.10.36; Mon, 24 Oct 2022 09:11:02 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=ZUijnd0b; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233520AbiJXQIu (ORCPT + 99 others); Mon, 24 Oct 2022 12:08:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233518AbiJXQEp (ORCPT ); Mon, 24 Oct 2022 12:04:45 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0965111DA8C; Mon, 24 Oct 2022 07:56:57 -0700 (PDT) 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 ams.source.kernel.org (Postfix) with ESMTPS id 55FFFB81622; Mon, 24 Oct 2022 12:22:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id ABEFDC433D6; Mon, 24 Oct 2022 12:22:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614140; bh=PukQNIuMJtIKCf6FKddboRSeZ1xofppsG4CGvTuHsD4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZUijnd0bo37TbxBA74zSG9f19ExOG1h/ynE41acGubzlJjQXMS4k3oSZcoA++xk9V sRDPaiPz4sC2etjAXxxoQZmwOWF/aARWPNaNRHKRuSV7N5UVLJmRLwgfsgwvUS2yne GKjZA8NwCyJcIZQroOz+jEZmu7OJzwq9FpsDL87U= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bitterblue Smith , Kalle Valo , Sasha Levin Subject: [PATCH 5.10 117/390] wifi: rtl8xxxu: Remove copy-paste leftover in gen2_update_rate_mask Date: Mon, 24 Oct 2022 13:28:34 +0200 Message-Id: <20221024113027.672349589@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747585978071991572?= X-GMAIL-MSGID: =?utf-8?q?1747585978071991572?= From: Bitterblue Smith [ Upstream commit d5350756c03cdf18696295c6b11d7acc4dbf825c ] It looks like a leftover from copying rtl8xxxu_update_rate_mask, which is used with the gen1 chips. It wasn't causing any problems for my RTL8188FU test device, but it's clearly a mistake, so remove it. Fixes: f653e69009c6 ("rtl8xxxu: Implement basic 8723b specific update_rate_mask() function") Signed-off-by: Bitterblue Smith Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/d5544fe8-9798-28f1-54bd-6839a1974b10@gmail.com Signed-off-by: Sasha Levin --- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index 8668b03bd8c7..7818a7ea0498 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -4338,15 +4338,14 @@ void rtl8xxxu_gen2_update_rate_mask(struct rtl8xxxu_priv *priv, h2c.b_macid_cfg.ramask2 = (ramask >> 16) & 0xff; h2c.b_macid_cfg.ramask3 = (ramask >> 24) & 0xff; - h2c.ramask.arg = 0x80; h2c.b_macid_cfg.data1 = rateid; if (sgi) h2c.b_macid_cfg.data1 |= BIT(7); h2c.b_macid_cfg.data2 = bw; - dev_dbg(&priv->udev->dev, "%s: rate mask %08x, arg %02x, size %zi\n", - __func__, ramask, h2c.ramask.arg, sizeof(h2c.b_macid_cfg)); + dev_dbg(&priv->udev->dev, "%s: rate mask %08x, rateid %02x, sgi %d, size %zi\n", + __func__, ramask, rateid, sgi, sizeof(h2c.b_macid_cfg)); rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.b_macid_cfg)); }