From patchwork Sun Dec 10 15:26:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176355 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570185vqy; Sun, 10 Dec 2023 07:27:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IFSZorXbQSU2MBjQBGHUzjeqDCwovK8DZ//s0rs/lxrCyDRTs0EZNCwCqtlgbQZiOy3I/JW X-Received: by 2002:a05:6a20:6714:b0:190:3fd8:45b6 with SMTP id q20-20020a056a20671400b001903fd845b6mr1408897pzh.25.1702222032318; Sun, 10 Dec 2023 07:27:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222032; cv=none; d=google.com; s=arc-20160816; b=ArV4+g8SY8/jkGQcrecr8+sGWGvITyCCP77A2EomcgXMylZw97Q4rBuRb0PDJgr5ZY A0JV18rKbbYKrwEWkmhj6893UUHs9AN7/U11kgo8VEP90j9aUe6hK8ftwmyQEGWuBtlt Tq6l53e+4cHa7UZfZRnM5wY3GVWpzukQS8kl113NUc2uLQKEjg6P/JX4mAadqdXpK8I7 FVGWICIfao/YaNEzrQalxkxPOCz496tfMJ2h6JDaEtUcLau5d1JQh7vYaBQNDYCHcVP+ NlaJ/nqEaqmDmSvJ+NLlxzXVTUhFEMHYecD/6i5zA4scmWW6WmWmDCyjyXRWz/jVhc9A +4Lg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date:dkim-signature; bh=jSfz65UDs/wKcMDkHDq6mjAfRk0t651ez9MkrfvQFp0=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=gYC40IGiBgRtYc6OIeG+RMXrDc6lAxPcbQ3k/0AWVJaUp2zfFLku7jjofBV7b2a/pb xnQmwFl4ibMIbKFkpIR/bZtlWqaizp8wEMdMMhI+gUp4M7QfDkr9PPuvFELrz2h+iXPw sSalorrYrICycGkUT/zMjl6TQFnjOzu4semRvh2oMf0+v9uyoY1qFnu/N6dK7J2igLRI rBEaWp4QbIy9qKIPgNE4IarC9fxbkqYnuQwqUgEslKvDDiKr3rY+E7Es0O0qmBwaFL85 keLynxX/lPKzPMRBFuEufcP06MSGbWy5RRQjyMxhRCrRV5SbbIVyUN91bnjsTAslttLS 81uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="MpBypr/M"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id f11-20020a170902ce8b00b001d0029879dcsi4890815plg.213.2023.12.10.07.27.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:27:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="MpBypr/M"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 0B95F8087502; Sun, 10 Dec 2023 07:26:50 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232996AbjLJP0a (ORCPT + 99 others); Sun, 10 Dec 2023 10:26:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232882AbjLJP0X (ORCPT ); Sun, 10 Dec 2023 10:26:23 -0500 Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 99A9B11C for ; Sun, 10 Dec 2023 07:26:27 -0800 (PST) Received: by mail-wm1-x32c.google.com with SMTP id 5b1f17b1804b1-40c192f488cso5990765e9.1 for ; Sun, 10 Dec 2023 07:26:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702221986; x=1702826786; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=jSfz65UDs/wKcMDkHDq6mjAfRk0t651ez9MkrfvQFp0=; b=MpBypr/M6t0DNCT6qCQAVhY7e1Iulb1ONTNxr1oj19zUhXUxksz0Q/4Qggdpgk+RXH CMW4Fx2J8JCCjQEGnnojfsG8FXWHbp4dqJxTRDcDuJA+fQbRH1U7yoSahF1MPlD9GJNA PuzatxznlF7md/anbyyannA0DKlBqlxU0TV48sQU5KuBUCykaPVqiHTzPQDVZlYr9dPB 1zq/w3sRK4w03+Bhp5STeyzyA5K5gWyyoc2ukOpq/5v5ljMFfgZ0P9sgleZLuppT+JpY 409VauBrtq9+XcYMe5Z6olpqkbuukJiyKDdinkxpCVUXwimMFlTBzwX+BIGswk2SmX1n 37Gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702221986; x=1702826786; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=jSfz65UDs/wKcMDkHDq6mjAfRk0t651ez9MkrfvQFp0=; b=Gfw3PsYV5sDLMBAh/AlHzYTzEk9G1+ggvbcV61auo5Bw4PGK/0r5N5+usiYc0WS6p7 m76LQ4aX0+MIGNTcN5rzLMZbbszL/vwZhlMYIBtAUQjt0bQjdykB0A5TUXDm6nCrXPq1 c1WkOdzZ/Z5hcYXQ7d/QALSyG3WhiRG65uHW3LlTOJMotZ45jU9gKV0GtxXumFQ/o02s NLUyJoiU/owY0nm3PnKiUkLRdREvBaVJWk9zdEl6vfqV0glyeBhPy98NK202zGmR1nYl ILKN+teep/JChM5oKLIyCMfbESzDsN+BVodM8wfC3DNKOhgaUiO8gA8vRa3ba1W0r67d 4Alg== X-Gm-Message-State: AOJu0Yys3ZOHZDNR8siNlN3DAu4YuurdtasGhByvHY7ZSIznrv0oIdHF P3krPCLZSBws45N0IFazolua8Di5wqA= X-Received: by 2002:a05:6000:154f:b0:333:5330:2934 with SMTP id 15-20020a056000154f00b0033353302934mr4979541wry.1.1702221985654; Sun, 10 Dec 2023 07:26:25 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id g3-20020adff403000000b003335ddce799sm6529063wro.103.2023.12.10.07.26.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:25 -0800 (PST) Date: Sun, 10 Dec 2023 16:26:24 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Remove variable ht_info->reg_short_gi_20mhz Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Sun, 10 Dec 2023 07:26:50 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909169479076080 X-GMAIL-MSGID: 1784909169479076080 ht_info->reg_short_gi_20mhz is set to 1 and unchanged. Therefore all equations result accordingly and ht_info->reg_short_gi_20mhz can be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 5 +---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 6556c5df958d..8a4bd389004a 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -97,7 +97,6 @@ struct rt_hi_throughput { u8 cur_bw_40mhz; u8 reg_short_gi_40mhz; u8 cur_short_gi_40mhz; - u8 reg_short_gi_20mhz; u8 cur_short_gi_20mhz; u8 bCurSuppCCK; enum ht_spec_ver ePeerHTSpecVer; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 7acc8b4c11c4..ed9b3db1a393 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -71,7 +71,6 @@ void ht_update_default_setting(struct rtllib_device *ieee) { struct rt_hi_throughput *ht_info = ieee->ht_info; - ht_info->reg_short_gi_20mhz = 1; ht_info->reg_short_gi_40mhz = 1; ht_info->amsdu_max_size = 7935UL; @@ -471,9 +470,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->cur_tx_bw40mhz = ((pPeerHTInfo->RecommemdedTxWidth == 1) ? true : false); - ht_info->cur_short_gi_20mhz = ((ht_info->reg_short_gi_20mhz) ? - ((pPeerHTCap->ShortGI20Mhz == 1) ? - true : false) : false); + ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false); ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ? ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false) : false);