From patchwork Sun Dec 10 15:25:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176351 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6569926vqy; Sun, 10 Dec 2023 07:26:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IFceELPpXkmqPHbHa0rwU8JuZ6Scc7ItbSYs3op5arI9ddMLO4odXL+aBSar8WgglIitNBx X-Received: by 2002:a17:902:7d8a:b0:1d0:9471:808d with SMTP id a10-20020a1709027d8a00b001d09471808dmr2713004plm.93.1702221994357; Sun, 10 Dec 2023 07:26:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702221994; cv=none; d=google.com; s=arc-20160816; b=p4TMJ+vgyUGusHGCLaSafK5HtPM/T82Wu74Ymi96qaYhzo8tEu7V7lY84Ebc4w1QV/ HpPYEFLO62H98ZCjXTbwyvktAR8nisP5jZ3TYFLKJ5yW8UBvxCMLG/p2hj+7cek1dqAC H4hsrpKErFqQssKGHJKtQjpCMKOzeOM9GNMBXE16gFhlz628U9cxtDLcokyFrjtr7cT7 jsr8Jof7zTtmBd6VRIO7tmAhnU/BrM2g33JRh9iRkP7yGrUQKU5Bwneory3H/dFqzG8O la1kTpzJXtMkbMFpN5hr3mOYBLBQgffbm+OgjNNt9oKyW0YM5ysuJy1H3pQErkkoBAWM vSDA== 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=1HxTpgRZMqUaasDK2SQoows7vTW70XnRViyUroMPu9U=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=cGUa7rjUvklLFOPXhF/QfitnrQjj/RgizBSdUnOh5NxXRj5iypzLXjABy7t7buamtt rGr7V5VMcZWXFbfaQMMYaYj2gwr+BWSkVdLIE3c9f9pxe1A5JyH+kL8pW9CrW3+4Q4Gu 88WTe1ACOKYYTE+o+PAyPzrW2TKOdNsU2mjPh4JkxhY2IZerlolcjR3moHPn23fNWgxg d/aWSxPrz5YFU7+hQ9ayIpxVY8d267bsZ0BQPTFOHEQ6YIuLtIYn27f4b8TaPJr7FrON mFniVb8P3/LjqdLKZ0XAYVg5CcoZzfFD/Of21luLR2f6tUZw89OsQ767F0Vs+fEwWUtT cfbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=njlxZ3SV; 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id e23-20020a170902ed9700b001cfd2c5ae92si4644935plj.521.2023.12.10.07.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:34 -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=njlxZ3SV; 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 7D3F1808723D; Sun, 10 Dec 2023 07:26:31 -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 S232608AbjLJPZ7 (ORCPT + 99 others); Sun, 10 Dec 2023 10:25:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53660 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232822AbjLJPZz (ORCPT ); Sun, 10 Dec 2023 10:25:55 -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 6F251C4 for ; Sun, 10 Dec 2023 07:26:01 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40b36e721fcso7374855e9.0 for ; Sun, 10 Dec 2023 07:26:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702221960; x=1702826760; 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=1HxTpgRZMqUaasDK2SQoows7vTW70XnRViyUroMPu9U=; b=njlxZ3SVKMNr1PdGKRq/wNtb7vSLaJi3Nnj53UeSUVtse+LfNEI6Vxk0o5CTD8imtK aeLuHEOvi1GxsKG+upcscV6q2oHdR2Jl2oOPQDC8nxo2u3UDh6FR2WXD1n8yCJDPDa7b p+SGSee5JblKivTt7/1Jihs6qCEgPQtkfPLCqPwdLb/FLkFnrumjhBJqAP6r1d1ERHu1 qiY6vraehAgz8hhKsOLR8OyCzqMBMca8uxtq96bMvxf0TFxF2KVla3Mbchms0dsqmfpJ 929hRwQpvQ66BMpZKtc8/ZK+lMZCXJkM3CRTmXUIZgLDvq9e4dfGzJqq+9zEsBNrOX46 jFTg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702221960; x=1702826760; 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=1HxTpgRZMqUaasDK2SQoows7vTW70XnRViyUroMPu9U=; b=pTJPD/xpLw4zbY3q7I8TmMnjRsGgQ1/RoXr8Xe4iLT2uSQ/8lFdGp4sh1I473q+s4S zsVc6WYd6n3osqWWwR2nDwT/hEASSruBCCDytyXYuNRav7P1nrsk0bAXQpCJOSkEFLM3 9f1F88oFhBpxz5ANZDocDQ5dlf0Tb2pyXIdWRW2DKxGcAJMjfT+UKqgmLOxDb/18xag+ PaPMnw7UgV+i63oj7cB2b3ePSnmrMss2oDqKzeVYBmjbU12y6SKNSeuZDPkKOdJ6RTqS fpMCe5PIpnbkcxa3dVUQfhYY/BZDVeJPa1EjYVDWv8dggjcQg+4rY8BtMh41uSK7+GOD 6pxw== X-Gm-Message-State: AOJu0YzYuhNDEo8STBy0op3LHJC9kZLWHdYK8fG3fSbKmt04SW7GnmH4 00s8LJh4KGkyyWq6UkZnlvU= X-Received: by 2002:a05:600c:511a:b0:40b:516a:3856 with SMTP id o26-20020a05600c511a00b0040b516a3856mr4029610wms.1.1702221959852; Sun, 10 Dec 2023 07:25:59 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id fc17-20020a05600c525100b0040c42681fcesm3080228wmb.15.2023.12.10.07.25.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:25:59 -0800 (PST) Date: Sun, 10 Dec 2023 16:25:58 +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 unused struct iw_range_with_scan_capa Message-ID: <8b4532b8739ca0baa9fa7c736dab68130510ffe8.1702212003.git.philipp.g.hortmann@gmail.com> 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 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:31 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909129815148287 X-GMAIL-MSGID: 1784909129815148287 Remove unused struct iw_range_with_scan_capa. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c index 4371ab1239ee..4c884c5277f9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -158,28 +158,6 @@ static int _rtl92e_wx_set_mode(struct net_device *dev, return ret; } -struct iw_range_with_scan_capa { - /* Informative stuff (to choose between different interface) */ - __u32 throughput; /* To give an idea... */ - /* In theory this value should be the maximum benchmarked - * TCP/IP throughput, because with most of these devices the - * bit rate is meaningless (overhead an co) to estimate how - * fast the connection will go and pick the fastest one. - * I suggest people to play with Netperf or any benchmark... - */ - - /* NWID (or domain id) */ - __u32 min_nwid; /* Minimal NWID we are able to set */ - __u32 max_nwid; /* Maximal NWID we are able to set */ - - /* Old Frequency (backward compat - moved lower ) */ - __u16 old_num_channels; - __u8 old_num_frequency; - - /* Scan capabilities */ - __u8 scan_capa; -}; - static int _rtl92e_wx_get_range(struct net_device *dev, struct iw_request_info *info, union iwreq_data *wrqu, char *extra) From patchwork Sun Dec 10 15:26:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176352 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570022vqy; Sun, 10 Dec 2023 07:26:48 -0800 (PST) X-Google-Smtp-Source: AGHT+IH7J7greqKKwp6z3GiliAqVaeROd9q1T62E2mxVz5Vq5VGoDVrtr3wvvHYqNfM78aFuVgIM X-Received: by 2002:a17:902:ab0b:b0:1ce:9a59:da29 with SMTP id ik11-20020a170902ab0b00b001ce9a59da29mr1385319plb.5.1702222007903; Sun, 10 Dec 2023 07:26:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222007; cv=none; d=google.com; s=arc-20160816; b=deOUDEhTGS25XxUtjp65rx7J/jemUFIKnyd7zA0XFLP4UnSkzdUizrKrQRn1wOOLpC 1yGMj93qNVcTSi/mKajOnHJoov3NsDVDmiE4RFZ3IezdRFwi4fmPpCAv9wce1u6tj1/s wTw7555DA5TnudkA5cGJtKyAbGwQqtKSuZOD8SYyZEmayWc5jQiFwQBogdHHWST8qbHH s+rpuENCcIxwK/f1aqT+Yp3+Ud6MAtPlH6gkdBKx3C5QSsJiJkTmOkyZKoqo2rMA5UGy xgWUfR/dQZs7iOPniMlTxRi2Z51faZs3RVSvP2zQpOg9K8FBCPQcrKW/703qBJ1V5cqn TfHw== 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=IXZChcAWYyXJ3xwEo34Bj3n8r/lOSA4PWuJHfRPgZ7U=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=g1Jqw4D95dbkGpPkXFQk5VHnfxxIV80ZVMaNeP/0XYG8////ZOyAa1B8jRr0vn+5ZN 4RK6whQw/tTXD6Br07hmaUkhavwntNqibzsymrYqvry20rfECsDWTq/ucClrInIXxkbb RiTChJXpgOE06V4gUr6Eaooilxp2ARRU35LlwOlpWByckOEpsXc9UQBXJLNt7uBRyh+1 TZBptZl21P/aY/UCAhQSlbT0qk9Gdy338WxG5Tj3+1876KTznml62Wa815Qxq/1cu8mF gcOEugodfKg48MT9eg8aAel3H106yX+dwORjvS/wBV4LBB7ji7V4PRFiDi+ZkzYMVuhT cydw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="B2Lfq/Ri"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id m5-20020a170902db0500b001d015cec684si4892656plx.238.2023.12.10.07.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b="B2Lfq/Ri"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 23AA68087DE1; Sun, 10 Dec 2023 07:26:45 -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 S232631AbjLJP0L (ORCPT + 99 others); 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-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: 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:45 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909144151383591 X-GMAIL-MSGID: 1784909144151383591 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/rtl8192e/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/rtl8192e/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 *ieee) ht_info->reg_short_gi_20mhz = 1; ht_info->reg_short_gi_40mhz = 1; - ht_info->reg_bw_40mhz = 1; - - if (ht_info->reg_bw_40mhz) - ht_info->reg_supp_cck = 1; - else - ht_info->reg_supp_cck = true; + ht_info->reg_supp_cck = 1; ht_info->amsdu_max_size = 7935UL; ht_info->amsdu_support = 0; @@ -275,7 +270,7 @@ void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) pCapELE->ChlWidth = 0; else - pCapELE->ChlWidth = (pHT->reg_bw_40mhz ? 1 : 0); + pCapELE->ChlWidth = 1; pCapELE->MimoPwrSave = pHT->self_mimo_ps; pCapELE->GreenField = 0; @@ -286,7 +281,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_bw_40mhz) ? (pHT->reg_supp_cck ? 1 : 0) : 0); + pCapELE->DssCCk = (pHT->reg_supp_cck ? 1 : 0); pCapELE->PSMP = 0; pCapELE->LSigTxopProtect = 0; @@ -734,9 +729,6 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, { struct rt_hi_throughput *ht_info = ieee->ht_info; - if (!ht_info->reg_bw_40mhz) - return; - if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) bandwidth = HT_CHANNEL_WIDTH_20; From patchwork Sun Dec 10 15:26:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176354 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570074vqy; Sun, 10 Dec 2023 07:26:55 -0800 (PST) X-Google-Smtp-Source: AGHT+IGa/qTb/2YyHFI8bGXqzmq5cV2Hs/u+rEofSNxGr4vOfdBKN0czbJC7ZsUQ4D6DIhzDTsoQ X-Received: by 2002:a05:6a00:a85:b0:6ce:2731:e863 with SMTP id b5-20020a056a000a8500b006ce2731e863mr3757213pfl.42.1702222014740; Sun, 10 Dec 2023 07:26:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222014; cv=none; d=google.com; s=arc-20160816; b=hEawLcs2oXGzmbvkBpCoyTP8QSwhEGkPiRCXBhDBIWFXIf+PF7DPSVcBygm0jsvy8z ewsMx55JMiuShFmf1wnPZNV1R1oF3h8GfdF3lELYd5VCZhUZ+ICeHB7Xtn3H53ZUupDN EW5Z133Z2qW+nC8JGWh0MKGhSzHtn6n0ervGZ4Q+t+QECjPHBEh+6zu6dCZfszCPkl1e BQfhRx361YBeD+QWAiMcfrlXFgOEWUubpVcNL5QYgbh/E7QnlncaCdYPms50FPL04nIB xsBJ023UNl4Dg7eiVoV1sZuWTlP/jA4yibcflO+Aod7Q/SmOqsjSJLYzyqWuUjuv14tt iRsA== 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 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id g26-20020aa7875a000000b006ce7afb03absi4591532pfo.131.2023.12.10.07.26.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; 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 2620:137:e000::3:5 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 0311C8087DE6; Sun, 10 Dec 2023 07:26:52 -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-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:52 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909151522176553 X-GMAIL-MSGID: 1784909151522176553 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; 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); From patchwork Sun Dec 10 15:26:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176353 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570071vqy; Sun, 10 Dec 2023 07:26:54 -0800 (PST) X-Google-Smtp-Source: AGHT+IGILnsewU83eXapuhMe8rL7zL9Ekf3SHdXM55QKOZ+7lZnoiajnqfaiUmwbBhtc/uEcy3qE X-Received: by 2002:a05:6808:f91:b0:3b8:b063:5d65 with SMTP id o17-20020a0568080f9100b003b8b0635d65mr3580644oiw.76.1702222014287; Sun, 10 Dec 2023 07:26:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222014; cv=none; d=google.com; s=arc-20160816; b=dt44R+V7SV4GT9GJiOewK8BotMSURZAqWQM5sxBCeixAuq0z8gHGmPFtSU3hHcI3o0 axI6g/MFKfCZr8bxZzG4KzKi01WxmIFGOOsPeU0RNFeSqgyfd67eQPIRX4NS/Z95byUT zUEo5+AhoqktPZRWyqKIKPg/Xvm3XdAatk8v8WxBM+elY+sTgXyT30rcSkslY3pgFAe3 DxQT5FeRblV4oBORbcWlvcdAMjb+vau3lMgW6pGY6o0Hc16eNnIatO9d4Y8KHUXYbKQ3 Sk/h8mnPQJIscfS2c2ZAw2h4MyhF/NHV61UofuOjvRvW8ZdWR4MXtTLIBeSmb7W6jN+Y sLvQ== 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=5+7aTaTlcaG6uppnc5wOD9WJR1BJWGY5PIIBacZp7LI=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=0iLbjeKlNX/zwXC6ggveyDMjVGQhbrx9bfhTgr3G3CBSAskLZF5poiIwZB9ajbcv6T TxjBSgkEB8p36Zwk6LLo1h3TnQvh6SPvwz74misngkdYeymzfohijqGpYbS1wtlhkDFt XbqZyoMeTm86qJcoAzbhFovTKnTReReuQWT7eqo5QJK5pJleuW4WkE3o+86nWKZydoyl N4xwa2iEaQ3XOh6tJ+dcrGn78F5mbF2HhTtEmBY4BgQcxXRYYTNj9gxrnsH8W13hOro3 7hBczSS6O6jhu5tR7nW3OoarLBFApMonZbK1K1Yh4OgafqWPmBPPGy049TYuASj19PJ9 9vjQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WOxgdIfG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (lipwig.vger.email. [2620:137:e000::3:3]) by mx.google.com with ESMTPS id q7-20020a056a00084700b006cb7f9ddbd5si4632582pfk.321.2023.12.10.07.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 as permitted sender) client-ip=2620:137:e000::3:3; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=WOxgdIfG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:3 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 lipwig.vger.email (Postfix) with ESMTP id 0C3C58070E10; Sun, 10 Dec 2023 07:26:52 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232898AbjLJP0j (ORCPT + 99 others); Sun, 10 Dec 2023 10:26:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231903AbjLJP0a (ORCPT ); Sun, 10 Dec 2023 10:26:30 -0500 Received: from mail-wm1-x334.google.com (mail-wm1-x334.google.com [IPv6:2a00:1450:4864:20::334]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 77D5710D0 for ; Sun, 10 Dec 2023 07:26:33 -0800 (PST) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-40c362efc2dso3854425e9.0 for ; Sun, 10 Dec 2023 07:26:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702221992; x=1702826792; 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=5+7aTaTlcaG6uppnc5wOD9WJR1BJWGY5PIIBacZp7LI=; b=WOxgdIfGRv7Q11C6VCTzuAgfaJtWtOeRpNpmUuHrMxoxPako2hKkc0PqJa2ZSmFXmS 10grmo42pPTQsWNtA0gh/gpg65Ve6udGBcYDft7/1vQGBmUyLv+5dWpNPUMgjALXeSsV Dr24Exh3zBExv3q8NINOCU+25l1xwQjYf7enDsnBJRPRMr9SpwPR8FTH/uHooaP1q3Wf bcnK2OKBi/MJMI2sWiSE5H8/aickmrfXK2IJu9Yh3yRZxs1o842Oz+E+5YC2BiNhWTMZ pawD7JuEwLAFxIcKsmCKDwSHk+AnWw1/3RbNA4kziq3dIk4e8/DNPNMzfLF7VbvN5/ge 3nfg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702221992; x=1702826792; 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=5+7aTaTlcaG6uppnc5wOD9WJR1BJWGY5PIIBacZp7LI=; b=fbUZvKFn2kwhldgQDMkxheaGnlYYiuZ6m6/tyDdP5PJk41KXcMAwg3Hf4u1Ithqy+E KfvgnPqSxz6b0K9B4MxNCBXzmelAb9QwcWOosHqkQ3caQLCKpa53RFyEifbiR6Bd3v+D vY7eU7o0Slo/dkrDnkN/FGCNEXF52zIvAom3YMNo7VZ0Lt7ZN8VmuNQgzQBQ5rxGfobO stLGtS1y6pzXewDHy680W+qvwE6yXNrGOY2Br4btHWPs67l/a+40zMV2hCsHMq2FQJ+W GH9bsgIdh4bNholasg5FePg1+g0sHKEho4wH8AnNKFBueSbSDOXY/dBi6skUoW/Ad/dT oMJw== X-Gm-Message-State: AOJu0YyguWhUvRno2z99hScA8wxTqfJwyZS4GTghW5tZsLcgevFqz+pf oS6klEYS/wbBlBMLh0JwZJs= X-Received: by 2002:a05:600c:35d6:b0:405:358c:ba75 with SMTP id r22-20020a05600c35d600b00405358cba75mr4026078wmq.0.1702221991724; Sun, 10 Dec 2023 07:26:31 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id o3-20020a05600c4fc300b004042dbb8925sm12148980wmq.38.2023.12.10.07.26.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:31 -0800 (PST) Date: Sun, 10 Dec 2023 16:26:30 +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 variable ht_info->reg_short_gi_40mhz Message-ID: <255039e0cb27582a98a0b86340dfe88f14c08a76.1702212003.git.philipp.g.hortmann@gmail.com> 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 lipwig.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 (lipwig.vger.email [0.0.0.0]); Sun, 10 Dec 2023 07:26:52 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909150507143592 X-GMAIL-MSGID: 1784909150507143592 ht_info->reg_short_gi_40mhz is set to 1 and unchanged. Therefore all equations result accordingly and ht_info->reg_short_gi_40mhz 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, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 8a4bd389004a..0664eb86bada 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -95,7 +95,6 @@ struct rt_hi_throughput { u8 enable_ht; u8 current_ht_support; u8 cur_bw_40mhz; - u8 reg_short_gi_40mhz; u8 cur_short_gi_40mhz; u8 cur_short_gi_20mhz; u8 bCurSuppCCK; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index ed9b3db1a393..0a5885d6c0a0 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 = ieee->ht_info; - ht_info->reg_short_gi_40mhz = 1; - ht_info->amsdu_max_size = 7935UL; ht_info->amsdu_support = 0; @@ -471,9 +469,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) true : 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); + ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false); ht_info->bCurSuppCCK = ((pPeerHTCap->DssCCk == 1) ? true : false); From patchwork Sun Dec 10 15:26:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176359 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570415vqy; Sun, 10 Dec 2023 07:27:46 -0800 (PST) X-Google-Smtp-Source: AGHT+IGqNwisbW0VHyU2xUCC+OEm/t1hWyReRYgAiRx9CNr3mNLzIPSlH2lLG8P8eqwkv4JZOe+4 X-Received: by 2002:a17:902:7e8f:b0:1d1:cd7f:5424 with SMTP id z15-20020a1709027e8f00b001d1cd7f5424mr3163751pla.19.1702222065785; Sun, 10 Dec 2023 07:27:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222065; cv=none; d=google.com; s=arc-20160816; b=0bE19xR6uJVb3wkQAD1ir2nAf0m2xcKUZ6sAYBf2/DQg1Zc28mhLqhE4SpGKbJKO/b p0Tr7m5FZKOBy9R4/7EIHBUXspWnv1qTu4ng7nPeV2qA5bGKAHQkLtIEeNU52HJJ4GBD XvB1FfhjTrDK2LOITVupAC9H27TIeBIhJBO+JThfGjPNJp/K+VJrPhVkCpOVULL3tZlM BGSYF53/eZs+z9tteEc5chOsOlsYDmXvjWIlErBQ+OZ2l1P5Xkad0odaOl5LeyAqFAQQ hmzRC12RZdH5x64ymXCnbB7Ybd0+/BQWG9HkTtTg4bgPQ91GunTN5HKtRdv3c9jPCly4 JiWg== 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=x27vCUpD2eYMWgYKl63p6rruFTypQyGCnQHgn4PVIcE=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=KX6BGT/K5q0tBhCsujED6T2B+ugtJS3d6i36bjL7HNVbiplpTqfiZlXeC+ZGttCegz 6ALDG4DorqS3dB3WwBJ432AmAPxLeMP5cx9tdCOoO/oiTjptXVvLJaxx5biKhiowN4C8 CM0i0ia2lzMTRM0xEnCDpi63EuaezKe9wrUfFnV3Hx+8MZl5NQ8iVXf/NlZGni0o3D2J T8vIjnxaOl4MRUpG0QUNGfsdjfsQLJweYj2UHikrOxLDmO+9Cyt0VmKRpCMSazDn297h WRL/MGNlkRG1PG55fyhqQljrIK1UZWaMzmSd97MQG4uArvGRY1WoCY30OIjDcInI917Q FF9A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eO7wJzrP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id r2-20020a170902be0200b001d0cbef2eeesi4697783pls.71.2023.12.10.07.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:27:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=eO7wJzrP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 A4C06807C55B; Sun, 10 Dec 2023 07:27:07 -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 S232986AbjLJP0x (ORCPT + 99 others); Sun, 10 Dec 2023 10:26:53 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58550 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233038AbjLJP0i (ORCPT ); Sun, 10 Dec 2023 10:26:38 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 98E6C106 for ; Sun, 10 Dec 2023 07:26:41 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40c2d50c0adso6103485e9.1 for ; Sun, 10 Dec 2023 07:26:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702222000; x=1702826800; 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=x27vCUpD2eYMWgYKl63p6rruFTypQyGCnQHgn4PVIcE=; b=eO7wJzrPDX0s6bLCjO0+wCr0LEqwKFUoqohd6qD3mcaB3jinTLWbGPoiDVIc5X2TNw XUn7ugqqP75Yv4C2euChXFB///cr6SnPJWp12vd35z2joZ3y+U8wvFiLF+kDVgJfLDhk PlWZipQQyQn203ORovJ7hr1VPBonKIwbjj+tGNjshbldW45VQ0EzWd7jE/40Gow/SJDm qUpEOjyO0s8wj/vzc/Zpz6HcZ9GKHrvkyPeoopySW+0yppDtS/E1E2TwWeK0eaFMmhJ7 lfLgosEnkMTDOSg09TObXNHtAvwC6+7tSSnaL57zS7+w4jD16P90zrqyuGPVTLbrBAfw WwOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702222000; x=1702826800; 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=x27vCUpD2eYMWgYKl63p6rruFTypQyGCnQHgn4PVIcE=; b=Rsk9PXtQHL9LkDTS6XT93ydWTcQbKsn3w61Fi7so/Wmzeq68mnusOKm6mmKQnFjqKv 8P3YOaUouR2/cr3wtdRaj8jTwC0/spJUqvEOpBYAr3QrW2t5YwrT7hDgzFAo/Zl4uyUr dXVr+2Vh35Ly3+LU/xpU8J+OAqzCcFaTImam/6ED/LItIcPDONsq/aZ4xZUabXDE41QL Igv28cvQN//4+QPEPNhRVNmrVcHd4SfucifLePYBv6unxUceAn+TQidvd5Z3VEzRFj0z VvSeX+kupN1x/vfxBDUUNOH04KHzUwtV8Xw2aadiW8hjejXCztENIU7PE3U5kLDS76sd CbNQ== X-Gm-Message-State: AOJu0Yz1r/y8lCEWjr4HB7SVD2XmktMBv7daDmCsPA8C/KY7Z6M+Ki7+ e5nfzt3QfxS/sKzh0ILfiaig7bkMiDc= X-Received: by 2002:a05:6000:4026:b0:333:50f2:5757 with SMTP id cp38-20020a056000402600b0033350f25757mr3500662wrb.5.1702221999797; Sun, 10 Dec 2023 07:26:39 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id g9-20020a5d4889000000b0033609584b9dsm6265939wrq.74.2023.12.10.07.26.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:39 -0800 (PST) Date: Sun, 10 Dec 2023 16:26:38 +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 variable ForcedAMPDUMode Message-ID: <5bf740a2da78ec3b54249a30cbee70301b37e7eb.1702212003.git.philipp.g.hortmann@gmail.com> 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 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:27:07 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909205218104496 X-GMAIL-MSGID: 1784909205218104496 ForcedAMPDUMode is set to 0 and unchanged. Therefore all equations result accordingly and ForcedAMPDUMode can be removed. As a result label FORCED_AGG_SETTING is unused and can be removed as well. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtllib_tx.c | 21 ++------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 0664eb86bada..d249062e7b66 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -113,7 +113,6 @@ struct rt_hi_throughput { u8 CurrentAMPDUFactor; u8 mpdu_density; u8 current_mpdu_density; - enum ht_aggre_mode ForcedAMPDUMode; u8 forced_ampdu_factor; u8 forced_mpdu_density; enum ht_aggre_mode ForcedAMSDUMode; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index a2ae68cc13f5..0fa6f674a844 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -303,13 +303,13 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, } else if (!ts->disable_add_ba) { TsStartAddBaProcess(ieee, ts); } - goto FORCED_AGG_SETTING; + return; } else if (!ts->using_ba) { if (SN_LESS(ts->tx_admitted_ba_record.ba_start_seq_ctrl.field.seq_num, (ts->tx_cur_seq + 1) % 4096)) ts->using_ba = true; else - goto FORCED_AGG_SETTING; + return; } if (ieee->iw_mode == IW_MODE_INFRA) { tcb_desc->ampdu_enable = true; @@ -317,23 +317,6 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, tcb_desc->ampdu_density = ht_info->current_mpdu_density; } } -FORCED_AGG_SETTING: - switch (ht_info->ForcedAMPDUMode) { - case HT_AGG_AUTO: - break; - - case HT_AGG_FORCE_ENABLE: - tcb_desc->ampdu_enable = true; - tcb_desc->ampdu_density = ht_info->forced_mpdu_density; - tcb_desc->ampdu_factor = ht_info->forced_ampdu_factor; - break; - - case HT_AGG_FORCE_DISABLE: - tcb_desc->ampdu_enable = false; - tcb_desc->ampdu_density = 0; - tcb_desc->ampdu_factor = 0; - break; - } } static void rtllib_query_ShortPreambleMode(struct rtllib_device *ieee, From patchwork Sun Dec 10 15:26:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176356 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570200vqy; Sun, 10 Dec 2023 07:27:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IGlHE9o/VFuHOD011Qlr9yqLrItjTyZlKRV6YkIlWr339GSINputpKT6kUzTNsbYZtdXkT9 X-Received: by 2002:a17:90b:1989:b0:286:6cc1:5fc4 with SMTP id mv9-20020a17090b198900b002866cc15fc4mr1332122pjb.71.1702222035107; Sun, 10 Dec 2023 07:27:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222035; cv=none; d=google.com; s=arc-20160816; b=q/CNdl8g7igkSs/sfwarYLTXltMuEF1yATN7rw0Bn1wZypDiC0KkOxsIE4oh3ubLpu TbqVD0GAWvN1203imcQqDM4bsKyTNhXtQToTwOO4TyeKSvFeYv01+JDHhsRlucEfY7w6 /o5tMWOxt3mpFTalTjFKxqXjERHRfUQ4xhQh7tdMJIODrCgukrmHGX+eD+P6yS9CXjao 9qnc57ryNx3iBfb+gcymW6Yc9Z0fhdfRh2pBFdxXCJnoXzqx642UI59aNEaJMAzyugo1 bkoXvjAKLJyg9EJ1RcU4VRfYnZPeXz+dg+p702Bi6GficrBsJQ9FmxlLKjga9XM6w+fs jeYw== 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=W1A/KEgyt6f82zEHVyS55QzynSt7PFOs4Ej8iQWUE3o=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=0WZOv8X+cGklSKVSXdjyCkwNsXnxGP861wc9ZjfdHfhu314baMDguYTRgax84dPYdW 8WxWKU3kTCJXyy7/YiA26doUh4Ng7ih7kbnsbRqeZgwO9rIJn40TJJWaEyiAAg+/9DWf u7UGLcBwytRCEwPckjUeBxWD+l5EzGWt+kHSSbpjq/IKZ8kst4ViaUXZ2stV6D5UP00l Wg6SB/Oh5lCliw031aPSHw5m6hUAUMWjlkkXKGCllsDTgp8tTF3eCR/zlHLny44Oz3fw feqAvx2W2wb5qHa41lWliyMM5OnJtd659kpJ38g348Z7p9P7Mel8Xp/sQYJtuCMNsaLF rVfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=fm4V0PNe; 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 hg19-20020a17090b301300b00285259acbcesi4770636pjb.142.2023.12.10.07.27.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:27:15 -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=fm4V0PNe; 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 2CA35805161C; Sun, 10 Dec 2023 07:27:08 -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 S232608AbjLJP07 (ORCPT + 99 others); Sun, 10 Dec 2023 10:26:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233150AbjLJP0m (ORCPT ); Sun, 10 Dec 2023 10:26:42 -0500 Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 421A7193 for ; Sun, 10 Dec 2023 07:26:48 -0800 (PST) Received: by mail-wm1-x330.google.com with SMTP id 5b1f17b1804b1-40c192f488cso5991535e9.1 for ; Sun, 10 Dec 2023 07:26:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702222006; x=1702826806; 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=W1A/KEgyt6f82zEHVyS55QzynSt7PFOs4Ej8iQWUE3o=; b=fm4V0PNeZ/AF2JECUxMGN7RSPUbZjr8VwGvRjjS2H3wjWNQUZFSYmJSfB9IHG4opdY 6cX6qb7c1VRfkvu72S21g1DpYgd4PdvTcVEoXa/VYkJfRGiLcd8vadPv0KDMy9EZXKHh KdxfhRDIKSE8pVoUEGurul15mdk1KGutiumY150mpqOwWlaj16Q7W9CJumXfPv6nHQDO LBGhtQdtx05iHmhNRO2gXPy7JQgrc9y4TEU7PwNhA/gYjuv0/x9rhI3EptApt58r/0Hj gz82ZHB6JaXaBgf+01Y1kSKmaCPUDOGmpMiMclRz6YCG/cnQZNfryii2WSA995g4/7NB MDrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702222006; x=1702826806; 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=W1A/KEgyt6f82zEHVyS55QzynSt7PFOs4Ej8iQWUE3o=; b=RjtbjpoC0NwPI0MADrIzvpLX0vbIu4qqVo8kUx/R5M+FqoYlkN02yz+heHFd62fNgl 0gvU4rkG7HZMVGri+wzRR3tAOopvkeN5YnX87LZkc4o3sL3RaMme33giyFiSTYmWUup0 wEwyRZomjSMY9Cme0PbOWD6ynUa4Kdqyof2/KkxqgGHA7bRYSQWsRj82MH13Z+XMuRNp K6c17LK5N7j4cBiu4RlunT6KsmDIVlRRZ0o+PmD7R9NAy0b/u/Z2iUkKDnqlDgPwmvjz OoxzoHwGvphRLGbuyCdR80w+2lEAWcDhFvje20jnnOJod0zi0oV2WL8jm4EDZxLUPCSN //ZQ== X-Gm-Message-State: AOJu0Yw9ZfaHTbZbAykyMTpwORWpVJQv1Z93WE4uBuuRQXAeCXT2WTeQ a72VItg5xvfQBYmM6tuFcfY= X-Received: by 2002:a05:600c:524e:b0:40b:2708:2a52 with SMTP id fc14-20020a05600c524e00b0040b27082a52mr4018180wmb.1.1702222006500; Sun, 10 Dec 2023 07:26:46 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id t15-20020a05600c198f00b0040c4620b9fasm1534010wmq.11.2023.12.10.07.26.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:46 -0800 (PST) Date: Sun, 10 Dec 2023 16:26:44 +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 ForcedAMSDUMode 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:27:08 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909172999578437 X-GMAIL-MSGID: 1784909172999578437 ForcedAMSDUMode is set to 1 and then never evaluated. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index d249062e7b66..670affe9d57b 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_mpdu_density; u8 forced_ampdu_factor; u8 forced_mpdu_density; - enum ht_aggre_mode ForcedAMSDUMode; u8 forced_short_gi; u8 current_op_mode; u8 self_mimo_ps; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 0a5885d6c0a0..bedee290e7f5 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -513,7 +513,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pPeerHTCap->MPDUDensity); if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { ht_info->current_ampdu_enable = false; - ht_info->ForcedAMSDUMode = HT_AGG_FORCE_ENABLE; } ht_info->cur_rx_reorder_enable = ht_info->reg_rx_reorder_enable; From patchwork Sun Dec 10 15:26:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176357 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570342vqy; Sun, 10 Dec 2023 07:27:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IH1sSpIkb3Q6jegbdNHN52CEqphp0jxJAi5dFM+5xHPh9xiZwK+P6sZqZZfkQE5m0KO1Jdw X-Received: by 2002:a17:903:1105:b0:1d0:afea:78a8 with SMTP id n5-20020a170903110500b001d0afea78a8mr3789295plh.106.1702222057609; Sun, 10 Dec 2023 07:27:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222057; cv=none; d=google.com; s=arc-20160816; b=OiRq7gvLrFSA66AxEBseTRJlujTYc1MvSovwXDsprzU5CRshwJXejVjv3ZHHpOlPJs eYMzFWiIzk1mUTITAtIwOSWHEevB1u78M/2UWRSvnxUeMZqG91DYG4NTLGLvFTbYMD9Y ywhyfHhHmbT9WqScoSUoKQoUBNms0ugrYjZ/UaRdHG22rL8XiM8LrX/G3C9Pvvc/Kdn5 JUbpy9SgYkHg9BWVibpYZlGVY0XP6iScNPNk6Y2gBaOmnf4wDXZtdeCihorDWb9ttY2m bMuSVVVKiiD1LnZo8qm2e0TC8hbkO6qRf4DGBajCeXbuEj1wJ8SFnnerkLZjjpYr+jbg mYzA== 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=5AX8g/wXZvYEzrNX0i7zijBGLcVcluFx1cTL3h9KKB8=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=GKq0D7I8JwJe3gwXfjsCROTnL8pR0jHzwdqSPyg4UIpbh2VBLjtkaJNsb9weQ7+XF6 EiF/ZuXGMFCVASewiFzD/0IKk4INbrscxOEm8jZxauJc8pKshC+wP5mR2ncGp4T75FFX z/FfEY6y91DQ01t0WeXvWx38LEzsxJOzJkn7DH8Sor3frUrtG9Jgw3c385rMH4phIZf4 LWWTehTN6/S505E4/YR+iqDCceboDDjisbFGa2aFneKmL/7WL7gmQ/WbOiE6h8yq1qs+ GtHuMpZrV7tTNIRfiNaS1xFMq4p38jiv1uvT1/+oN+1rgOJErG30SLyPsLp0owN4wHgT pxMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=DQ8TmW5F; 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 v12-20020a170902b7cc00b001d08d307f89si4634743plz.496.2023.12.10.07.27.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:27:37 -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=DQ8TmW5F; 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 F0BB4807E452; Sun, 10 Dec 2023 07:27:34 -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 S232957AbjLJP1I (ORCPT + 99 others); Sun, 10 Dec 2023 10:27:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232882AbjLJP0t (ORCPT ); Sun, 10 Dec 2023 10:26:49 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 22EE418E for ; Sun, 10 Dec 2023 07:26:55 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-40c2655da63so5703455e9.1 for ; Sun, 10 Dec 2023 07:26:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702222013; x=1702826813; 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=5AX8g/wXZvYEzrNX0i7zijBGLcVcluFx1cTL3h9KKB8=; b=DQ8TmW5FpxfVS3Te0xcT1UV08WymrMwpmVRqKN2xdlS3G1fWL5n3lRF4/p1ngvVIR3 fwVYziy4BZSVSMBSpMJF7HdZQjmuU9CKh5yEA5FSIvKxw/OijPA50ZikqYh+vWkQAnDL A8IH6vgocmZGX++MzgJF6JzCQlbxB9V+WdQ+1UEO7qPHfqNcH/FbiTKnU+9VuqgEw6Uy nXC6hFtZI4082GxJdmn/03nRVpGAHWjDPwuhtrp5BFKyp/EhFYRmUhfs6eLWEY8BbYoy rNff7v6opNYDXZe+Ywq8MtLad+UzxIY+sInREveFLnijTnIAz7Sv8s/CrO+k+D2j4ukY cTVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702222013; x=1702826813; 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=5AX8g/wXZvYEzrNX0i7zijBGLcVcluFx1cTL3h9KKB8=; b=jFrqjtnO3dTYPP2aoomEzs99lcDPQUknqb1hJrl9UJ7v1lp+DPkeC7G8drQzYM56ug 8QJyRLgMLFl/SSBX8juN/IPz+RxUeKYbdfWmMVhsHHZeIDHoZ08Dpzjy8QDn51jW9+fQ faDMxVbs9tI83e1agxIa+6LQHq4mTA9J+qrOzEmb2R8Q9L+3wv44SJgqwJqUOAoSJAV/ F3j9JCjPfCsCH2IBAJTtQM1LX/wJa5n3PrlcfPlyPy7Cn6kDH++lpZgFFRGhNrJKxqNI IymaXv6ngGF7l3APtYXgEJ97KHGxe5AKCNWF7hw2lTAE5CT36uLpA5zvGSdvig7jIfmr oWkQ== X-Gm-Message-State: AOJu0YyCsraJldFaViyeQmtTzxqI8ibkwdasXKuU4iMD1Fv0K0A2bYp8 Vh9s41I/J2QpWIyJG1GxYnf8Bh0uX+4= X-Received: by 2002:a7b:cb99:0:b0:40b:4cce:baf4 with SMTP id m25-20020a7bcb99000000b0040b4ccebaf4mr3959298wmi.3.1702222013655; Sun, 10 Dec 2023 07:26:53 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id u15-20020a05600c138f00b004060f0a0fd5sm9905070wmf.13.2023.12.10.07.26.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:53 -0800 (PST) Date: Sun, 10 Dec 2023 16:26:51 +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 equation with pPeerHTCap->DssCCk Message-ID: <16ec7f928d1c51ffe68b9a1a68d09abaaa79924a.1702212003.git.philipp.g.hortmann@gmail.com> 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:27:35 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909196476362716 X-GMAIL-MSGID: 1784909196476362716 Remove equation with pPeerHTCap->DssCCk as it is set to 1 and unchanged. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index bedee290e7f5..ca9da96b6f6c 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -471,7 +471,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false); ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false); - ht_info->bCurSuppCCK = ((pPeerHTCap->DssCCk == 1) ? true : false); + ht_info->bCurSuppCCK = true; ht_info->bCurrent_AMSDU_Support = ht_info->amsdu_support; From patchwork Sun Dec 10 15:26:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176358 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570389vqy; Sun, 10 Dec 2023 07:27:43 -0800 (PST) X-Google-Smtp-Source: AGHT+IHf/WTQmbVyZgdVDEPKIuSV1m1ukcbZlCxao+NnwpjM6AjT75Q2FXMuRBfP10sX+MpRvDWA X-Received: by 2002:a05:6a00:854:b0:6ce:6901:5611 with SMTP id q20-20020a056a00085400b006ce69015611mr3881001pfk.57.1702222062755; Sun, 10 Dec 2023 07:27:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222062; cv=none; d=google.com; s=arc-20160816; b=KU0TGlRflBBtqB1bvcQLFnGZrOUI7Gx+J3dyVmXv70cn8VG2PrknAOuZnWpi8dwhg5 9VYZiUFUBbrfugCS0VCLzNvDjoECaopTu5M3fEf/5JgobYDRrhCr4Gh0C14J9WUQfqIU TaUZzRR+WrCplFmqbzqGFSPoZCIqLfdgld/8W+5QQX4XGog9BFU1h2eWed8hj3WzzVvy sN1emAMWjUKqYzSuxx2vVpvXpJEpmf3+vWFrXZMovWchHAbceU9cG4aKFNLlbMHa9/Bt lpjQTFjo4OppZM1JLhkSmiiETxMIFFX2zIStxZA8kDGUJ45EP+uwBCXHxAuaYoRRo822 qHGA== 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=0Ghc9oNYnVV/LlJvVf4sjMAoSbSil2W5yyWhaZB5Vhg=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=xHvtZfKhZXezHVuDz4dnPJM4vf03/QMGB77N1B97nGL8fwQmJz+KpebCRTLJC3rcf9 4r3hCarh9vdrLP4/Lhq1NtyxpPbGwwu5JB/iGySR9Z22YTCOOUqwU3nP6rqVhR2OrYpD V0eqxq+GwJWOxS6pY6bxUEwSpGQ1VKVbJ8yJZWIIz+NpKJIkWyD1UozY2G/tCYSSSnO+ GFCnWXwqvcXiCGR/JUJwlXLG8f7RqFNmlWEvlHZm0MX4Y8SoKZtEgjXVWTOspKyUbxqt lRMmCLJlUaoMU2wgfYsmfvlou/Z49NW6+ZjUnfjOk062QMIJDPs1+Ig/9xqUTJlNRxFT 54KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Q3HWLqjK; 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 t9-20020a654089000000b005c5f5194e56si4559525pgp.372.2023.12.10.07.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:27:42 -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=Q3HWLqjK; 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 62C32805161C; Sun, 10 Dec 2023 07:27:40 -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 S233025AbjLJP1L (ORCPT + 99 others); Sun, 10 Dec 2023 10:27:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232906AbjLJP0z (ORCPT ); Sun, 10 Dec 2023 10:26:55 -0500 Received: from mail-wm1-x335.google.com (mail-wm1-x335.google.com [IPv6:2a00:1450:4864:20::335]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62EE410B for ; Sun, 10 Dec 2023 07:27:01 -0800 (PST) Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-40c317ba572so5642425e9.0 for ; Sun, 10 Dec 2023 07:27:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702222020; x=1702826820; 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=0Ghc9oNYnVV/LlJvVf4sjMAoSbSil2W5yyWhaZB5Vhg=; b=Q3HWLqjK4Zk/2y1bO8hbz50aiN+0fxUsz27+ktirb218eQAHiYAlel2r0Mqqm5jS1S GNKnN/qyeOFMdNQsNtGlvmAMM1WpcoLeTvnequAtUhImtICRiwaN9srtt9TtG9edq8Y6 GcIX2B9FwVG93vhC/RxNUqLVhZV5biRRT5rxYgdeMQ3zg5beiCxRaqqEs2iUR3fnRY8u xFlfMUi4qfxbFkNPL+4dHVkwxag8uLUU9PS5WtnZnsiZsQwFYSEU5ieSvfu0xDlj4YaY ozbY9lZU8/VmQTJ4UH9uSRE3mz4Q9wKR1isGylysblIJGoMBEVFVp82s9YN7HGk0XoMF wtWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702222020; x=1702826820; 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=0Ghc9oNYnVV/LlJvVf4sjMAoSbSil2W5yyWhaZB5Vhg=; b=v4PEl5UzxVHs8AUekThHkoXLc/87o9F1D7BbbhqgjTuurPcQHJZPLVCriI426aC12u S7UboRmlS3X3ewwDrJs0s1TLfkAckWYazucOhjcFSVFMGwto2USeiABQtqnfi+LeR4SY qvoeZF93XmFOXhPDO1EA9Ge7PPmTlE8hbyS4HRPqN9Ah4oxTBHxyETwwizW9E1ifixZQ sO73JYxw7F97nj0bzXp3CJAx0kWN/VSL50N3nqNASJooHCPFHkACEWM51RbNTmdXqHot FRFf7U51m+Apd6rc+IAoQGA8tzyRHB336Zy0280zX1FvhU1uBG/dtUNEBsB2zl7d0lN8 cBNg== X-Gm-Message-State: AOJu0YzxyXR3Ybjl6w/ve66KqybeRPGNMTLV+GGQudr8TAzESNFQOh5Z UuPLMt42m/iBiR31wP87G/E= X-Received: by 2002:a05:600c:1913:b0:40c:287a:1bba with SMTP id j19-20020a05600c191300b0040c287a1bbamr4041201wmq.2.1702222019806; Sun, 10 Dec 2023 07:26:59 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id r20-20020a05600c459400b0040b349c91acsm12117696wmo.16.2023.12.10.07.26.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:26:59 -0800 (PST) Date: Sun, 10 Dec 2023 16:26:58 +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 variable ht_info->bCurSuppCCK Message-ID: <159a1a84c7bc90042bf1618a067f02ac123dd15d.1702212003.git.philipp.g.hortmann@gmail.com> 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:27:40 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909201775091784 X-GMAIL-MSGID: 1784909201775091784 ht_info->bCurSuppCCK is set to 1 and unchanged. Therefore all equations result accordingly and ht_info->bCurSuppCCK can be removed. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_HT.h | 1 - drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ---- drivers/staging/rtl8192e/rtllib_softmac.c | 5 +---- 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 670affe9d57b..416633b88446 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 cur_short_gi_40mhz; u8 cur_short_gi_20mhz; - u8 bCurSuppCCK; enum ht_spec_ver ePeerHTSpecVer; struct ht_capab_ele SelfHTCap; struct ht_info_ele SelfHTInfo; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index ca9da96b6f6c..439b43faa2bb 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -471,8 +471,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->cur_short_gi_20mhz = ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false); ht_info->cur_short_gi_40mhz = ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false); - ht_info->bCurSuppCCK = true; - ht_info->bCurrent_AMSDU_Support = ht_info->amsdu_support; nMaxAMSDUSize = (pPeerHTCap->MaxAMSDUSize == 0) ? 3839 : 7935; @@ -549,8 +547,6 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->cur_short_gi_40mhz = false; ht_info->forced_short_gi = false; - ht_info->bCurSuppCCK = true; - ht_info->bCurrent_AMSDU_Support = false; ht_info->nCurrent_AMSDU_MaxSize = ht_info->amsdu_max_size; ht_info->current_mpdu_density = ht_info->mpdu_density; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rtl8192e/rtllib_softmac.c index 5c89744b2bbe..416f89ec576c 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -173,10 +173,7 @@ static u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee) rate = ieee->basic_rate & 0x7f; if (rate == 0) { - if (ieee->mode == WIRELESS_MODE_N_24G && !ht_info->bCurSuppCCK) - rate = 0x0c; - else - rate = 0x02; + rate = 0x02; } return rate; From patchwork Sun Dec 10 15:27:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Hortmann X-Patchwork-Id: 176360 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp6570429vqy; Sun, 10 Dec 2023 07:27:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IE9Yytf4IIQe19uupztn3x40EZR5rOH0dAxAV6pF1fQSLJKYv+V89A+wTsy/W6y+3VVV+Hv X-Received: by 2002:a05:6808:17a7:b0:3b8:b365:1e34 with SMTP id bg39-20020a05680817a700b003b8b3651e34mr3862619oib.33.1702222068936; Sun, 10 Dec 2023 07:27:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702222068; cv=none; d=google.com; s=arc-20160816; b=lJ5gF43UL+aRlYJ8fbPqui1IQwcRgJoqq2x3t+uSPTVNAvfEquMbqDsTP704BoXCCR ZRHloT0ftA8XS7/+w1VS4wCFRBJxPw604EdaFUQ+e21gB1W07AYhW+SlYPDYc2Ea6j4L Gpfz+bXDULpRWu/Xr0AwIV8Blcjd8U05HJTEtVKkTN0UhTYNobPPvaBhj2hM/YFip9xs nw7EimAaiyH8H5QtudSvZerihrwzgUmlEtaD80IB1b3GeaipouU0/jxfZvtFk/m/tTV+ 4x8OE2YC9rx5SchIklRC8pLVnu+jMC5DYxzceJKDmUmj4vZIbl6s3ZKRDfcUqAhUBubw XRRQ== 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=geLw7oiaKYTuY2XiNNlgp2W+j2j+NV9E7iJ/5OuM2YA=; fh=Sw1rtAM+hKyOoOQVYiiLzcdjc4spg79Z/tN6UmWUAKs=; b=vu4NJAf/HdU5tXWPtUBaNy9KJaO+CPifT9H8ltHvApa4tHNLsC4Hm+EVawqKYvj/U0 UoBtY5br91OuyqFIKdMiZ+MKzGG0rbVa0hOf0bbWIppAogMLiWVSjpAE5pIi6lf902Ko rErbbYPT1IZ33HHaC6IcspImupsrc020d2sqXr9sPnwy/wr8QCxV0XsUNudp3FtSOFmQ +RVuks7HvVk+BIPAXkpG6HHBRiCemMjNk6njG3P2PG6YLI3QZR5q/GHawYkb5YMIQY9j XVxwl6wOoFENA0k8Gtciq5ELVhogXFuUF4eTxzEHN8um3W+7GcpL0LwuIJBgde54Ry4I 0gwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kkJfJYzT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id eb3-20020a056a004c8300b006ce97669ff7si4783238pfb.364.2023.12.10.07.27.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:27:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=kkJfJYzT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 BD9C8808D2A1; Sun, 10 Dec 2023 07:27:43 -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 S233040AbjLJP1U (ORCPT + 99 others); Sun, 10 Dec 2023 10:27:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233013AbjLJP1A (ORCPT ); Sun, 10 Dec 2023 10:27:00 -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 BA1FC123 for ; Sun, 10 Dec 2023 07:27:06 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id 5b1f17b1804b1-40c192f488cso5992245e9.1 for ; Sun, 10 Dec 2023 07:27:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702222025; x=1702826825; 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=geLw7oiaKYTuY2XiNNlgp2W+j2j+NV9E7iJ/5OuM2YA=; b=kkJfJYzTp0Q2ZrYqeRvHVOb2kcOzfwKUAuoOCEMfLpVdHOaFfBBAcNxhNdOFN5jYgu v8RGVvbneAyQ27PzGbKnlWYJClHwSI84ekvzvYwwJURfVOYRgA5Jye5cDbWQOEAx4TLf SZhjJxW64VhH67AUAdnLwTijoOFaxrVH45oGR06D5r8/8qa0fBczvkE6atSd7c63JPcf KWBqpxqpULzqb2ARVcp0rN0wRTlLYr7iP6/E23Pek4rFDW3AkSxS6OP9ToA/Wf12c8oL YJDF0SD5rDAKb/hKBXX0Fb+voC/K/Kzwiq7Udrn8ouZooTJUtKp4/gsIqC+09BOGogYN e21g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702222025; x=1702826825; 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=geLw7oiaKYTuY2XiNNlgp2W+j2j+NV9E7iJ/5OuM2YA=; b=qd/go+ku5pn5WeDZdmnYZP1CaqC2GcDC7PvVByr5XUUUAV43f+MHPvmXGUWdHE961r G3F5gn0hrzGJQZUzjWop4tcU3G07e0cfEfck/4RQ/92bndDcx9gvi1MKJZpJ1rDYjePd l8FfwGorAFL6dnb7kKfTcsIiG5eqw591aWFYIWuaWlsoWQBScWhJz/yEUchtGltrn8vx mQoar++KnHqmeZrXfG+DzRZMhRtbU8EP5azCWSZkv/pf4lwrAcqugSreDyr3jn45zLQt LSGYhbLvXnmC67O6+wEjgRIZZLxVkqCTcbdKmvoqrU9UIUET+vvBIlDxiSBpj3bxUYzf Y8wg== X-Gm-Message-State: AOJu0YzyrrMfxVWkUI/XUii/r7cR4t/ITd4KrFlYVXS9brbYW/1vzonb Sjym2Rg+wgx5a9rtvxjzzLI= X-Received: by 2002:a05:600c:524e:b0:40b:2708:2a52 with SMTP id fc14-20020a05600c524e00b0040b27082a52mr4018653wmb.1.1702222025086; Sun, 10 Dec 2023 07:27:05 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07fa0.dip0.t-ipconnect.de. [84.160.127.160]) by smtp.gmail.com with ESMTPSA id r20-20020a05600c35d400b0040b538047b4sm12250228wmq.3.2023.12.10.07.27.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Dec 2023 07:27:04 -0800 (PST) Date: Sun, 10 Dec 2023 16:27:03 +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 struct ht_info_ele SelfHTInfo 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 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:27:44 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784909208402032994 X-GMAIL-MSGID: 1784909208402032994 Remove struct ht_info_ele SelfHTInfo as it is unused. 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/rtl8192e/rtl819x_HT.h index 416633b88446..0f27c820ffc5 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_20mhz; enum ht_spec_ver ePeerHTSpecVer; struct ht_capab_ele SelfHTCap; - struct ht_info_ele SelfHTInfo; u8 PeerHTCapBuf[32]; u8 PeerHTInfoBuf[32]; u8 amsdu_support; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index 439b43faa2bb..0474594a4b96 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -554,8 +554,6 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) memset((void *)(&ht_info->SelfHTCap), 0, sizeof(ht_info->SelfHTCap)); - memset((void *)(&ht_info->SelfHTInfo), 0, - sizeof(ht_info->SelfHTInfo)); memset((void *)(&ht_info->PeerHTCapBuf), 0, sizeof(ht_info->PeerHTCapBuf)); memset((void *)(&ht_info->PeerHTInfoBuf), 0,