From patchwork Wed Dec 13 16:52:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 178183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:3b04:b0:fb:cd0c:d3e with SMTP id c4csp7913842dys; Wed, 13 Dec 2023 08:52:44 -0800 (PST) X-Google-Smtp-Source: AGHT+IEqfG7p7t1AX/O4En7VI5mu6fKg8teCxKMskNmYQOBLss3e28sjIUQooOLqzYZn1Hu97Lan X-Received: by 2002:a05:6e02:154a:b0:35d:5615:9f96 with SMTP id j10-20020a056e02154a00b0035d56159f96mr11680286ilu.29.1702486364239; Wed, 13 Dec 2023 08:52:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702486364; cv=none; d=google.com; s=arc-20160816; b=wiG2sF4nZfSfSr8F/h3Qk8UTsEApIWHBEsBRIwD8dCvO+u0FenxIKm6IyjfEGdKRup wpNhtqj/4G127HYCXPe5J3Ye+xKX+2ijq7AY33UNeTGjYopbRto8u4zofZLjGquejVk4 KHQofbJqv07FgsCXUoQDmkn8d2XuYB9lovTWUyzy/6GZGQZh2sJoKyfhN8MhOBahkpc+ GbnQVy+V0/d6iFYd/E1GfUFCpuBPXG5fWVmGq4iWvoRq7br0vkAp/e2lLywqDTMsm8db J2Sf5ryp0IuqwFwiT9Hvd7W44tWjxea8pAt4y22y6NFNZ92WXIv/2TuRfMPaFsMPaV9K MXKQ== 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=2IeMdk9LkSGFLAKjbTSIgJ9FLE3muXvM3bh5IcmmJy8=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=IRYkcWNQz8fp9EohzHrmMX0owXm64jQQ5zSH0DnWRhmKB+ngeMYP5acAEvMpatbgBo I34+aAHFcsEJ/Pre0erhWuhP6re+LZDBNH8AIrmArsclcES1YXjY2PmccJA5Er61FQ0K L/VimloMvNFqkZ17+bhsGt06a3DSBX4KNEhHLZ4ki0s9R83toBxRZIPVJj/GfZh9A6bU 7dDgnHZPd49mtE8k5Bx/CjOaKBz4E+LUs7zeeGJ0TESNjX8FfwPdCQXZMNJAeaBA00ZL kgf+Tc8JPK0FPaJrEiRWF9f6zTzFeYF/bzI8f5XV3lxNfBj1mB1u9YOxiM6H5pzBVVae 6KFQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hTo1HhDs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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. [23.128.96.36]) by mx.google.com with ESMTPS id w69-20020a638248000000b005c6ed253558si9058083pgd.195.2023.12.13.08.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Dec 2023 08:52:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 as permitted sender) client-ip=23.128.96.36; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=hTo1HhDs; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.36 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 E066A81ADCE4; Wed, 13 Dec 2023 08:52:38 -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 S1379044AbjLMQw3 (ORCPT + 99 others); Wed, 13 Dec 2023 11:52:29 -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-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: 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]); Wed, 13 Dec 2023 08:52:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785186342263296676 X-GMAIL-MSGID: 1785186342263296676 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/rtl8192e/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/rtl8192e/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) ht_info->ampdu_enable = 1; ht_info->ampdu_factor = 2; - ht_info->mpdu_density = 0; ieee->tx_dis_rate_fallback = 0; ieee->tx_use_drv_assinged_rate = 0; @@ -491,8 +490,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) HT_AGG_SIZE_32K); } } - ht_info->current_mpdu_density = max_t(u8, ht_info->mpdu_density, - pPeerHTCap->MPDUDensity); + ht_info->current_mpdu_density = pPeerHTCap->MPDUDensity; if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { ht_info->current_ampdu_enable = false; } @@ -526,7 +524,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->cur_short_gi_20mhz = false; ht_info->cur_short_gi_40mhz = false; - ht_info->current_mpdu_density = ht_info->mpdu_density; + ht_info->current_mpdu_density = 0; ht_info->CurrentAMPDUFactor = ht_info->ampdu_factor; memset((void *)(&ht_info->SelfHTCap), 0,