Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp3481870rdb; Sun, 10 Dec 2023 07:26:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IFOkA0OxAZ5T3fwTRYhNiQ49NnwJ9s89wsHTmgp6ZAuIr8kWl2TQ0XLB4YYhrb7h6qzDKTM X-Received: by 2002:a17:90b:1d0d:b0:286:6cc1:3f16 with SMTP id on13-20020a17090b1d0d00b002866cc13f16mr2161856pjb.77.1702222018608; Sun, 10 Dec 2023 07:26:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222018; cv=none; d=google.com; s=arc-20160816; b=h9GsOCuPpk97cIHMvACAWBNDZ+jeWEHqY4jf4VicwgUKzGkbDJ7bCUOSCMwxdCyWyE Zc+gBAIqyahumbiNLh43rEp5M0lCS8m+Bgx+4GUPyyr6FRkbq1Z397yo2azVAk4vhekL A+ZVWM56lmPyhbl2Re51oCt2pelnEgt6pmhKU39jEOXZVrq1uI5cabKtUtRzC6b4ziz4 Xta5PsYvx5Y2EBaLLs/kx//AzlJIW3tVGXUlbROrTOJkrCPWxLqlEyXdkrdWmbPXAMDj dXrqGCxJxC+AWICqEcXrvMVFidsz1Eeo560a/0WJ4++iZHszvrLw2yBsCEi7JEZLIVpn JZHA== 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=fHHEx4HhN/ZzvVnFKWTOzaSwu+z7Yx7t+wmiq/WZcOk=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=H6PYxXNhV38m4zNToscpLXdW4IYQSouF/sqQ08odEwRZAhxk1ZNO19R6wKE9vWQYC0 hVeDCFRUCOIRPrgoshkzmTJMqEi+MoKMlLNW/Q3p+ycXQmYHniYcmGQsyReUrqx//JKi 6GIficMmpdBAwizLJJsaU34XSv6eTMH5+16MR8x+h9Wt7YYm+mMph/3rT9orzBygov9s Py+WU6D6a2hdgYInhfvuYczESiv63FlTHvWRhZGUoohtd2O8FRBLsVeCzSOtEUo0R4cA 5R6+WWQvUphtC/H8mQ+ES0u47y+q3IDBzAn8/J+7H3guE6OZEqAt874s7XDDyOKullCn vJtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZODsqg3M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id st15-20020a17090b1fcf00b00283a18d5662si4856672pjb.80.2023.12.10.07.26.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=ZODsqg3M; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 072648087DE6; Sun, 10 Dec 2023 07:26:56 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232627AbjLJP0S (ORCPT + 99 others); Sun, 10 Dec 2023 10:26:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36336 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232840AbjLJP0Q (ORCPT ); Sun, 10 Dec 2023 10:26:16 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC15E11A for ; Sun, 10 Dec 2023 07:26:21 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40b36e721fcso7375665e9.0 for ; Sun, 10 Dec 2023 07:26:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702221980; x=1702826780; 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=fHHEx4HhN/ZzvVnFKWTOzaSwu+z7Yx7t+wmiq/WZcOk=; b=ZODsqg3MlFhIbYKFa5XC1JS0q8/5t2RhMhP4m8yLUG5QQOPOEBSA9WPQ0P9QztHC52 mUn3OgDWISSt1fd/XwRFg4r6btFaMA2k3mX8G1FSjgAoLfAozHy57idvA/bhRXcAQEBW Go7UQAkcOYV7gpw//d3kwoKB42lOsgC2u1hFOIBzc3K5tnWyY9f+DvLnKTUuR34u1Rc5 QIF3i79O4JRVO+AccUJ/zGajK6ZAflPzaXkrlkgqd/iIrMClVtfRBIpZA+kwwnzoDid8 hpTTvc7v086miYcKqIP2Sg0lpbLE00JZaqRYwpBiwIAFg0EqPcJj7Azid95W6f/Tyu37 AFMg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702221980; x=1702826780; 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=fHHEx4HhN/ZzvVnFKWTOzaSwu+z7Yx7t+wmiq/WZcOk=; b=jc2Zx/5YWKlHZC+l/TgHYX3h0Cn5ia7u+5aeWp7Ih6A+Ph60+WUBTsHvyoft8ZtzMB FYsw6YyV9PkXXi0nvZ+7siPOu6PoNXpkEDbmagXdhdlPrK2jXjaqEuonidupnbmsuI2g AP89vVQ9vKhogEaYiNU0BJf6E3CwuimsMi9xaZ7okc2OJmbi07APEbSEPxatlYLPzJCi QPZiA4D37iN9rA9GyRlnHS5/Wj8kM2DsdpZuSwe1UqPV/RNT/tG7raeL/3hzlhY/oYJB d//9ZvZkbDcfsBFdczfxgcN0k9zgIwiDXe28oYqieQrpDk8mmWE2PTgsf1mqcVC26jqp ksKA== X-Gm-Message-State: AOJu0Yw0jE1so14QwPeVlRBptSyd1xHSFGtxeDvR0vf9BIWOpq3eWxUu 4+X9tP6xonqFo7NVWDZGfkE= X-Received: by 2002:a05:600c:1c86:b0:3fe:d637:7b25 with SMTP id k6-20020a05600c1c8600b003fed6377b25mr4069911wms.0.1702221979935; Sun, 10 Dec 2023 07:26:19 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id jg8-20020a05600ca00800b0040b54335d57sm12141082wmb.17.2023.12.10.07.26.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:19 -0800 (PST) Date: Sun, 10 Dec 2023 16:26:18 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Remove variable ht_info->reg_supp_cck Message-ID: <2c9be9efb1c0608a7fc2658d813b9adbc1185db1.1702212003.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii 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 groat.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 (groat.vger.email [0.0.0.0]); Sun, 10 Dec 2023 07:26:56 -0800 (PST) ht_info->reg_supp_cck is set to 1 and unchanged. Therefore all equations result accordingly and ht_info->reg_supp_cck can be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index bbfdfb79c6f2..6556c5df958d 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -99,7 +99,6 @@ struct rt_hi_throughput { u8 cur_short_gi_40mhz; u8 reg_short_gi_20mhz; u8 cur_short_gi_20mhz; - u8 reg_supp_cck; u8 bCurSuppCCK; enum ht_spec_ver ePeerHTSpecVer; struct ht_capab_ele SelfHTCap; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index f81d9ba9c9f5..7acc8b4c11c4 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -74,8 +74,6 @@ void ht_update_default_setting(struct rtllib_device *ieee) ht_info->reg_short_gi_20mhz = 1; ht_info->reg_short_gi_40mhz = 1; - ht_info->reg_supp_cck = 1; - ht_info->amsdu_max_size = 7935UL; ht_info->amsdu_support = 0; @@ -281,7 +279,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, pCapELE->RxSTBC = 0; pCapELE->DelayBA = 0; pCapELE->MaxAMSDUSize = (MAX_RECEIVE_BUFFER_SIZE >= 7935) ? 1 : 0; - pCapELE->DssCCk = (pHT->reg_supp_cck ? 1 : 0); + pCapELE->DssCCk = 1; pCapELE->PSMP = 0; pCapELE->LSigTxopProtect = 0; @@ -480,9 +478,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false) : false); - ht_info->bCurSuppCCK = ((ht_info->reg_supp_cck) ? - ((pPeerHTCap->DssCCk == 1) ? true : - false) : false); + ht_info->bCurSuppCCK = ((pPeerHTCap->DssCCk == 1) ? true : false); ht_info->bCurrent_AMSDU_Support = ht_info->amsdu_support; -- 2.43.0