From patchwork Sat Oct 22 07:21:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 7310 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4242:0:0:0:0:0 with SMTP id s2csp1093393wrr; Sat, 22 Oct 2022 00:57:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM61zHgipLcbeugoQ2v0IORqVN93MB5fVt8li1/rpxf8zxABpYRh6YMLXYVyiuWKKoHAGQzZ X-Received: by 2002:a63:1455:0:b0:438:e26b:ab1f with SMTP id 21-20020a631455000000b00438e26bab1fmr18967825pgu.183.1666425423928; Sat, 22 Oct 2022 00:57:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666425423; cv=none; d=google.com; s=arc-20160816; b=WdCGsYxD7zqpc/WCDowGUfkXttYl0vDcTyeLq5Z+7ccKn4BGgaineJSPNuGo9TGQuA YBmY5o5erIj5nBJtP+JiQGyprizmGvBVsV9MUdf6TZIneP7QhgxK5LMr4IrarbPndMTs uhRl7ezGN0t6vyHodgGQ47Ey8nUWBuZnP5InQaPjtCuA0DP7iPzjn73qBNSe0GXuP8ys SFJbKEB+YigXNWf+ayYkjE3FRCwZVXqG14ojLRKIjacJ1DYzpdsBSveUJGBlQbJpiXmM 2jQBgRpHVLntSgQ4PMuozUb5xi+pLor4QFstMp7yQWdxgC599qe38hKx73lxVOWN9RLQ 32UA== 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=5QLTH4pVycFqwi8gjNIRvc3ekY9ENaN+0+Q2jY9HKVI=; b=BOhyklMj3CuB7E3+FjJbL5DnGQGJNEAMdVIHED7ixHTf06hzzHmeJ3BXZKDDNWmrz4 r5Gp/RBzd3hRUzG88q7AHWCUzQgdfz43SbPEaNvEfoAfAsiabkZOTERsRhHYzynvWbMg 6n6xS4aGWJVx7pgkgHviIpeTOJBj9dyD4+Ua8cxrtOa7/JBQ9VX+NkyFUoRXtj+13uhA 2Q1XmnBZ7/7U2mxkntSIQuZH7xxJiiKqcZGaszdKsxGUA/6p48zhp8ZGCAE+bKuq5mWu W3Xck8Ou8rGTqcDZlqQgeiCP+I9pcoOxDbOkLuAXUIDjidaYbegF7X6JrdqKR2iFwLxr /+bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=zVxCFtzR; 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 z13-20020a170902cccd00b0018659ff71d2si10298913ple.62.2022.10.22.00.56.50; Sat, 22 Oct 2022 00:57:03 -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=zVxCFtzR; 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 S232270AbiJVH42 (ORCPT + 99 others); Sat, 22 Oct 2022 03:56:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231834AbiJVHwn (ORCPT ); Sat, 22 Oct 2022 03:52:43 -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 DA32B2CA7CB; Sat, 22 Oct 2022 00:46:52 -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 02800B82E04; Sat, 22 Oct 2022 07:46:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 68EFFC433D7; Sat, 22 Oct 2022 07:45:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666424758; bh=cb9AYLegFXiTkvHGAfCKIRGZYjBMoWfVo20Z0DvmxeM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zVxCFtzRNxE2/kOQlzQeYlsINBeMxFEHaXWts6ZxpTzzMJ+u/c2dKZtQH4hs/6MjZ DwPb2DGfqplQtLCbnxufzs6+Ac8YLK2XLklMlTuxroamuuw1ok1KGoEG7xiMzo+QgA 6i83BaNhZYxtQvrDvIaX6FCXlDIGGrD28LnG+PE8= 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.19 236/717] wifi: rtl8xxxu: Remove copy-paste leftover in gen2_update_rate_mask Date: Sat, 22 Oct 2022 09:21:55 +0200 Message-Id: <20221022072456.774535134@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221022072415.034382448@linuxfoundation.org> References: <20221022072415.034382448@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.3 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?1747373705624322650?= X-GMAIL-MSGID: =?utf-8?q?1747373705624322650?= 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 780a485eafd9..472b00c70781 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c @@ -4353,15 +4353,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)); }