From nobody Wed Dec 17 00:00:16 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 21691C4167B for ; Sun, 10 Dec 2023 15:26:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232801AbjLJP0L (ORCPT ); Sun, 10 Dec 2023 10:26:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232816AbjLJP0I (ORCPT ); Sun, 10 Dec 2023 10:26:08 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D8599C4 for ; Sun, 10 Dec 2023 07:26:13 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40c2655da63so5702935e9.1 for ; Sun, 10 Dec 2023 07:26:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702221972; x=1702826772; 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=IXZChcAWYyXJ3xwEo34Bj3n8r/lOSA4PWuJHfRPgZ7U=; b=B2Lfq/RiuXh36LmwWl+Xvk9UMq1OIFpOnW4LB4Rn6qLzLTgmdY8TOTtbHn9AFb865T p9IELjOhMO1TILYEKfOnkxjVC0Z2OPJba/H997X69tZvVGsngB0PEF8MwPCY0Le0Ylhz EsmItVlxB/ZGxrsC99ElurTQ9aXIqRLnpbenEC/5HprAIPKElc3j0kYKq6eYrfDq4XDh JxkEotB3J/Jp/E0lxy7w9LUmH5MkekkMADlgWOuN9HHOSIg9IjnF9Gt4KDfCSchakgeX qF2jPgqTXWALigBL+1lJcyZGiKGwZk3OLAEHG6UEHdrnA2tkeQd9E5/22TaaSdAcqjzj tNSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702221972; x=1702826772; 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=IXZChcAWYyXJ3xwEo34Bj3n8r/lOSA4PWuJHfRPgZ7U=; b=SqMglXy/rzspOlszVhehrVjXOWqk2eRC3YVZQcHbTtph2Az8VH41oODWKL2ER4BF32 IruUyhqUicm3qoXYJj6JDSj6HH+k1xfgBoP8k4gm24dqvIQIvgBOBmTXugXPRnLN0Gk0 30kG9arRfUnZQP0UgcEZE27cvDsFpyeIdiueu1JoGR2x1ZEz0B3/wHFPqJA3slcKMMYA hcJKVmriZ75obfdquWRVLvL9X7mXVxj4LU0VWgKbNKfRlUZ1cPI6UNlI8AmCcaIrOYrR dwqz++k4EXPfiRg92zdFTWYHAJcqTnuKH8B81tFOjghV+sTzxz8dB/FyXg3JCg4tPKbk eVaw== X-Gm-Message-State: AOJu0Yw2nPOecG9zdz9KfmZEm/XtQ7ARn2/ed51kLsn2sVehTIhyLtwD hZKhsnyeHQjedd9tkIEi3Yw= X-Google-Smtp-Source: AGHT+IGqLnNPjUYQ+YdfgFxcsr4GPTxHvUrBPwPPACa9RwN6TVPv8JLz4sYFmXnX/YuMpO+AmBVXKg== X-Received: by 2002:a05:600c:35d6:b0:405:358c:ba75 with SMTP id r22-20020a05600c35d600b00405358cba75mr4025647wmq.0.1702221971674; Sun, 10 Dec 2023 07:26:11 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id k40-20020a05600c1ca800b0040b45356b72sm12132495wms.33.2023.12.10.07.26.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:11 -0800 (PST) Date: Sun, 10 Dec 2023 16:26:10 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Remove variable ht_info->reg_bw_40mhz Message-ID: <4ff7afdc2ada8095c95f053381834cea9f5796bf.1702212003.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ht_info->reg_bw_40mhz is set to 1 and unchanged. Therefore all equations result accordingly and ht_info->reg_bw_40mhz can be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 14 +++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index c004020099e3..bbfdfb79c6f2 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -94,7 +94,6 @@ enum ht_aggre_mode { struct rt_hi_throughput { u8 enable_ht; u8 current_ht_support; - u8 reg_bw_40mhz; u8 cur_bw_40mhz; u8 reg_short_gi_40mhz; u8 cur_short_gi_40mhz; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 99626be899fd..f81d9ba9c9f5 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -74,12 +74,7 @@ void ht_update_default_setting(struct rtllib_device *iee= e) ht_info->reg_short_gi_20mhz =3D 1; ht_info->reg_short_gi_40mhz =3D 1; =20 - ht_info->reg_bw_40mhz =3D 1; - - if (ht_info->reg_bw_40mhz) - ht_info->reg_supp_cck =3D 1; - else - ht_info->reg_supp_cck =3D true; + ht_info->reg_supp_cck =3D 1; =20 ht_info->amsdu_max_size =3D 7935UL; ht_info->amsdu_support =3D 0; @@ -275,7 +270,7 @@ void HTConstructCapabilityElement(struct rtllib_device = *ieee, u8 *posHTCap, if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) pCapELE->ChlWidth =3D 0; else - pCapELE->ChlWidth =3D (pHT->reg_bw_40mhz ? 1 : 0); + pCapELE->ChlWidth =3D 1; =20 pCapELE->MimoPwrSave =3D pHT->self_mimo_ps; pCapELE->GreenField =3D 0; @@ -286,7 +281,7 @@ void HTConstructCapabilityElement(struct rtllib_device = *ieee, u8 *posHTCap, pCapELE->RxSTBC =3D 0; pCapELE->DelayBA =3D 0; pCapELE->MaxAMSDUSize =3D (MAX_RECEIVE_BUFFER_SIZE >=3D 7935) ? 1 : 0; - pCapELE->DssCCk =3D ((pHT->reg_bw_40mhz) ? (pHT->reg_supp_cck ? 1 : 0) : = 0); + pCapELE->DssCCk =3D (pHT->reg_supp_cck ? 1 : 0); pCapELE->PSMP =3D 0; pCapELE->LSigTxopProtect =3D 0; =20 @@ -734,9 +729,6 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, { struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - if (!ht_info->reg_bw_40mhz) - return; - if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) bandwidth =3D HT_CHANNEL_WIDTH_20; =20 --=20 2.43.0