From nobody Sun Dec 28 00:44:42 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 70C8EC4332F for ; Wed, 13 Dec 2023 16:51:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379158AbjLMQvd (ORCPT ); Wed, 13 Dec 2023 11:51:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33370 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379162AbjLMQv3 (ORCPT ); Wed, 13 Dec 2023 11:51:29 -0500 Received: from mail-ej1-x636.google.com (mail-ej1-x636.google.com [IPv6:2a00:1450:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D6FC4B9 for ; Wed, 13 Dec 2023 08:51:35 -0800 (PST) Received: by mail-ej1-x636.google.com with SMTP id a640c23a62f3a-a1c6c8d2ecdso190860466b.0 for ; Wed, 13 Dec 2023 08:51:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486294; x=1703091094; 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=1UMQD+xxxwGpCckGrKfQ1npPt/no2ggj6N88c7tmbIE=; b=jPv5m1mTOdTtBwVPiqA2+ibEUT9mxhW5geCFwJH1XBxbQwQHUMtGpX42+Eu50Spn/u 2ql751xICRL7g9F22/QAeddiRnre39Tg+0aMtAW9CxgCKMZkuMiaHHBrk+YMTyY3IsXz aUNG1WoHnFSPe7Kc12SVwOBcC+bvz6/il5Vku9Lq+9ArEodHFFSyQ9dgfHn8B4F+hBRm 2b6x3ElzfcxnuvGI+1FW9RilnZSk7q3qXN+P/P8LRdF8rHBwfjjqcQVcYFxm54tOKc/l Eh0EzZinQaBzbAGpdSbr9o/ykeeQc/0YnCRhGLzhFmDmd7fXwpKg8ng1/Lqz1ySxmD3k lBJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486294; x=1703091094; 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=1UMQD+xxxwGpCckGrKfQ1npPt/no2ggj6N88c7tmbIE=; b=gFRw12h0jNc9SCR8mOKK2xIW7A3zulBYDsLZ6kACLQcGqDnROtzIVO0E6mffnLzBQp 4AIYWNFp9XV9ZGCa/GMLZaUiSflEkF6/WRJcDMj1gSymNe1gtUDUkmFRWZPPjupbQ0i8 JIoYtaXNLPtEJ9Ysjt3WylSxr4z+atDyqnROa/eesuBcTmf2xNOSZQM1Xdlcutjlvo2I iqrCYGmRuHZTsEI3SlJm91LoiW/5mCAerQLKctUtCNNil/aCjLGJGATYpMqeBOxw6MRz oODH0cwiIVRrDDImdXrNH28tM0ngJkDtZepMLCTj9evehuOhSfK+rm+WAlj+I6l7QncV NEdQ== X-Gm-Message-State: AOJu0Yylf7PfZqwz3OQETvGwUVeh6ZlzRDzGHU68vpBRTterCUSpGsew 3kRgMYsZ0vu+HqTs0dB2dWk= X-Google-Smtp-Source: AGHT+IEFCFZ3TSUggaDoIU8TzPXxoQxJJ/nuyOO0ToCi4OsWR6nB8kAy6NYouBZiLkaM4++W/cFoGQ== X-Received: by 2002:a17:907:d404:b0:a01:b8e5:d4b7 with SMTP id vi4-20020a170907d40400b00a01b8e5d4b7mr7922559ejc.1.1702486294303; Wed, 13 Dec 2023 08:51:34 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id ty6-20020a170907c70600b00a1d71c57cb1sm8116418ejc.68.2023.12.13.08.51.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:51:34 -0800 (PST) Date: Wed, 13 Dec 2023 17:51:32 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] staging: rtl8192e: Remove variable bCurrent_AMSDU_Support Message-ID: 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" bCurrent_AMSDU_Support and nCurrent_AMSDU_MaxSize are set but never evaluated. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 2 -- drivers/staging/rtl8192e/rtl819x_HTProc.c | 9 --------- 2 files changed, 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 0f27c820ffc5..bf87106dd784 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -103,8 +103,6 @@ struct rt_hi_throughput { u8 PeerHTInfoBuf[32]; u8 amsdu_support; u16 amsdu_max_size; - u8 bCurrent_AMSDU_Support; - u16 nCurrent_AMSDU_MaxSize; u8 ampdu_enable; u8 current_ampdu_enable; u8 ampdu_factor; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 0197782e0ab6..cb8150137858 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -471,15 +471,8 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->cur_short_gi_20mhz =3D ((pPeerHTCap->ShortGI20Mhz =3D=3D 1) ? tr= ue : false); ht_info->cur_short_gi_40mhz =3D ((pPeerHTCap->ShortGI40Mhz =3D=3D 1) ? tr= ue : false); =20 - ht_info->bCurrent_AMSDU_Support =3D ht_info->amsdu_support; - nMaxAMSDUSize =3D (pPeerHTCap->MaxAMSDUSize =3D=3D 0) ? 3839 : 7935; =20 - if (ht_info->amsdu_max_size > nMaxAMSDUSize) - ht_info->nCurrent_AMSDU_MaxSize =3D nMaxAMSDUSize; - else - ht_info->nCurrent_AMSDU_MaxSize =3D ht_info->amsdu_max_size; - ht_info->current_ampdu_enable =3D ht_info->ampdu_enable; if (ieee->rtllib_ap_sec_type && (ieee->rtllib_ap_sec_type(ieee) & (SEC_ALG_WEP | SEC_ALG_TKIP))) { @@ -547,8 +540,6 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->cur_short_gi_40mhz =3D false; ht_info->forced_short_gi =3D false; =20 - ht_info->bCurrent_AMSDU_Support =3D false; - ht_info->nCurrent_AMSDU_MaxSize =3D ht_info->amsdu_max_size; ht_info->current_mpdu_density =3D ht_info->mpdu_density; ht_info->CurrentAMPDUFactor =3D ht_info->ampdu_factor; =20 --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 2BAE6C4332F for ; Wed, 13 Dec 2023 16:51:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378742AbjLMQvp (ORCPT ); Wed, 13 Dec 2023 11:51:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235180AbjLMQvm (ORCPT ); Wed, 13 Dec 2023 11:51:42 -0500 Received: from mail-lf1-x131.google.com (mail-lf1-x131.google.com [IPv6:2a00:1450:4864:20::131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EE2EB9 for ; Wed, 13 Dec 2023 08:51:49 -0800 (PST) Received: by mail-lf1-x131.google.com with SMTP id 2adb3069b0e04-50c0b80ca9cso1816255e87.0 for ; Wed, 13 Dec 2023 08:51:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486307; x=1703091107; 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=kpLILZybMq8C7TrSiZZZTJ8Dy9Fx0ctVyqk92THT1n4=; b=AWdW/78L0+WuWRd24JrYofK3/xjjTBnWdoBWhigLYscBtH3mw9slY6R3HAUZkNFhm2 MtsO1pUvgXNE6e7DZqRMsmYWirEibE9zplshqwqHS5zNNRgdFJ50LQ/ShWRSFp0S4ODW /G0T2lvdaIj2Vn28rpC0TAe58FwEkwRTYVSPQQUImqULGnlcmtFR9oTLFDMX8/8oOis7 nkY6WbpQC1zlRltO/KA8smqjNIhoFztXw2+1cuswq0HB1gEq91fZVqpizU8fWIVdbqwE MuF3QFETmovexyL3L88uJaLE3bN6Yp2q8tIqhwjBhcvXFrfTObkLxdYou8Yj05cb3ckp 7JVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486307; x=1703091107; 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=kpLILZybMq8C7TrSiZZZTJ8Dy9Fx0ctVyqk92THT1n4=; b=UCxR0BqF73oaoq7EH9LBg8llbB3qhExCVKgK5rF/+QvdZZ/Fp0IQDhEdHDPK+7j/Hj zYkfVSYgywIfq1GPA952cL43nO9s50dUeZOX2HSPBItZk4/t56DJB801WhRXKEOtcL8B LgjrWHKYff+yGDFTT7TPmDX+yiq16TfgYFMDsw1hqFCtZ8giWtn8PxamDe5CUhzAtcvA UuOx9P/77tHRq/ITZrS04E20N1jqU0C+AIQDWyvafklKFoC1U40EYDJZWn11Mn4bmzMv wPg7K1dgVcwjU1zVIwLxK8VHxsZ5CnJbOR9ZGXHBpERJ2wQ1UXVbVjfXnlXynwzO5Bnv XCew== X-Gm-Message-State: AOJu0YyWFIKWWAb+l6ScBu1VdJkBKgOJkUu6UmNRSQHaeHjFCmrUaTf9 0aiEHIw9G+qrHd8HK16Yw+A= X-Google-Smtp-Source: AGHT+IHegFYCIVbFE9geK7mbBeYfgRPIjFQzEeqpn4vOr5F8BpRRP1ziLsP6Pyc0LaeWlqJduRfhrg== X-Received: by 2002:a19:4f0a:0:b0:50c:1bc:33e3 with SMTP id d10-20020a194f0a000000b0050c01bc33e3mr6387897lfb.2.1702486307057; Wed, 13 Dec 2023 08:51:47 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id sk13-20020a170906630d00b00a1d232b39b3sm8172682ejc.145.2023.12.13.08.51.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:51:46 -0800 (PST) Date: Wed, 13 Dec 2023 17:51:45 +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 unused variable nMaxAMSDUSize Message-ID: <4df74fda70535ddbdfc90ba7c98e9d4a773f944d.1702406712.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" Remove unused variables nMaxAMSDUSize and amsdu_max_size. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ---- 2 files changed, 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index bf87106dd784..ff0eb0d01022 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -102,7 +102,6 @@ struct rt_hi_throughput { u8 PeerHTCapBuf[32]; u8 PeerHTInfoBuf[32]; u8 amsdu_support; - u16 amsdu_max_size; u8 ampdu_enable; u8 current_ampdu_enable; u8 ampdu_factor; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index cb8150137858..379934a71f87 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 =3D ieee->ht_info; =20 - ht_info->amsdu_max_size =3D 7935UL; ht_info->amsdu_support =3D 0; =20 ht_info->ampdu_enable =3D 1; @@ -436,7 +435,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee) struct rt_hi_throughput *ht_info =3D ieee->ht_info; struct ht_capab_ele *pPeerHTCap =3D NULL; struct ht_info_ele *pPeerHTInfo =3D NULL; - u16 nMaxAMSDUSize =3D 0; u8 *pMcsFilter =3D NULL; =20 static const u8 EWC11NHTCap[] =3D { 0x00, 0x90, 0x4c, 0x33 }; @@ -471,8 +469,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->cur_short_gi_20mhz =3D ((pPeerHTCap->ShortGI20Mhz =3D=3D 1) ? tr= ue : false); ht_info->cur_short_gi_40mhz =3D ((pPeerHTCap->ShortGI40Mhz =3D=3D 1) ? tr= ue : false); =20 - nMaxAMSDUSize =3D (pPeerHTCap->MaxAMSDUSize =3D=3D 0) ? 3839 : 7935; - ht_info->current_ampdu_enable =3D ht_info->ampdu_enable; if (ieee->rtllib_ap_sec_type && (ieee->rtllib_ap_sec_type(ieee) & (SEC_ALG_WEP | SEC_ALG_TKIP))) { --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 77F9FC4332F for ; Wed, 13 Dec 2023 16:52:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379008AbjLMQv4 (ORCPT ); Wed, 13 Dec 2023 11:51:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60926 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378953AbjLMQvw (ORCPT ); Wed, 13 Dec 2023 11:51:52 -0500 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 962F38E for ; Wed, 13 Dec 2023 08:51:58 -0800 (PST) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-a1c6dad2dd0so223974166b.1 for ; Wed, 13 Dec 2023 08:51:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486317; x=1703091117; 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=eXXlT7BTSZdbME0dg+FI046fx4EL208vm6bp8OzrrlY=; b=hCeeZDLoNdsrCJlJ1KhLdTBsh1JRB5SWGxtnEhqIhVm32BxXu3VAum+PQiSR6tevk7 a7nkU+xJETzbu5oP7MVXtA9FFML398l8NQ+PQ+qZ9PdBG0b5zDsIssMguM/EyGuy/SOG EiL0vQ66l/P5Pf9Tl2FFCUtASEVCdQR1KzwrGyaWIVnXgITQJeWEXyl+Vfffbu8/xkLg jCLDTNpvnEVCB5iYyyjfWoVPun5V2jX8jjPp0NEXAz2xkzCf+b9OqBSUqUZRgYqmyyCn Mrf9x4UMKAxzFa7xmZLfAekeWGoNhXVGEUfCPL9icZie7T+wvEjXyWAHbyBMDZb9qEeS Ff7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486317; x=1703091117; 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=eXXlT7BTSZdbME0dg+FI046fx4EL208vm6bp8OzrrlY=; b=ivGJ3QfYgHvdMC2pB8+Z1q8i+XVIXJ7tMjaJoOJxLuaN7Hm5LqyPs3+aFdmcutNQr5 u0AcHRQUGxvCVPrhqpDPIiY46zQfYVLu2VY7nuQFvrEm1zO9OpcLJalhYQy5eAhDNjzA t/+1n0nLwqTuFz9Bpx2el+WYLHjgFygWXkG/Y3+iudRauWF/5SKR3yF8u3ZC12wU/hLz HxiGUHF0GRuqvnRCVXQ0mNjXw1dztgSSPHvVnIlkS6URkJE5p5IakQSsZBW6LQF9Hiou oJQMGrvrsgfwYQy8YT2/7RlwxgbbD3QEL+vs2hheEzKrOZ039Ya3pBt8SFy9Wn/5p/os IsVQ== X-Gm-Message-State: AOJu0YwtC8vTbT4FRHAw6TVARceQ/2E7mRnQ2Qtlu4EKCUbfapZfxEjU KMa9LNErdx4I0DAVWf1qHa2ckOpb3ZA= X-Google-Smtp-Source: AGHT+IETY7P9GMKjZx9EPgWPbvimebCoDuiRMS5fO6AQLWeVnzPfKMDY1g6Uc1uE0otAlnpuyx6dCQ== X-Received: by 2002:a17:907:a789:b0:9e6:c282:5bd5 with SMTP id vx9-20020a170907a78900b009e6c2825bd5mr8721352ejc.3.1702486317003; Wed, 13 Dec 2023 08:51:57 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id vu8-20020a170907a64800b00a1d5c52d628sm8044926ejc.3.2023.12.13.08.51.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:51:56 -0800 (PST) Date: Wed, 13 Dec 2023 17:51:54 +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 constant variable self_mimo_ps Message-ID: <9e1bec657ddb22eec54e441a4341ddbe4ed7568e.1702406712.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" Remove constant variable self_mimo_ps and replace it at the place of usage with the value. 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/rtl819= 2e/rtl819x_HT.h index ff0eb0d01022..eb2cfeab97d6 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -112,7 +112,6 @@ struct rt_hi_throughput { u8 forced_mpdu_density; u8 forced_short_gi; u8 current_op_mode; - u8 self_mimo_ps; u8 peer_mimo_ps; enum ht_extchnl_offset CurSTAExtChnlOffset; u8 cur_tx_bw40mhz; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 379934a71f87..71d5b6f32869 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -77,9 +77,6 @@ void ht_update_default_setting(struct rtllib_device *ieee) ht_info->ampdu_factor =3D 2; ht_info->mpdu_density =3D 0; =20 - ht_info->self_mimo_ps =3D 3; - if (ht_info->self_mimo_ps =3D=3D 2) - ht_info->self_mimo_ps =3D 3; ieee->tx_dis_rate_fallback =3D 0; ieee->tx_use_drv_assinged_rate =3D 0; =20 @@ -266,7 +263,7 @@ void ht_construct_capability_element(struct rtllib_devi= ce *ieee, u8 *posHTCap, else pCapELE->ChlWidth =3D 1; =20 - pCapELE->MimoPwrSave =3D pHT->self_mimo_ps; + pCapELE->MimoPwrSave =3D 3; pCapELE->GreenField =3D 0; pCapELE->ShortGI20Mhz =3D 1; pCapELE->ShortGI40Mhz =3D 1; --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 5BD35C4167D for ; Wed, 13 Dec 2023 16:52:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379372AbjLMQwH (ORCPT ); Wed, 13 Dec 2023 11:52:07 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379150AbjLMQwD (ORCPT ); Wed, 13 Dec 2023 11:52:03 -0500 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F31F411F for ; Wed, 13 Dec 2023 08:52:07 -0800 (PST) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a1b6524f24fso224797366b.0 for ; Wed, 13 Dec 2023 08:52:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486326; x=1703091126; 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=V24N0myd3yrAHQ5oXdaUpmt08W779GgLxB9a3K2nYC4=; b=d2nKf6dS5cUG0Y036FOb4keqBk+nOAgSgRWxLQp9w9zZ2k8S+KZGjOFotfbc6Dyowi OcEbRLqtXDdIqBrtQH4uLFezolRulKsFH2CiWV0HdEvTrziDiSFZgs8LeGWMm0wQZ4h6 AyBx56cKhtl9l2KzpF5p7EPvhlYaD2y0jv3jfnwG464LNXgo3gfS1zowgYMrzQUnLdSv IXw2WbEA16enI1CY1uv8LozqS7Agj8shLkaeCA3QUv2VnIugDMTIk8P33dTIfMrgy3Dd iWdCm014Hhr2L0NaSQfjPSqZvqst8nuhM+hZFsJEzn6m7MYttk23SSQMViaGtHZifq6l UZHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486326; x=1703091126; 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=V24N0myd3yrAHQ5oXdaUpmt08W779GgLxB9a3K2nYC4=; b=NaTGfa8G6YsftBh9lVkQevvyRKlXbltcTcfPXOHD0hhdsm+iEVJJNVHHJmCuKE+Wfj d23lltncdIEWFVyUgIcHDpGzvzQvLnLw0WqGfQjy9+R/twpPFB9SRw/5tdTZttx3vb3a HSLdXx+cmiQQv9/a6yxCQRD5FcFeioG4l6Ouup6r8tluWa+IzZRqMuEUR2wdyAzt8Tbu UZ6q+aX7mMtKbTCNVrbj5WnIn/rfOTjR1U5IMB4v/xBvMtJJe6bdHxDk21dUCoq1WpB+ 0N2esg3yknuGOqAU5ty69WucEPTEbwRdnKkOvJw1nIc0BY8a3GsRvwYkHoJyF0WWf11A 1eGg== X-Gm-Message-State: AOJu0Yzt7Ym5Ocw/v6eycOWG5WSAEgPbHrm2fon9v0JroCeClMJB37k3 52LGx4a5j/xsUFOIn48nPYE= X-Google-Smtp-Source: AGHT+IGRBQ0A+eaO9nkYVYRpK2dgpNPQhl+tc8bFjCGMjWcg5m3VG4en0D8a54eiU15YIN64PYsPhg== X-Received: by 2002:a17:907:c705:b0:9cf:7c60:47b9 with SMTP id ty5-20020a170907c70500b009cf7c6047b9mr8673247ejc.1.1702486326023; Wed, 13 Dec 2023 08:52:06 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id tb19-20020a1709078b9300b00a1cd30d06d1sm8245382ejc.14.2023.12.13.08.52.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:52:05 -0800 (PST) Date: Wed, 13 Dec 2023 17:52:04 +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 constant variable peer_mimo_ps Message-ID: <7b2ccccde769133db9365c693fdd0c42e9dc75f9.1702406712.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" MimoPwrSave is set to 3 and not changed. peer_mimo_ps is set to MimoPwrSave and not changed. All evaluations of peer_mimo_ps with 0 will have a constant result and can be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 +---- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +----- 3 files changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index e6d51abd0d01..763ecaad6652 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1753,10 +1753,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) ratr_value &=3D 0x00000FF7; break; case WIRELESS_MODE_N_24G: - if (ieee->ht_info->peer_mimo_ps =3D=3D 0) - ratr_value &=3D 0x0007F007; - else - ratr_value &=3D 0x000FF007; + ratr_value &=3D 0x000FF007; break; default: break; diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index eb2cfeab97d6..43472b2250c2 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -112,7 +112,6 @@ struct rt_hi_throughput { u8 forced_mpdu_density; u8 forced_short_gi; u8 current_op_mode; - u8 peer_mimo_ps; enum ht_extchnl_offset CurSTAExtChnlOffset; u8 cur_tx_bw40mhz; u8 sw_bw_in_progress; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 71d5b6f32869..d424b7729a01 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -507,11 +507,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) =20 HTFilterMCSRate(ieee, pPeerHTCap->MCS, ieee->dot11ht_oper_rate_set); =20 - ht_info->peer_mimo_ps =3D pPeerHTCap->MimoPwrSave; - if (ht_info->peer_mimo_ps =3D=3D MIMO_PS_STATIC) - pMcsFilter =3D MCS_FILTER_1SS; - else - pMcsFilter =3D MCS_FILTER_ALL; + pMcsFilter =3D MCS_FILTER_ALL; ieee->HTHighestOperaRate =3D HTGetHighestMCSRate(ieee, ieee->dot11ht_oper_rate_set, pMcsFilter); --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 4B2F4C4332F for ; Wed, 13 Dec 2023 16:52:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235338AbjLMQwQ (ORCPT ); Wed, 13 Dec 2023 11:52:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378960AbjLMQwJ (ORCPT ); Wed, 13 Dec 2023 11:52:09 -0500 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9FC0CB9 for ; Wed, 13 Dec 2023 08:52:15 -0800 (PST) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-54cea1f30cbso1538180a12.1 for ; Wed, 13 Dec 2023 08:52:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486334; x=1703091134; 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=hcU4d4c9EhwDhCpZ+xb05RdkC86nsBALUhVrkSRZ1Dw=; b=TI9tH/ipcl9K7i14cVskk3TqvSimXxuaFFvLRYrJur6UzVjkBXbJ/ocMHfspeLjTX6 9Gj7GUZeU22Rr4yPGiSKGFE55rYw090pVwcqUag4202Ik+yzSXpwtgsBRhjmjkfx6sCL LXn4UyKGgl9H0fxvhQyJhdUikLmQ+u/s8AqDjNHx2A6qMPUzEzXi055BawstDcU3Ma6B +RkP0ijaCVmXbiQgqjvhtvc9hRTDUmyYEpbbdw/QnEzWUOf/KYHh3hRKDbpnNlx/HBGy nBojjgRg5f9HNna0GhEXYetMtp63BkTVeDr+9JruaDVn9kCK+hXnPIWxdJgUrTQ5E1lE YG6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486334; x=1703091134; 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=hcU4d4c9EhwDhCpZ+xb05RdkC86nsBALUhVrkSRZ1Dw=; b=J9GydbKMHIvve7FQWk5KbwMEQMT60mdz/lreKYkyQGaaYeloD/TNCY4+e1j1lzUjPu nf9bK5KHB08QxcrR2Wn8WwwC8pDy6hF3JhzBA7C8Vqil1weFrxcifYJbX+Iv9KK+yfns KLMRciL/hzxbIMEp5KeBak1LQ6apO5cm5lKZxYpOlkQ1Lz9d54lDudGgRGoCV02jFJcH +EmZxSFh+zQ3rfCypRSNo9GtxeHYF8j/RpEyB9MC4EoPZe4zpAiNeCKHumokNOd3KZ5P wmoo/SgaJZFZ4/tI9o7rGQDkAvOIR+s/CgNwfhs/7kit9EToxPEWbSUF4nmh27N5ST02 Nyyw== X-Gm-Message-State: AOJu0YxsbtNpG2MVMYlvphnExPdHQZlXloP4+eRR1M/mALvSygL55aBG vCyHXevkBbVT0nwHGdZoYMaDLLktAtM= X-Google-Smtp-Source: AGHT+IGZz7paThhCvZZNDmg/Imt9mXY25GH+sKlIoSMkzIKOa6mluYu0N+JMxL26diY7xzifU3KH4g== X-Received: by 2002:a50:c189:0:b0:54c:6fc0:483a with SMTP id m9-20020a50c189000000b0054c6fc0483amr8757847edf.2.1702486334020; Wed, 13 Dec 2023 08:52:14 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id v1-20020a50d581000000b00550ce74f7eesm4994896edi.67.2023.12.13.08.52.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:52:13 -0800 (PST) Date: Wed, 13 Dec 2023 17:52:12 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Remove constant variable forced_short_gi Message-ID: 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->forced_short_gi is set to 0 and unchanged. Therefore all equations result accordingly and ht_info->forced_short_gi can be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 1 - drivers/staging/rtl8192e/rtllib_tx.c | 5 ----- 3 files changed, 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 43472b2250c2..e6cd906dc0ac 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -110,7 +110,6 @@ struct rt_hi_throughput { u8 current_mpdu_density; u8 forced_ampdu_factor; u8 forced_mpdu_density; - u8 forced_short_gi; u8 current_op_mode; enum ht_extchnl_offset CurSTAExtChnlOffset; u8 cur_tx_bw40mhz; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index d424b7729a01..578d9276035f 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -527,7 +527,6 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) =20 ht_info->cur_short_gi_20mhz =3D false; ht_info->cur_short_gi_40mhz =3D false; - ht_info->forced_short_gi =3D false; =20 ht_info->current_mpdu_density =3D ht_info->mpdu_density; ht_info->CurrentAMPDUFactor =3D ht_info->ampdu_factor; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 0fa6f674a844..f7098a2ba8b0 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -340,11 +340,6 @@ static void rtllib_query_HTCapShortGI(struct rtllib_de= vice *ieee, if (!ht_info->current_ht_support || !ht_info->enable_ht) return; =20 - if (ht_info->forced_short_gi) { - tcb_desc->bUseShortGI =3D true; - return; - } - if (ht_info->cur_bw_40mhz && ht_info->cur_short_gi_40mhz) tcb_desc->bUseShortGI =3D true; else if (!ht_info->cur_bw_40mhz && ht_info->cur_short_gi_20mhz) --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 226EDC4332F for ; Wed, 13 Dec 2023 16:52:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235350AbjLMQwZ (ORCPT ); Wed, 13 Dec 2023 11:52:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35364 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235378AbjLMQwT (ORCPT ); Wed, 13 Dec 2023 11:52:19 -0500 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12FE810E for ; Wed, 13 Dec 2023 08:52:25 -0800 (PST) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-a1e25a49603so189659366b.1 for ; Wed, 13 Dec 2023 08:52:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486343; x=1703091143; 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=QcuM1B7Nqln2T8HsY+RDMt6vNuKyn/uBt6HB0cu06wE=; b=Bo/Jm7I1UxvaGeTwhVprkKb/JgtwOY2NbyN616u264wzR5MJVJxYxBfzZqbcDF6pHT r/ul0+GykSmrBWC2/C172pn994C45eoMD68eIons2RV1U4s1XVP9hAhhKXSL1WGxTBMi ooDX17sNjvxBZJtDmm+NyC9YurzSDWHmrph5ktupJkaqTjooK1aH7naMtSApgA+WzAiJ r948V+dI6M5hH8QpcJyXGaHvPJo1jV7c3shBwl0nBn8svBKLSdtHwQZjjPl7B3mVeW+H 5nhSu6wO9N1roDCE9L9gceKVjz2k2v+xGc/zpb7PDZiGflPMazgO9V5TNnnFJwne43UU k5Yg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486343; x=1703091143; 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=QcuM1B7Nqln2T8HsY+RDMt6vNuKyn/uBt6HB0cu06wE=; b=a04mhCepd+pBc970HHeLqUz+CSn4PdYrMQlrEnR4FAne1T5M52vOiqzaG9hmAiUxQl 2rCU0On9JKuDUHIHSH99aK/VTHuS3O84DdZQSC3c/GYTDtFBu6Bs+XHb2K8FuwsDxOrO xzigfkmFQOfm0rzEkaGilrlgiyR9C7CZGPxQK1kldfgi+UrpG55EZxnJA6MOUtLRVJXz d/qNfPtxAqeap26yeCVyP98La/33bIS7Fd4u3gwiHpPZAbhqEX45sXyZcRhG8aT+jqPf 1QnV7kkKXngtS9ssQytGWeKqSNPozODglon2LSqoZTTRjMJgC+docSzDusWHLOqjXomo RzgQ== X-Gm-Message-State: AOJu0YxiVNMk6mmH/HEo4zmIRuktG0cj/95MnGP+VP6OAfnFmQB0gQ9K 2FLKMIF54bglT4374TmOMBo= X-Google-Smtp-Source: AGHT+IHnnv5a7KagUWLWUtnXmhAJTELjZR68Rq07jNtKxvCUpjdfOeyNLnO8XgZA84eeMOocpuA34g== X-Received: by 2002:a17:907:a70f:b0:a00:211c:9a9a with SMTP id vw15-20020a170907a70f00b00a00211c9a9amr9176973ejc.5.1702486343268; Wed, 13 Dec 2023 08:52:23 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id tb19-20020a1709078b9300b00a1cd30d06d1sm8245901ejc.14.2023.12.13.08.52.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:52:23 -0800 (PST) Date: Wed, 13 Dec 2023 17:52:21 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] staging: rtl8192e: Remove unused variable ht_info->amsdu_support Message-ID: 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" Remove unused variable ht_info->amsdu_support. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index e6cd906dc0ac..c4af9968cd67 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -101,7 +101,6 @@ struct rt_hi_throughput { struct ht_capab_ele SelfHTCap; u8 PeerHTCapBuf[32]; u8 PeerHTInfoBuf[32]; - u8 amsdu_support; u8 ampdu_enable; u8 current_ampdu_enable; u8 ampdu_factor; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 578d9276035f..044bfe44d213 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -71,8 +71,6 @@ void ht_update_default_setting(struct rtllib_device *ieee) { struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - ht_info->amsdu_support =3D 0; - ht_info->ampdu_enable =3D 1; ht_info->ampdu_factor =3D 2; ht_info->mpdu_density =3D 0; --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 35255C4332F for ; Wed, 13 Dec 2023 16:52:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378717AbjLMQwa (ORCPT ); Wed, 13 Dec 2023 11:52:30 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37674 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378146AbjLMQw0 (ORCPT ); Wed, 13 Dec 2023 11:52:26 -0500 Received: from mail-ed1-x533.google.com (mail-ed1-x533.google.com [IPv6:2a00:1450:4864:20::533]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 74B51F4 for ; Wed, 13 Dec 2023 08:52:32 -0800 (PST) Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5491de618b2so1627638a12.1 for ; Wed, 13 Dec 2023 08:52:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486351; x=1703091151; 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=2IeMdk9LkSGFLAKjbTSIgJ9FLE3muXvM3bh5IcmmJy8=; b=hTo1HhDsotyiKIvlriNQYAd2mSHToBHan+Oox+MucmmLRvHdtFpEiXjDvdg3XFo6Cb 8d8QFS+mbWESZESgh7BovEzQf6qzL8l5VV4knlEF+924xxNh6IUfkRIBR/0ffhIZIP0k MdQhdd7g+tgrDwbWvJiOm2XvmMoncolETLvW9OC/29SqFi58PN9DB3jFd7eX/VuqeoZi CWiefqzcKt9WpJYGUbGCGsp1vI+ZXVimZKTyXyiXZo+xjOZNDEf7El7KnxQw7XPnfKph 8aWLfFSaVKwjV0CszzZVCXdi/GvQHT/gMjakvXyPlXX4ftG2OyoAdUx9arTmSZGCdnkr 9TJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486351; x=1703091151; 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=2IeMdk9LkSGFLAKjbTSIgJ9FLE3muXvM3bh5IcmmJy8=; b=S3VsVqHcruYTsAzErVoGbxj53CV26wubOFXXMq9iMaoAckI1hkBrBtHnQGYS8h1MFG KtP5ksEfOU3TIdSrB2kaNUT4qeKPwKZ0AO1ld0rVsBzpShiiIGwTVzCGI/hOX0DqPI00 YBA52SXcDSYSmyIgidoSP+iYO5/HGeWNzo0IeW0w5yBdwu87wpJ0Lc3aiN8xeA25UhBs hA1IRp6FRlmv7t4F2Z7miKMTVgNVncPbtlCOqfNUCGPlUoTIkEXFOxe0K7MLyKjxtrYQ A1hxHyQPTOa/Zbb73/gldmExfm3D7KqI7Cr199/CxO8dnF7W7H71iSAOhm7VU5pkbgFG HX2g== X-Gm-Message-State: AOJu0Yx8E/UD1VIsW5et8rjd6iULFZgct9ZNVUvkrt4upFOSjJxcIihP Eduda9rrNnnwt6CjhpLHhH0= X-Google-Smtp-Source: AGHT+IGPNcU/50+hpUoQHnLv+AQkC9dE9Per50QuyKsJ715hk2aPjYYa8YscJtrZq1mrdXJf93xumw== X-Received: by 2002:a17:907:c003:b0:a1d:6d:1392 with SMTP id ss3-20020a170907c00300b00a1d006d1392mr9509922ejc.1.1702486350900; Wed, 13 Dec 2023 08:52:30 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id ul5-20020a170907ca8500b00a1fa7e39957sm4417134ejc.136.2023.12.13.08.52.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:52:30 -0800 (PST) Date: Wed, 13 Dec 2023 17:52:29 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] staging: rtl8192e: Remove variable ht_info->mpdu_density Message-ID: 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->mpdu_density is set to 0 and unchanged. Therefore all equations result accordingly and ht_info->forced_short_gi can be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 ++---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index c4af9968cd67..1da56f1c04eb 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -105,7 +105,6 @@ struct rt_hi_throughput { u8 current_ampdu_enable; u8 ampdu_factor; u8 CurrentAMPDUFactor; - u8 mpdu_density; u8 current_mpdu_density; u8 forced_ampdu_factor; u8 forced_mpdu_density; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 044bfe44d213..14e6f46a65ed 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -73,7 +73,6 @@ void ht_update_default_setting(struct rtllib_device *ieee) =20 ht_info->ampdu_enable =3D 1; ht_info->ampdu_factor =3D 2; - ht_info->mpdu_density =3D 0; =20 ieee->tx_dis_rate_fallback =3D 0; ieee->tx_use_drv_assinged_rate =3D 0; @@ -491,8 +490,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) HT_AGG_SIZE_32K); } } - ht_info->current_mpdu_density =3D max_t(u8, ht_info->mpdu_density, - pPeerHTCap->MPDUDensity); + ht_info->current_mpdu_density =3D pPeerHTCap->MPDUDensity; if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { ht_info->current_ampdu_enable =3D false; } @@ -526,7 +524,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->cur_short_gi_20mhz =3D false; ht_info->cur_short_gi_40mhz =3D false; =20 - ht_info->current_mpdu_density =3D ht_info->mpdu_density; + ht_info->current_mpdu_density =3D 0; ht_info->CurrentAMPDUFactor =3D ht_info->ampdu_factor; =20 memset((void *)(&ht_info->SelfHTCap), 0, --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 7AEC1C4332F for ; Wed, 13 Dec 2023 16:52:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379175AbjLMQwm (ORCPT ); Wed, 13 Dec 2023 11:52:42 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37786 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1378146AbjLMQwh (ORCPT ); Wed, 13 Dec 2023 11:52:37 -0500 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 20367112 for ; Wed, 13 Dec 2023 08:52:42 -0800 (PST) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-551e19beb35so309869a12.0 for ; Wed, 13 Dec 2023 08:52:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486360; x=1703091160; 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=QpGgf4XklN8es0KYbSGNNm5QQAnGIuhX/jA7OD+Idx8=; b=JyTER3Xcx09Fxzd3f3IDJYzmcmB+LSCPFuBDGR018QLniZuoIGbOPl9sG72gABeMXy WkN/RG628x3hTo9bS6e7TCNaSRWZ7F5YzEIWnBtOgbybnyzJSmBYCTPLECIljycIIqdu lyPUKnmX22JUEPLDVBMvNvfFLrTWn+pWezJe3rZP5odI9aHFMNPVUzvL8LvdZKMfD+1n gOqZFTPQ8drYEfwaotRkP1Hin7MgYHoz+tgqmi96Bmb0eKUVgOZ9D+IjauKjOhwucT17 /omU/uQV/oy9RqMzyK1mT1ksgHvZN0m0VVxLkKbC4AeK10M0QwcM6j8G5dX5YPgT9we1 fQ3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486360; x=1703091160; 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=QpGgf4XklN8es0KYbSGNNm5QQAnGIuhX/jA7OD+Idx8=; b=jHvlJyHnjh35wM6ymoLKA/gXrBpB4HJm95qxurrZxi/jYFxC0isusI8gS727/cwbau B0p1ReWGMbnN3U6d7HtkCNkSbyQfbWiUJojg3FCo92m2kxDYZQ44CrdpTP1sMH3LvCiu lzJe4lqfBMnahcEfvkcZCePp6ARiwSeawpeyofL6fzAuCmzvUjsxL2YEMlJ2s5Fme3tj upe+nGoySU+XoEtOb5ptjfTiPpj2dTj66NE2vOEKjoYie7gUEAH5bOBPZVFu5H7vkE62 4DKF4nqZcY+3GzeQIfR6ofnpcYc4d6+OvY9i/PYNw345ap8J348n4lN0mXXHiyxjetEG RbAw== X-Gm-Message-State: AOJu0Yyu+4dDW1aqd/Xtj7T5CmSlHLRzwVCnFZpy3QvhItW14EloZBPk Qff+wbvrmaQwotKqxFcTxneQb1gp0p8= X-Google-Smtp-Source: AGHT+IEPaoMNNeCr5kGtxS+NwpcCbGmmQ8u4TTb5xnRZH/gXRuLX9rjNxxBjeloggYEEAJl4I944OQ== X-Received: by 2002:a50:bae9:0:b0:552:6202:41e1 with SMTP id x96-20020a50bae9000000b00552620241e1mr31473ede.1.1702486360316; Wed, 13 Dec 2023 08:52:40 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id l12-20020a50cbcc000000b0054b53aacd86sm5771950edi.65.2023.12.13.08.52.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:52:40 -0800 (PST) Date: Wed, 13 Dec 2023 17:52:38 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Remove variable ht_info->RT2RT_HT_Mode Message-ID: 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" Remove variable ht_info->RT2RT_HT_Mode as it is always set but never evaluated. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ---- 3 files changed, 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 72e89ccfb184..bef042233117 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -287,7 +287,6 @@ static void _rtl92e_update_beacon(void *data) if (ieee->ht_info->current_ht_support) HT_update_self_and_peer_setting(ieee, net); ieee->ht_info->current_rt2rt_long_slot_time =3D net->bssht.bd_rt2rt_long_= slot_time; - ieee->ht_info->RT2RT_HT_Mode =3D net->bssht.rt2rt_ht_mode; _rtl92e_update_cap(dev, net->capability); } =20 diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 1da56f1c04eb..315905fa4b2c 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -113,7 +113,6 @@ struct rt_hi_throughput { u8 cur_tx_bw40mhz; u8 sw_bw_in_progress; u8 reg_rt2rt_aggregation; - u8 RT2RT_HT_Mode; u8 current_rt2rt_aggregation; u8 current_rt2rt_long_slot_time; u8 sz_rt2rt_agg_buf[10]; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 14e6f46a65ed..6bd4afe32f61 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -540,7 +540,6 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) =20 ht_info->current_rt2rt_aggregation =3D false; ht_info->current_rt2rt_long_slot_time =3D false; - ht_info->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; =20 ht_info->iot_peer =3D 0; ht_info->iot_action =3D 0; @@ -601,11 +600,9 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devic= e *ieee, pNetwork->bssht.bd_rt2rt_aggregation; ht_info->current_rt2rt_long_slot_time =3D pNetwork->bssht.bd_rt2rt_long_slot_time; - ht_info->RT2RT_HT_Mode =3D pNetwork->bssht.rt2rt_ht_mode; } else { ht_info->current_rt2rt_aggregation =3D false; ht_info->current_rt2rt_long_slot_time =3D false; - ht_info->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; } =20 ht_iot_peer_determine(ieee); @@ -621,7 +618,6 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device= *ieee, ht_info->current_ht_support =3D false; ht_info->current_rt2rt_aggregation =3D false; ht_info->current_rt2rt_long_slot_time =3D false; - ht_info->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; =20 ht_info->iot_action =3D 0; ht_info->iot_ra_func =3D 0; --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 D8AFDC4332F for ; Wed, 13 Dec 2023 16:52:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1379325AbjLMQws (ORCPT ); Wed, 13 Dec 2023 11:52:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47034 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379184AbjLMQwo (ORCPT ); Wed, 13 Dec 2023 11:52:44 -0500 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4D363D0 for ; Wed, 13 Dec 2023 08:52:50 -0800 (PST) Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-5451faa3aa7so1635178a12.0 for ; Wed, 13 Dec 2023 08:52:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486369; x=1703091169; 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=QsDC6cnDlhoPFsKvfa+aFC6albQxgKIcluRdn1hA6pw=; b=g4+ZpjuZ2koMAqeky0luxE2LWKELD/4DIonZsw5FCaBMY/ZonRB8K10LmA/g5FvX6W TJpMWX8WIZP2a9eBOu3+yCNqzuGAehAb/2RR6KocVkkJ34tTLxhTX4uC/Alat0ZL+/wL t9PpVJZ2YxrRjPmtGcuT9AABzVozH+ME28WFYW3Pk+sDXBJ267EzymnfpCqAJYQMzxKy ACi3UzrQo2gxiORR735L5eNeN4rCfRv1CK275O5KAa2REeK9unIYswnPzoSu1jA6yhrh s0Z0l0GrPNODn8qZFRK6m+GQiuAfEcbLyZILIFZhUM5gjcBE8glQj8k7iz/mzXEy0qj/ s6OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486369; x=1703091169; 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=QsDC6cnDlhoPFsKvfa+aFC6albQxgKIcluRdn1hA6pw=; b=PO/4YOBc4s8TZ6WLr6qyTfz5OSMMyVjn3mMnXB4x12c3QN+XdoBc2XRIQW3ydc/KTB ZHSMaR55R6UDLQdAzhYFkMy3gHN+QDBOVFi6cl/TezNo+/lsqALvvve5x18LzhMjwb0P 9DfodmNkWnVyCHbMuUF+0UkEDFIwp2CJ9qWyvRbt3syCQRqMegJa5VxMA5mQHF2Kwqj4 XY4ktSvcCL2LOv+W49UIcFy9UeZ7EvMskL7FKty+O/JJmo9IDIfwAnjCTygtndfZhIAC zv/VDrS6USxNQG1eiljKvynLQyqcDFCqDKpWOTNpm1t8Gl856K1MqyUNLJgtHuTj6Jpl GlpA== X-Gm-Message-State: AOJu0YypQP5hhGE6DuB6tD05hFUrO3aeC6BK455ii5bGyk00LV1ZjmMw ueZ5RERsQs/iVvUUAfEN3Sw= X-Google-Smtp-Source: AGHT+IGiLZB6J8iZW9hDz38oOTk+lx19cmC2hpUGX8EXkOEEpEKEYPXqrJS9OR/tvG214l7oaDTRuw== X-Received: by 2002:a17:907:d30a:b0:a1d:65d:c1b1 with SMTP id vg10-20020a170907d30a00b00a1d065dc1b1mr8031014ejc.2.1702486368388; Wed, 13 Dec 2023 08:52:48 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id cx12-20020a170907168c00b00a1caa9dd507sm8111138ejd.52.2023.12.13.08.52.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:52:48 -0800 (PST) Date: Wed, 13 Dec 2023 17:52:46 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Remove constant variable reg_rt2rt_aggregation Message-ID: <07a0954cc6fd730d9d42054fa36346d1de07cd06.1702406712.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_rt2rt_aggregation is set to 1 and unchanged. Therefore all equations result accordingly and ht_info->reg_rt2rt_aggregation can be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 37 +++++++---------------- 2 files changed, 11 insertions(+), 27 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 315905fa4b2c..514ac9e1f3f8 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -112,7 +112,6 @@ struct rt_hi_throughput { enum ht_extchnl_offset CurSTAExtChnlOffset; u8 cur_tx_bw40mhz; u8 sw_bw_in_progress; - u8 reg_rt2rt_aggregation; u8 current_rt2rt_aggregation; u8 current_rt2rt_long_slot_time; u8 sz_rt2rt_agg_buf[10]; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 6bd4afe32f61..d9561e3a76d6 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -79,8 +79,6 @@ void ht_update_default_setting(struct rtllib_device *ieee) =20 ieee->tx_enable_fw_calc_dur =3D 1; =20 - ht_info->reg_rt2rt_aggregation =3D 1; - ht_info->reg_rx_reorder_enable =3D 1; ht_info->rx_reorder_win_size =3D 64; ht_info->rx_reorder_pending_time =3D 30; @@ -471,25 +469,17 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->current_ampdu_enable =3D false; } =20 - if (!ht_info->reg_rt2rt_aggregation) { - if (ht_info->ampdu_factor > pPeerHTCap->MaxRxAMPDUFactor) + if (ieee->current_network.bssht.bd_rt2rt_aggregation) { + if (ieee->pairwise_key_type !=3D KEY_TYPE_NA) ht_info->CurrentAMPDUFactor =3D - pPeerHTCap->MaxRxAMPDUFactor; + pPeerHTCap->MaxRxAMPDUFactor; else - ht_info->CurrentAMPDUFactor =3D ht_info->ampdu_factor; - + ht_info->CurrentAMPDUFactor =3D HT_AGG_SIZE_64K; } else { - if (ieee->current_network.bssht.bd_rt2rt_aggregation) { - if (ieee->pairwise_key_type !=3D KEY_TYPE_NA) - ht_info->CurrentAMPDUFactor =3D - pPeerHTCap->MaxRxAMPDUFactor; - else - ht_info->CurrentAMPDUFactor =3D HT_AGG_SIZE_64K; - } else { - ht_info->CurrentAMPDUFactor =3D min_t(u32, pPeerHTCap->MaxRxAMPDUFactor, - HT_AGG_SIZE_32K); - } + ht_info->CurrentAMPDUFactor =3D min_t(u32, pPeerHTCap->MaxRxAMPDUFactor, + HT_AGG_SIZE_32K); } + ht_info->current_mpdu_density =3D pPeerHTCap->MPDUDensity; if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { ht_info->current_ampdu_enable =3D false; @@ -595,15 +585,10 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devi= ce *ieee, pNetwork->bssht.bd_ht_info_buf, pNetwork->bssht.bd_ht_info_len); =20 - if (ht_info->reg_rt2rt_aggregation) { - ht_info->current_rt2rt_aggregation =3D - pNetwork->bssht.bd_rt2rt_aggregation; - ht_info->current_rt2rt_long_slot_time =3D - pNetwork->bssht.bd_rt2rt_long_slot_time; - } else { - ht_info->current_rt2rt_aggregation =3D false; - ht_info->current_rt2rt_long_slot_time =3D false; - } + ht_info->current_rt2rt_aggregation =3D + pNetwork->bssht.bd_rt2rt_aggregation; + ht_info->current_rt2rt_long_slot_time =3D + pNetwork->bssht.bd_rt2rt_long_slot_time; =20 ht_iot_peer_determine(ieee); =20 --=20 2.43.0 From nobody Sun Dec 28 00:44:42 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 39F2EC4332F for ; Wed, 13 Dec 2023 16:53:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229600AbjLMQw7 (ORCPT ); Wed, 13 Dec 2023 11:52:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58136 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235424AbjLMQww (ORCPT ); Wed, 13 Dec 2023 11:52:52 -0500 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72D63B9 for ; Wed, 13 Dec 2023 08:52:58 -0800 (PST) Received: by mail-ed1-x536.google.com with SMTP id 4fb4d7f45d1cf-54ce02c1ba2so1600332a12.0 for ; Wed, 13 Dec 2023 08:52:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702486377; x=1703091177; 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=FS9s22OYVyAuBMFkyAlKFllCNEacvvjLW0t9zMiOW0M=; b=fw3kWsCypVk/cIonioXU38WAc6Hyng7TE4DZs2KXNyNIb9NxGe/Jhsq0hiSkoSvU+C AcxddEGYWj9tl1CCetylXwjnLDigE3Rp98g7EZ7GrKGrEVtnEu8khFKcwxeV+CBl/3Xq 1eiszfl8qptEgrLKP2Ql5FQ9DXvf3sWLUOmIj8HH6KFxh27lBb2VIUrwSzFSfdfjkGrd GVnaJrGPCLThDtwN5WZTgfEX7uRfKwaVKBWaBglDvsp7UImue+mwCkWWVTDG4dGeJ+ET j00oYpYfB14VC1f7qljKXBr0EWlaAOptyFVeVkbyj9e4zX/u+XZh+CBLp+094gvZ4/p2 iPug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702486377; x=1703091177; 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=FS9s22OYVyAuBMFkyAlKFllCNEacvvjLW0t9zMiOW0M=; b=qIDnURJ87UYKpwlXPY32ST6eR2CkRqDot/9ndysN/TEymGxOGAk42QQesNRmxlxSBQ lDzyd6Kq/yBj45Ueta0rSCSAdUAvUZkvUqbRLslBLcSyIqnSKoZVVckBK68r7EbMd26/ Qj4zTd7fM0ap+w7Jh+p/tb7RhJF1Letssqyr+1pxTI/YpNwBQ2GCtUIXoCTtQBAj1KZk 1gdYXiHLkdBMLF5eQWBuO0bmNoFX1rljCOZ4i8y2wmPjSmYiztzsdjYMOl4SolXUdbQI 518FN/lP48pp3ZqXVY0hA0dCoahZpiZQOEZy3KIcy4fDZfY5Rzc1N3q/R/wi7zTt3jGG fRdQ== X-Gm-Message-State: AOJu0YzpOD4nU7yS2v9QmoV7K9MAOX0XBKHquD6xyO6Dnct2KJrwcLyV g87pqJitlS7n6NEu5Tkyr4Y= X-Google-Smtp-Source: AGHT+IFIApYKM+gx1pkJmp4hu81yddktS+De8kLLlF1vuNbUK4n3HX+NC4tp8rIIgO/t5SqJueGYeQ== X-Received: by 2002:a17:906:99cf:b0:a1c:5944:29bb with SMTP id s15-20020a17090699cf00b00a1c594429bbmr9082964ejn.7.1702486376863; Wed, 13 Dec 2023 08:52:56 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id sa16-20020a1709076d1000b00a1da72b8752sm8047775ejc.212.2023.12.13.08.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:52:56 -0800 (PST) Date: Wed, 13 Dec 2023 17:52:55 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Remove constant variable reg_rx_reorder_enable Message-ID: 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" Remove constant variable reg_rx_reorder_enable and replace it at the place of usage with the value. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 514ac9e1f3f8..2911ea82dd17 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -115,7 +115,6 @@ struct rt_hi_throughput { u8 current_rt2rt_aggregation; u8 current_rt2rt_long_slot_time; u8 sz_rt2rt_agg_buf[10]; - u8 reg_rx_reorder_enable; u8 cur_rx_reorder_enable; u8 rx_reorder_win_size; u8 rx_reorder_pending_time; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index d9561e3a76d6..00bf5c706157 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -79,7 +79,6 @@ void ht_update_default_setting(struct rtllib_device *ieee) =20 ieee->tx_enable_fw_calc_dur =3D 1; =20 - ht_info->reg_rx_reorder_enable =3D 1; ht_info->rx_reorder_win_size =3D 64; ht_info->rx_reorder_pending_time =3D 30; } @@ -484,7 +483,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { ht_info->current_ampdu_enable =3D false; } - ht_info->cur_rx_reorder_enable =3D ht_info->reg_rx_reorder_enable; + ht_info->cur_rx_reorder_enable =3D 1; =20 if (pPeerHTCap->MCS[0] =3D=3D 0) pPeerHTCap->MCS[0] =3D 0xff; --=20 2.43.0