From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 64696EB64DA for ; Sat, 24 Jun 2023 06:03:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231752AbjFXGDp (ORCPT ); Sat, 24 Jun 2023 02:03:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231680AbjFXGDj (ORCPT ); Sat, 24 Jun 2023 02:03:39 -0400 Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D5E562735 for ; Fri, 23 Jun 2023 23:03:37 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-50d897af77bso247454a12.1 for ; Fri, 23 Jun 2023 23:03:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586616; x=1690178616; 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=K68HLYGlwDJwOH5YshS9zMlYCIWsN1SU5D25IQezQP4=; b=Hqfw0pbMjHFV1Qi99e173VzNOVsDdWr/RlHZDV0WjUsx1FBPIp54UfpRVnqOZxMX4L Yv4UfGni7FfBz+nTBL19U8RMZ4Sk3Ezp0Xku2EuMu31mSyUGRXlwWnwoxZlgYB5YsszB lzhrinkuaUhE0rrVS6KwNLox9a9oSazufcx04LGEGiwwNMhXkhIqc8rmlOpFbQT8DvRu Irbk+GcMD9ZpqI4aYLjDHCd4AVgtx9lHbVl8KTaxrVHX1CQRvHVKRyVJ3BzBSJdwWdUh ueSp34Oz8sTliGNHzlmriAC2f5dcNBRRSiEj5rTKhMDBdzscrcCcX1BmlpgGqxa3qhOj i9oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586616; x=1690178616; 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=K68HLYGlwDJwOH5YshS9zMlYCIWsN1SU5D25IQezQP4=; b=dE/DaA7vW4fBtCF38zbsguwpi+x/HPnUY0vhNqdhZYOzXVWYf0YV9j1OdesDqjP68Y /u/z6+NGg2ru5Lw5faZMIM7jGxR5MjCp0456ly2y/TDV22aQJ29/ZDgJxmg7jhKc/kIQ k7jwmfaFxOakM9iZxMqioI1oVpyvTkfZKi/Avg7FBTD+voENThavEsRyoNI1vl2b8cM4 3z0bpKsM7LkuLnm8UY6Q/dx0CtxgBCYd/QVESlp4gQWALiSA8ZtvTLTT5hOtUfTOd1Vy ypYy//QpWUTD4lIOHCDGxHnzMnZsqcK8MfvGoGpHNioTqMG1V3MKI9UiogDCnu7qZBSw ZGvg== X-Gm-Message-State: AC+VfDym8G18M/P6/VsCzeqkwMRUUscaVn33X28/0BIDGU1JcDxhPUTE ZjBB5iAwd1AJkYgjvLXA4TQ= X-Google-Smtp-Source: ACHHUZ4x24+82MKIUPnXjT3fanEpg34sciprXTpyX43bYNt1EkIBd1xHorHUtlTgSdh1p9aL9qjRCg== X-Received: by 2002:a05:6402:2684:b0:51b:cf76:c548 with SMTP id w4-20020a056402268400b0051bcf76c548mr10975335edd.2.1687586616181; Fri, 23 Jun 2023 23:03:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id a15-20020aa7d90f000000b0051bc5adc942sm315479edr.47.2023.06.23.23.03.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:03:33 -0700 (PDT) Date: Sat, 24 Jun 2023 08:03:31 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] staging: rtl8192e: Remove unused timer SetupTimer Message-ID: <4bbbd60d84e15fdb7bffde98a687ed168a4dfbbd.1687583718.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused timer SetupTimer and all the resulting unused code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_TS.h | 1 - drivers/staging/rtl8192e/rtl819x_TSProc.c | 12 ------------ 2 files changed, 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl819= 2e/rtl819x_TS.h index 37760d0bc35d..75ee2056d361 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -19,7 +19,6 @@ enum tr_select { =20 struct ts_common_info { struct list_head List; - struct timer_list SetupTimer; struct timer_list InactTimer; u8 Addr[ETH_ALEN]; union tspec_body TSpec; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index c61fdf73c572..00f6a66c2265 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -8,10 +8,6 @@ #include #include "rtl819x_TS.h" =20 -static void TsSetupTimeOut(struct timer_list *unused) -{ -} - static void TsInactTimeout(struct timer_list *unused) { } @@ -142,9 +138,6 @@ void TSInitialize(struct rtllib_device *ieee) =20 for (count =3D 0; count < TOTAL_TS_NUM; count++) { pTxTS->num =3D count; - timer_setup(&pTxTS->TsCommonInfo.SetupTimer, TsSetupTimeOut, - 0); - timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout, 0); =20 @@ -168,9 +161,6 @@ void TSInitialize(struct rtllib_device *ieee) pRxTS->num =3D count; INIT_LIST_HEAD(&pRxTS->rx_pending_pkt_list); =20 - timer_setup(&pRxTS->ts_common_info.SetupTimer, TsSetupTimeOut, - 0); - timer_setup(&pRxTS->ts_common_info.InactTimer, TsInactTimeout, 0); =20 @@ -197,7 +187,6 @@ void TSInitialize(struct rtllib_device *ieee) static void AdmitTS(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, u32 InactTime) { - del_timer_sync(&pTsCommonInfo->SetupTimer); del_timer_sync(&pTsCommonInfo->InactTimer); =20 if (InactTime !=3D 0) @@ -394,7 +383,6 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common= _info **ppTS, static void RemoveTsEntry(struct rtllib_device *ieee, struct ts_common_info *pTs, enum tr_select TxRxSelect) { - del_timer_sync(&pTs->SetupTimer); del_timer_sync(&pTs->InactTimer); TsInitDelBA(ieee, pTs, TxRxSelect); =20 --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0BA4FEB64DA for ; Sat, 24 Jun 2023 06:04:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231477AbjFXGEB (ORCPT ); Sat, 24 Jun 2023 02:04:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231680AbjFXGDv (ORCPT ); Sat, 24 Jun 2023 02:03:51 -0400 Received: from mail-ed1-x52b.google.com (mail-ed1-x52b.google.com [IPv6:2a00:1450:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 28426272D for ; Fri, 23 Jun 2023 23:03:45 -0700 (PDT) Received: by mail-ed1-x52b.google.com with SMTP id 4fb4d7f45d1cf-51a52fff2f0so313483a12.1 for ; Fri, 23 Jun 2023 23:03:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586623; x=1690178623; 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=aBSfn8glPT2kxNQHy+PfpOOqO6rN+IWZ6miV6QcZYkw=; b=NVRmC14/S1OEnqRzqTWlTQDcv+sbJhErpLvqB3BWs4Mx8Knib/+pRG2df40Gzi/ySA FUUWa3ijaGP33OSAlh0XF+ZADZUYgLEx7f3npCaxkn6MIAH0dSi+QEO74GRMgt36jJE4 GJp7xCpnJuFSHKf3cE05WpNVjJHPXbBHUoTU4aQeVmwaDJ/pKKczDtF4IOI6Nn9lC7t3 hhYPD1DPh3tGIgLG6BqjRmwHEJRUmqWpL3j0HaZkq9I8LdddDKNpz5unUvaGpjph3E6f Opu86HT7G+Iel/iS6uTmplkgVZjeBM9AcmZ2JIyE3HLBl9QmRXE9gUZY8umwhDN6R0Vc 1pXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586623; x=1690178623; 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=aBSfn8glPT2kxNQHy+PfpOOqO6rN+IWZ6miV6QcZYkw=; b=mEGSGqU/jd/wEjRXuth+c0+jW52Mr0N8Zh3utv4zM0pt5cjs7Y/jGgFqkbd9FiyLif VYMzi8zDpfAuJeDaShf6KrC1QZPt8L+sKIP8Ir3gvtx8qfq+jS63c99skRBc4uDm3hZl f5P8F9cLuUDnKnDKC6W10OP/5Nsoj16GV8H2tl6Nc7psWPuP/t1wn6+eOWXRHSHq4Pyz HNjhQQcECRGJzKKykuFO+Kvpg26qWFOgr8UM0HTTL4m7VCAzom5YnZyMlReA9wPryyVw OPDa+/k17JIghRyGNVOjPtRlAZ7jv5EzJPgg7uggFhthqbes00muabUgZA0Y3h+PZ8Zs W2+w== X-Gm-Message-State: AC+VfDxLM21/zBulFO1bvSZ2C79dfEpZmwpUX1HU/cHqUrgVaNipQ6yt MOl4ZY34coyK2UoTAAoHRsI= X-Google-Smtp-Source: ACHHUZ5g2n9rJ9hdt9TSwklixbRmpTWI8h2/OX/znA4tlIeI4dLnfbSPJpP/mntq1lx1LS/4DAUkjQ== X-Received: by 2002:a17:906:73dd:b0:989:1ed3:d00b with SMTP id n29-20020a17090673dd00b009891ed3d00bmr9942539ejl.4.1687586623029; Fri, 23 Jun 2023 23:03:43 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id h9-20020a50ed89000000b0051d888df7f8sm31279edr.56.2023.06.23.23.03.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:03:40 -0700 (PDT) Date: Sat, 24 Jun 2023 08:03:38 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] staging: rtl8192e: Remove equation of local variable InactTime of AdmitTS Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove equation of local variable InactTime of AdmitTS as AdmitTS is only once called with InactTime as 0. The equation is always false and therefore dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_TSProc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 00f6a66c2265..ed124f85c2b1 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -188,10 +188,6 @@ static void AdmitTS(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, u32 InactTime) { del_timer_sync(&pTsCommonInfo->InactTimer); - - if (InactTime !=3D 0) - mod_timer(&pTsCommonInfo->InactTimer, jiffies + - msecs_to_jiffies(InactTime)); } =20 static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ie= ee, --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 584CEEB64DC for ; Sat, 24 Jun 2023 06:04:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231817AbjFXGEK (ORCPT ); Sat, 24 Jun 2023 02:04:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231770AbjFXGED (ORCPT ); Sat, 24 Jun 2023 02:04:03 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 250CA297C for ; Fri, 23 Jun 2023 23:03:53 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-98dfd15aae1so888566b.0 for ; Fri, 23 Jun 2023 23:03:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586631; x=1690178631; 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=VPxvnhxhJrxYQ+szNx981vwj+0UhmdrYLXnjA4eHd9w=; b=NW/V7+dkAZWNsRIB5v+CzAsjlEk+bOu5bPPqEvT75+wck6D67qrPfscAv9UsQLpMZX 6dWnww48IaiSx2UBs9+0LxPbxyR28p3cXH70YyNpX7ow+iirF0FFubICIvdP0GiYAmbs yQYd55OVYJPsptiaFA3RUv97WqEBe9jMnsNaBlaioFc+sJEnJcuzmQ2ww1e0xLko5FR4 aiNfQPVYu/I6ZZbB1Z36RlXDsYJb7F3cbRazmaC0QyWUkAesRHrSu9zTG2G8Djjh8Iuv O/n1gBXPEYvbVrJ7QW73wT1dTbk5T6zROpU9HxmD1+D5EQqRbpIEihcmY9bME0mruYAD ohLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586631; x=1690178631; 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=VPxvnhxhJrxYQ+szNx981vwj+0UhmdrYLXnjA4eHd9w=; b=j1rNRW3dDvIZaSbVhkTUb8BBTSQT5Gfxzeadz6nSAY0m+js57ak6i0HI3h0HJKbeYS DnIx1DaUrTjqev9nt0YcGTr3GA20FCac9OI8yDk8dRnE8SdbQfQ0F0LT4fYmBOW3QMsp oYUIaGm2v1AgoyLR/CoYVsHq6Rr/dmwHswYdOGw3mNuPQbKX8bfaqapkTcdy+9jGZqTK n4TF/XbBKc6+BBX0p+UjVDKV4eNSHr30dDZPGE8fsd99hFo/sjKX1sIIKopI4fY7TjZB nq2Ra1E6K4t0z6/Dp5z0R2FefyirhnrANf5V8UD4WXFhMzfMmD3EAhJtn8/LUQ5fJBSt 8yiw== X-Gm-Message-State: AC+VfDz2BBqqygaJqa89h+Cv07A/NAQBGiHts01kuvEyYneUKa/L3hSe q/EjbJh6wKOQKDn560twuFE= X-Google-Smtp-Source: ACHHUZ5sI1TORPiu+bHb7Aa76JMJi1rjhMXe+VH3We2PdUY44KfBNsm99TOERTfZLeqbmMPZSLW1hA== X-Received: by 2002:a17:906:779c:b0:988:815c:b9fa with SMTP id s28-20020a170906779c00b00988815cb9famr13169095ejm.3.1687586630810; Fri, 23 Jun 2023 23:03:50 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id n19-20020a170906841300b00988d0ad4477sm503594ejx.29.2023.06.23.23.03.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:03:49 -0700 (PDT) Date: Sat, 24 Jun 2023 08:03:45 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] staging: rtl8192e: Remove unused timer InactTimer Message-ID: <1a7acdd76037327602858a8634d502b46cdc8786.1687583718.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused timer InactTimer and all the resulting unused code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_TS.h | 1 - drivers/staging/rtl8192e/rtl819x_TSProc.c | 13 ------------- 2 files changed, 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl819= 2e/rtl819x_TS.h index 75ee2056d361..0e851d4221a7 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -19,7 +19,6 @@ enum tr_select { =20 struct ts_common_info { struct list_head List; - struct timer_list InactTimer; u8 Addr[ETH_ALEN]; union tspec_body TSpec; union qos_tclas TClass[TCLAS_NUM]; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index ed124f85c2b1..7fff20b185f0 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -8,10 +8,6 @@ #include #include "rtl819x_TS.h" =20 -static void TsInactTimeout(struct timer_list *unused) -{ -} - static void RxPktPendingTimeout(struct timer_list *t) { struct rx_ts_record *pRxTs =3D from_timer(pRxTs, t, @@ -138,9 +134,6 @@ void TSInitialize(struct rtllib_device *ieee) =20 for (count =3D 0; count < TOTAL_TS_NUM; count++) { pTxTS->num =3D count; - timer_setup(&pTxTS->TsCommonInfo.InactTimer, TsInactTimeout, - 0); - timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0); =20 timer_setup(&pTxTS->TxPendingBARecord.timer, BaSetupTimeOut, @@ -160,10 +153,6 @@ void TSInitialize(struct rtllib_device *ieee) for (count =3D 0; count < TOTAL_TS_NUM; count++) { pRxTS->num =3D count; INIT_LIST_HEAD(&pRxTS->rx_pending_pkt_list); - - timer_setup(&pRxTS->ts_common_info.InactTimer, TsInactTimeout, - 0); - timer_setup(&pRxTS->rx_admitted_ba_record.timer, RxBaInactTimeout, 0); =20 @@ -187,7 +176,6 @@ void TSInitialize(struct rtllib_device *ieee) static void AdmitTS(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, u32 InactTime) { - del_timer_sync(&pTsCommonInfo->InactTimer); } =20 static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ie= ee, @@ -379,7 +367,6 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common= _info **ppTS, static void RemoveTsEntry(struct rtllib_device *ieee, struct ts_common_info *pTs, enum tr_select TxRxSelect) { - del_timer_sync(&pTs->InactTimer); TsInitDelBA(ieee, pTs, TxRxSelect); =20 if (TxRxSelect =3D=3D RX_DIR) { --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A07B9EB64DC for ; Sat, 24 Jun 2023 06:04:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231858AbjFXGEV (ORCPT ); Sat, 24 Jun 2023 02:04:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229964AbjFXGER (ORCPT ); Sat, 24 Jun 2023 02:04:17 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 855F92957 for ; Fri, 23 Jun 2023 23:04:01 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-510f866ce78so307452a12.1 for ; Fri, 23 Jun 2023 23:04:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586640; x=1690178640; 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=pA2jkr79HAQgO3Z0go7Vrb5Aqnnlcr4ywSCkzPMV9Eo=; b=letFtaa02giljSKBhUJXMSlsE80/XLx8rhYD8T02crEkd3ClKKcgnQ7VTO1H3XV7FI vzdkL3uAp79g9np/8906vQSACE8gNhpUc3Vf7doCvP5dTUtxWyJKydQ91H17czf/Qoar b7AbzUWWecKwopabvEarp1Ojix80ioau8nPnmqvD9h4viuAYyZvjC6+TGsF4WbiMOkpp 6n9l954XhpDxt9a24vkWoxH4hVfiIi+a+L968ie3S5L/TZou4jqAabyYLceLa1rpA9AB 1D3/m9OVbvslFsMH9wNPcPGyHXk90Aj05DucbgM5q12NEvmSNUKXyiGsJ8FzsNNlHTJZ M4VA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586640; x=1690178640; 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=pA2jkr79HAQgO3Z0go7Vrb5Aqnnlcr4ywSCkzPMV9Eo=; b=cs3QSzq3RC/YimS1QmUe+AitWvwAX/dNdfbDLUq6yOIuHad72/aWPjGDupiOg74IRU lrc0j3tdEBmvGRFB3UlmAs8grSuVKGjy/con3AHCAoD0/nmwqSNXU1FciS1KXx2aerOf f8r1t2NFm7nwHrzIJIPKDoGAtIwStSTbki0KEBuSvHjTxUAWOKKL9JGselWEt9BPRRFB inMMKi21+r615UcJ7w9CxEDCAFlh20/ndlAIvgSr3U/zxmVFNfXbCLuBlZO3bjF/RAkt 81QHK8xNaXh3PWH1zbi6a/e4a8PZgA9a3hvJkVLKgRe7gq4y1L85uNCXPzafukn7qmQJ CAGA== X-Gm-Message-State: AC+VfDwVLlRRA5J9yNloSTCYUioOasaIgfzEjB9XW2gUPlEzS9ITN0As zftk1mVC22U+RBHbyCqvmbVtUXtXZ9U= X-Google-Smtp-Source: ACHHUZ4bHhttEzXSc2wdcua+iq74NCIJmLE8qVn9FEHU0Rt6VBg0JjUIL52nTOHw7T9sF84wGOdZLA== X-Received: by 2002:a05:6402:5112:b0:514:a59d:93c5 with SMTP id m18-20020a056402511200b00514a59d93c5mr17018620edd.2.1687586639895; Fri, 23 Jun 2023 23:03:59 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id u22-20020aa7d996000000b0051a26ce312dsm309144eds.71.2023.06.23.23.03.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:03:56 -0700 (PDT) Date: Sat, 24 Jun 2023 08:03:54 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] staging: rtl8192e: Remove empty function AdmitTS Message-ID: <572feb55932b59c7fc652183877698f8b1123d8d.1687583718.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove call of function and empty function AdmitTS. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_TSProc.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 7fff20b185f0..474171edb2f9 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -173,11 +173,6 @@ void TSInitialize(struct rtllib_device *ieee) } } =20 -static void AdmitTS(struct rtllib_device *ieee, - struct ts_common_info *pTsCommonInfo, u32 InactTime) -{ -} - static struct ts_common_info *SearchAdmitTRStream(struct rtllib_device *ie= ee, u8 *Addr, u8 TID, enum tr_select TxRxSelect) @@ -352,7 +347,6 @@ bool GetTs(struct rtllib_device *ieee, struct ts_common= _info **ppTS, pTSInfo->field.ucSchedule =3D 0; =20 MakeTSEntry(*ppTS, Addr, &TSpec, NULL, 0, 0); - AdmitTS(ieee, *ppTS, 0); list_add_tail(&((*ppTS)->List), pAddmitList); =20 return true; --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CDD5DEB64DA for ; Sat, 24 Jun 2023 06:04:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232158AbjFXGEh (ORCPT ); Sat, 24 Jun 2023 02:04:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59238 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231840AbjFXGEY (ORCPT ); Sat, 24 Jun 2023 02:04:24 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 07DDF273E for ; Fri, 23 Jun 2023 23:04:11 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-98502b12fd4so30977466b.1 for ; Fri, 23 Jun 2023 23:04:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586649; x=1690178649; 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=g5G3FVlCyqn63CYhl0DzmSuIziSgLL1eeoVVmuGLO64=; b=JFTgUaF0Iyqv+0trbfpYbYGVikT6eeHoKAhZtKqeseNVl9T4VSML3k/8pEOFWj3fKh VxaJtDipH9I+57zVWPG+/PwielTptyDOdsS4Itmgw6kOUG6RXItX2j/vEpfJBxPZPDdo hu43ISwB6SbfxoCvNS/yXTcscWUR6LYM5XLqpuqETwpHk8eE5YYSUJcJhGNvLml8bd+i mOE3JQGVUgfbL/yfHo9uqnQljyMLbifAVBDE2RwnTlAzlKvwWwaxzLnbwrDysyDuLbHi Fj2U1F5Qfk/7TbtQ3V9RhmzAVzHt4Qxf1WrtQzncyQYGTlD/m6Mr5E1DM84JUR6/RoUI eMmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586649; x=1690178649; 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=g5G3FVlCyqn63CYhl0DzmSuIziSgLL1eeoVVmuGLO64=; b=SSdGCHEUbwaQNMwTScAHPed7tugbLR0UuUKVSs3w3nvPMA+oo69hJrrnUQXTCLSavL CF2cwZ1J3n3SOeEkhAiIr9LexxZDMn7ofT2ymNrNiqXE4g3AoH2h0ynVvaaaogMhyo2Q NF60yZdNDw6e10YdvMAbeTzWlGDMa2oPfpv6AnG5moy77xih/SHQA/KgBqXhoJqlM4sV Mo+BLXnBh8BPSvQmjhLhbhZpvRRhJGEevIsX0qS7EyMGgBKCaciZPnu9kgms0HPVBmv0 eJalYeB5f/jAHw7cZ8AjCV8E48j939B923G9nsjOVPMXRhPn+vo1+VY6JLSpYSOEYAdK ugfw== X-Gm-Message-State: AC+VfDwg846hHarOzs/hmX2a3AxNlPEpctTAoq343I49oPfZ91TOMqNH 9bV9VXdgOmbN0a9G0WS1VSM= X-Google-Smtp-Source: ACHHUZ6QolQYsLgTtmwGbQQDdtdhMMzk4sp85rd9nFBWiuD41+Qe/TDRy5Vye9p5XMLG0xsmesR5+w== X-Received: by 2002:a17:906:7a5e:b0:987:6960:36c6 with SMTP id i30-20020a1709067a5e00b00987696036c6mr15024649ejo.5.1687586649126; Fri, 23 Jun 2023 23:04:09 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id qq28-20020a17090720dc00b009891da61b1asm501984ejb.44.2023.06.23.23.04.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:04:07 -0700 (PDT) Date: Sat, 24 Jun 2023 08:04:05 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] staging: rtl8192e: Remove variable modulation as it is constant Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ieee->modulation is initialized to 3 and then unchanged. All evaluations will result accordingly. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 - drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 121 ++++++++----------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 +- 4 files changed, 50 insertions(+), 78 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 4447489a16ea..cb0753f6fb18 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -804,8 +804,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rtllib->iw_mode =3D IW_MODE_INFRA; priv->rtllib->active_scan =3D 1; priv->rtllib->be_scan_inprogress =3D false; - priv->rtllib->modulation =3D RTLLIB_CCK_MODULATION | - RTLLIB_OFDM_MODULATION; priv->rtllib->host_encrypt =3D 1; priv->rtllib->host_decrypt =3D 1; =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index e3ce4431d460..fdb7990130b5 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1492,7 +1492,6 @@ struct rtllib_device { =20 int short_slot; int mode; /* A, B, G */ - int modulation; /* CCK, OFDM */ =20 /* used for forcing the ibss workqueue to terminate * without wait for the syncro scan to terminate diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 425d4acbcdf0..c1e5127f5251 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -35,12 +35,8 @@ static unsigned int rtllib_MFIE_rate_len(struct rtllib_d= evice *ieee) { unsigned int rate_len =3D 0; =20 - if (ieee->modulation & RTLLIB_CCK_MODULATION) - rate_len =3D RTLLIB_CCK_RATE_LEN + 2; - - if (ieee->modulation & RTLLIB_OFDM_MODULATION) - - rate_len +=3D RTLLIB_OFDM_RATE_LEN + 2; + rate_len =3D RTLLIB_CCK_RATE_LEN + 2; + rate_len +=3D RTLLIB_OFDM_RATE_LEN + 2; =20 return rate_len; } @@ -53,14 +49,12 @@ static void rtllib_MFIE_Brate(struct rtllib_device *iee= e, u8 **tag_p) { u8 *tag =3D *tag_p; =20 - if (ieee->modulation & RTLLIB_CCK_MODULATION) { - *tag++ =3D MFIE_TYPE_RATES; - *tag++ =3D 4; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB; - } + *tag++ =3D MFIE_TYPE_RATES; + *tag++ =3D 4; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB; =20 /* We may add an option for custom rates that specific HW * might support @@ -72,18 +66,17 @@ static void rtllib_MFIE_Grate(struct rtllib_device *iee= e, u8 **tag_p) { u8 *tag =3D *tag_p; =20 - if (ieee->modulation & RTLLIB_OFDM_MODULATION) { - *tag++ =3D MFIE_TYPE_RATES_EX; - *tag++ =3D 8; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_6MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_9MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_12MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_18MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_24MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_36MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_48MB; - *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_54MB; - } + *tag++ =3D MFIE_TYPE_RATES_EX; + *tag++ =3D 8; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_6MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_9MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_12MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_18MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_24MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_36MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_48MB; + *tag++ =3D RTLLIB_BASIC_RATE_MASK | RTLLIB_OFDM_RATE_54MB; + /* We may add an option for custom rates that specific HW might * support */ @@ -1465,8 +1458,7 @@ static void rtllib_associate_complete_wq(void *data) =20 netif_carrier_on(ieee->dev); ieee->is_roaming =3D false; - if (rtllib_is_54g(&ieee->current_network) && - (ieee->modulation & RTLLIB_OFDM_MODULATION)) { + if (rtllib_is_54g(&ieee->current_network)) { ieee->rate =3D 108; netdev_info(ieee->dev, "Using G rates:%d\n", ieee->rate); } else { @@ -1652,9 +1644,7 @@ inline void rtllib_softmac_new_net(struct rtllib_devi= ce *ieee, schedule_delayed_work( &ieee->associate_procedure_wq, 0); } else { - if (rtllib_is_54g(&ieee->current_network) && - (ieee->modulation & - RTLLIB_OFDM_MODULATION)) { + if (rtllib_is_54g(&ieee->current_network)) { ieee->rate =3D 108; ieee->set_wireless_mode(ieee->dev, WIRELESS_MODE_G); netdev_info(ieee->dev, @@ -2526,47 +2516,34 @@ static void rtllib_start_ibss_wq(void *data) if (!ieee->wap_set) eth_random_addr(ieee->current_network.bssid); =20 - if (ieee->modulation & RTLLIB_CCK_MODULATION) { - ieee->current_network.rates_len =3D 4; - - ieee->current_network.rates[0] =3D - RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB; - ieee->current_network.rates[1] =3D - RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB; - ieee->current_network.rates[2] =3D - RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB; - ieee->current_network.rates[3] =3D - RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB; - - } else { - ieee->current_network.rates_len =3D 0; - } - - if (ieee->modulation & RTLLIB_OFDM_MODULATION) { - ieee->current_network.rates_ex_len =3D 8; - - ieee->current_network.rates_ex[0] =3D - RTLLIB_OFDM_RATE_6MB; - ieee->current_network.rates_ex[1] =3D - RTLLIB_OFDM_RATE_9MB; - ieee->current_network.rates_ex[2] =3D - RTLLIB_OFDM_RATE_12MB; - ieee->current_network.rates_ex[3] =3D - RTLLIB_OFDM_RATE_18MB; - ieee->current_network.rates_ex[4] =3D - RTLLIB_OFDM_RATE_24MB; - ieee->current_network.rates_ex[5] =3D - RTLLIB_OFDM_RATE_36MB; - ieee->current_network.rates_ex[6] =3D - RTLLIB_OFDM_RATE_48MB; - ieee->current_network.rates_ex[7] =3D - RTLLIB_OFDM_RATE_54MB; - - ieee->rate =3D 108; - } else { - ieee->current_network.rates_ex_len =3D 0; - ieee->rate =3D 22; - } + ieee->current_network.rates_len =3D 4; + ieee->current_network.rates[0] =3D + RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_1MB; + ieee->current_network.rates[1] =3D + RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_2MB; + ieee->current_network.rates[2] =3D + RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_5MB; + ieee->current_network.rates[3] =3D + RTLLIB_BASIC_RATE_MASK | RTLLIB_CCK_RATE_11MB; + + ieee->current_network.rates_ex_len =3D 8; + ieee->current_network.rates_ex[0] =3D + RTLLIB_OFDM_RATE_6MB; + ieee->current_network.rates_ex[1] =3D + RTLLIB_OFDM_RATE_9MB; + ieee->current_network.rates_ex[2] =3D + RTLLIB_OFDM_RATE_12MB; + ieee->current_network.rates_ex[3] =3D + RTLLIB_OFDM_RATE_18MB; + ieee->current_network.rates_ex[4] =3D + RTLLIB_OFDM_RATE_24MB; + ieee->current_network.rates_ex[5] =3D + RTLLIB_OFDM_RATE_36MB; + ieee->current_network.rates_ex[6] =3D + RTLLIB_OFDM_RATE_48MB; + ieee->current_network.rates_ex[7] =3D + RTLLIB_OFDM_RATE_54MB; + ieee->rate =3D 108; =20 ieee->current_network.qos_data.supported =3D 0; ieee->set_wireless_mode(ieee->dev, WIRELESS_MODE_G); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 2de63d1f2009..1a7575ab9d6d 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -487,11 +487,9 @@ EXPORT_SYMBOL(rtllib_wx_set_rawtx); int rtllib_wx_get_name(struct rtllib_device *ieee, struct iw_request_info = *info, union iwreq_data *wrqu, char *extra) { - const char *b =3D ieee->modulation & RTLLIB_CCK_MODULATION ? "b" : ""; - const char *g =3D ieee->modulation & RTLLIB_OFDM_MODULATION ? "g" : ""; const char *n =3D ieee->mode & (WIRELESS_MODE_N_24G) ? "n" : ""; =20 - scnprintf(wrqu->name, sizeof(wrqu->name), "802.11%s%s%s", b, g, n); + scnprintf(wrqu->name, sizeof(wrqu->name), "802.11bg%s", n); return 0; } EXPORT_SYMBOL(rtllib_wx_get_name); --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C0689EB64DA for ; Sat, 24 Jun 2023 06:04:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232076AbjFXGEp (ORCPT ); Sat, 24 Jun 2023 02:04:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229495AbjFXGE3 (ORCPT ); Sat, 24 Jun 2023 02:04:29 -0400 Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CB5BC26B3 for ; Fri, 23 Jun 2023 23:04:19 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-98dfd15aae1so892566b.0 for ; Fri, 23 Jun 2023 23:04:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586658; x=1690178658; 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=aIAm9Vi41k3qXg99Kf1VsByjAUO1zMDP7x9TBCdCf+c=; b=Xubiln78018RL+OjfjLgdzhyHqSoYf7eGj8W8zr/cHkUvLydejy95UyNGe3GGDQ0RD TyvHTVDPZc6A0ysmjDNq5Sx5/u3YWgBs5e0OBprkMJC+PKuWqJv4EZnwc99BFfDkdePK jT1basG19dwQ2/blAH5n2ycQ9kNk+We3wuM6KAY3PmztS+YQ4Cg8r7oGdKuhbhvGg93M DJ/1+LgcKD5zuwYSfSz/m8FKPzMQuQC4JgDyYaAxTSfx3mLfajVQqNX39G/cgV0uNiHs lfNwcqS/rStRwVGpRBIH9LwewVuyEugTu4w3y18w1ow2XoTwJFLyEpPkyTHn0ZIOczHQ VpeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586658; x=1690178658; 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=aIAm9Vi41k3qXg99Kf1VsByjAUO1zMDP7x9TBCdCf+c=; b=iomoyxEzCL00+RDke+ARQNjmJaStemoM1VRCAhkls2LO4Lkqa6EW2/cSUdIRxAYBtM xi+Xn7ByIUuwpkHKtsO8E9aOkhCQB7sCW0/n/HwJyq1umBnIHGWskpxUnZz+afkPKC6v EiVUFS1N0W37ECt4CV1G8CYleJc50G8uO4I3tK2OhPJSKTPplQK/1T9m9zs3QKFhSAzP emycPimcVCLN6VuN/8VkuPBcjmLqPQuscjwtrfIljkzujdwRVN9tj1vCUdUd8TzBDV6f 6Ux/tELExv4iYJLqAyAr0yRxIBtci+JefxQmjlvkBVKKa29865EJIu+zQYnUC+g0VpZf HeHQ== X-Gm-Message-State: AC+VfDxA4rnd50xgqqVHEYShEnT2Oi4w+bO0/GXeaO0oVVwgLC6+c3sk lpaJRElqkdn2Eer0XsKU9IIpvsFF9c8= X-Google-Smtp-Source: ACHHUZ44qCh9A2V2JtqXe7HfgWSDenuqjDpqkkKsb8M/mZkYBS7yj21nnhII0Pen3aSTsUDPfi9JTw== X-Received: by 2002:a17:906:779c:b0:988:815c:b9fa with SMTP id s28-20020a170906779c00b00988815cb9famr13169971ejm.3.1687586658031; Fri, 23 Jun 2023 23:04:18 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id rs17-20020a170907037100b00988e699d07fsm496826ejb.112.2023.06.23.23.04.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:04:16 -0700 (PDT) Date: Sat, 24 Jun 2023 08:04:14 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] staging: rtl8192e: Remove variable host_encrypt as it is constant Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ieee->host_encrypt also named priv->rtllib->host_encrypt is initialized to 1 and then unchanged. All evaluations will result accordingly. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_module.c | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++++-------- drivers/staging/rtl8192e/rtllib_tx.c | 3 +-- 5 files changed, 5 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index cb0753f6fb18..838b9c8b0df7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -804,7 +804,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rtllib->iw_mode =3D IW_MODE_INFRA; priv->rtllib->active_scan =3D 1; priv->rtllib->be_scan_inprogress =3D false; - priv->rtllib->host_encrypt =3D 1; priv->rtllib->host_decrypt =3D 1; =20 priv->rtllib->fts =3D DEFAULT_FRAG_THRESHOLD; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index fdb7990130b5..80090f8a38e7 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1441,7 +1441,6 @@ struct rtllib_device { */ =20 /* If the host performs {en,de}cryption, then set to 1 */ - int host_encrypt; int host_decrypt; =20 int ieee802_1x; /* is IEEE 802.1X used */ diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl= 8192e/rtllib_module.c index d6a4d6b4ec57..2ad2e3671ec4 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -98,7 +98,6 @@ struct net_device *alloc_rtllib(int sizeof_priv) ieee->open_wep =3D 1; =20 /* Default to enabling full open WEP with host based encrypt/decrypt */ - ieee->host_encrypt =3D 1; ieee->host_decrypt =3D 1; ieee->ieee802_1x =3D 1; /* Default to supporting 802.1x */ =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index c1e5127f5251..23b33a239703 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -807,7 +807,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_= device *ieee, } =20 crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; - encrypt =3D ieee->host_encrypt && crypt && crypt->ops && + encrypt =3D crypt && crypt->ops && ((strcmp(crypt->ops->name, "R-WEP") =3D=3D 0 || wpa_ie_len)); if (ieee->ht_info->bCurrentHTSupport) { tmp_ht_cap_buf =3D (u8 *)&(ieee->ht_info->SelfHTCap); @@ -943,10 +943,7 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib= _device *ieee, u8 *dest) assoc->capability |=3D cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); =20 - if (ieee->host_encrypt) - crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; - else - crypt =3D NULL; + crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; =20 encrypt =3D (crypt && crypt->ops); =20 @@ -1115,7 +1112,7 @@ rtllib_association_req(struct rtllib_network *beacon, =20 crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; if (crypt !=3D NULL) - encrypt =3D ieee->host_encrypt && crypt && crypt->ops && + encrypt =3D crypt && crypt->ops && ((strcmp(crypt->ops->name, "R-WEP") =3D=3D 0 || wpa_ie_len)); else @@ -2995,8 +2992,7 @@ u8 rtllib_ap_sec_type(struct rtllib_device *ieee) =20 crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; encrypt =3D (ieee->current_network.capability & WLAN_CAPABILITY_PRIVACY) - || (ieee->host_encrypt && crypt && crypt->ops && - (strcmp(crypt->ops->name, "R-WEP") =3D=3D 0)); + || (crypt && crypt->ops && (strcmp(crypt->ops->name, "R-WEP") =3D=3D 0= )); =20 /* simply judge */ if (encrypt && (wpa_ie_len =3D=3D 0)) { diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index ec038ef806c3..24fd40284420 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -635,8 +635,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struc= t net_device *dev) =20 skb->priority =3D rtllib_classify(skb, IsAmsdu); crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; - encrypt =3D !(ether_type =3D=3D ETH_P_PAE && ieee->ieee802_1x) && - ieee->host_encrypt && crypt && crypt->ops; + encrypt =3D !(ether_type =3D=3D ETH_P_PAE && ieee->ieee802_1x) && crypt = && crypt->ops; if (!encrypt && ieee->ieee802_1x && ieee->drop_unencrypted && ether_type !=3D ETH_P_PAE) { stats->tx_dropped++; --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF068EB64DA for ; Sat, 24 Jun 2023 06:05:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232224AbjFXGE6 (ORCPT ); Sat, 24 Jun 2023 02:04:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231782AbjFXGEh (ORCPT ); Sat, 24 Jun 2023 02:04:37 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47B1D2973 for ; Fri, 23 Jun 2023 23:04:27 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-51d889ab483so7656a12.0 for ; Fri, 23 Jun 2023 23:04:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586665; x=1690178665; 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=fhgLWURJLJ0rJaEbeqsW7RwSsP/DgHDe24zdRNsd7Jc=; b=bOn/KYDUcZmKIj2wiWX99Rn27ZtNBWdf28r2p7VV1TFiPpVukTl6F3QBX47yPSodsr Ka0jdEuQjfOnYw9SRQY+LYXU/5cPukLfvHxlN6smtiwT6Ae/x2I3kBK9z4LOEkko/lVB f7IIaCAB7TAL7juyAT5mHWgfpSqNneSNfoxpZojeuB3NHYRZ3+lfAzRSgbYkZpSXHq8D 5Mjl7x1b0pCCf2VGaZ9M3EGPBxI+i2tdZKrshXgfjoWP87c1HWz/7pzLgK06lgjjIPn4 44WuyK61QRXQtxH/FyvOIf88Dwdfs34prCbLbL9NkZ7APDAInE0a6A4znJkEPEF9v1oM JtLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586665; x=1690178665; 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=fhgLWURJLJ0rJaEbeqsW7RwSsP/DgHDe24zdRNsd7Jc=; b=WZObbh/oswQfqVc5eFBYoMtTVTUrxeF+lOayFRSqMgw/wKCZzQaEznQEBEqm7D1Ajr wjaIQqxKLAdWLm4uICZ+JTGT8Z8SbrMV3mKNTWgwwL/BfG1inq8jtTmyL+KQWBAFvGKm 3zQCkwzSuKJ9Y3JjaXvDa2L3d/eFS6OwbcqvxkcTacjlsdvWFS3/KZYvgKEBHYTlHQ44 8TK7UgaRhViTJOeNTNRq5yhIi8Qd8PfQIXiUCAI/VAagX5lm/lmMNA3QFRAeAU8KRvlI 36fuluNEX6VA3srxWoBzmNk3BXXYgAyHOkmsdwDmIEPbbuEWnni/ngrUWb7PorcHRXUF F4Hg== X-Gm-Message-State: AC+VfDymP+Q3rt5XM+Y2yrwitYhrBUmX3XHIWW1Jwn94bZYAmXxI54+v 2fqASxrDtBg9lrDFBNplNUF6c33XPYU= X-Google-Smtp-Source: ACHHUZ510/CzRsk49Czdt+PTrGn6hMc1uVFargnZAs1Tut18/r+7Xlt1Sv/huoJlQ1WbIDffkQe+2A== X-Received: by 2002:a17:906:64cc:b0:987:115d:ba06 with SMTP id p12-20020a17090664cc00b00987115dba06mr17239021ejn.4.1687586665381; Fri, 23 Jun 2023 23:04:25 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id z19-20020a170906241300b00988fea46663sm493356eja.129.2023.06.23.23.04.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:04:23 -0700 (PDT) Date: Sat, 24 Jun 2023 08:04:20 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] staging: rtl8192e: Remove variable host_decrypt as it is constant Message-ID: <637350e9bc3edded665009a30d12350157e8a9a9.1687583718.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ieee->host_decrypt also named priv->rtllib->host_decrypt is initialized to 1 and then unchanged. All evaluations will result accordingly. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtllib.h | 3 -- drivers/staging/rtl8192e/rtllib_module.c | 2 - drivers/staging/rtl8192e/rtllib_rx.c | 44 ++++++++++---------- 4 files changed, 21 insertions(+), 29 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 838b9c8b0df7..2f504a4838a8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -804,7 +804,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rtllib->iw_mode =3D IW_MODE_INFRA; priv->rtllib->active_scan =3D 1; priv->rtllib->be_scan_inprogress =3D false; - priv->rtllib->host_decrypt =3D 1; =20 priv->rtllib->fts =3D DEFAULT_FRAG_THRESHOLD; =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 80090f8a38e7..c7f800a0c48c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1440,9 +1440,6 @@ struct rtllib_device { * WEP key changes */ =20 - /* If the host performs {en,de}cryption, then set to 1 */ - int host_decrypt; - int ieee802_1x; /* is IEEE 802.1X used */ =20 /* WPA data */ diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl= 8192e/rtllib_module.c index 2ad2e3671ec4..2416e0c60255 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -97,8 +97,6 @@ struct net_device *alloc_rtllib(int sizeof_priv) ieee->scan_age =3D DEFAULT_MAX_SCAN_AGE; ieee->open_wep =3D 1; =20 - /* Default to enabling full open WEP with host based encrypt/decrypt */ - ieee->host_decrypt =3D 1; ieee->ieee802_1x =3D 1; /* Default to supporting 802.1x */ =20 ieee->rtllib_ap_sec_type =3D rtllib_ap_sec_type; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 91dd3c373aef..195ce0fecd29 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1035,29 +1035,27 @@ static int rtllib_rx_get_crypt(struct rtllib_device= *ieee, struct sk_buff *skb, u16 fc =3D le16_to_cpu(hdr->frame_ctl); int idx =3D 0; =20 - if (ieee->host_decrypt) { - if (skb->len >=3D hdrlen + 3) - idx =3D skb->data[hdrlen + 3] >> 6; + if (skb->len >=3D hdrlen + 3) + idx =3D skb->data[hdrlen + 3] >> 6; =20 - *crypt =3D ieee->crypt_info.crypt[idx]; - /* allow NULL decrypt to indicate an station specific override - * for default encryption + *crypt =3D ieee->crypt_info.crypt[idx]; + /* allow NULL decrypt to indicate an station specific override + * for default encryption + */ + if (*crypt && ((*crypt)->ops =3D=3D NULL || + (*crypt)->ops->decrypt_mpdu =3D=3D NULL)) + *crypt =3D NULL; + + if (!*crypt && (fc & RTLLIB_FCTL_WEP)) { + /* This seems to be triggered by some (multicast?) + * frames from other than current BSS, so just drop the + * frames silently instead of filling system log with + * these reports. */ - if (*crypt && ((*crypt)->ops =3D=3D NULL || - (*crypt)->ops->decrypt_mpdu =3D=3D NULL)) - *crypt =3D NULL; - - if (!*crypt && (fc & RTLLIB_FCTL_WEP)) { - /* This seems to be triggered by some (multicast?) - * frames from other than current BSS, so just drop the - * frames silently instead of filling system log with - * these reports. - */ - netdev_dbg(ieee->dev, - "Decryption failed (not set) (SA=3D %pM)\n", - hdr->addr2); - return -1; - } + netdev_dbg(ieee->dev, + "Decryption failed (not set) (SA=3D %pM)\n", + hdr->addr2); + return -1; } =20 return 0; @@ -1083,7 +1081,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ie= ee, struct sk_buff *skb, ieee->need_sw_enc =3D 0; =20 keyidx =3D rtllib_rx_frame_decrypt(ieee, skb, crypt); - if (ieee->host_decrypt && (fc & RTLLIB_FCTL_WEP) && (keyidx < 0)) { + if ((fc & RTLLIB_FCTL_WEP) && (keyidx < 0)) { netdev_info(ieee->dev, "%s: decrypt frame error\n", __func__); return -1; } @@ -1147,7 +1145,7 @@ static int rtllib_rx_decrypt(struct rtllib_device *ie= ee, struct sk_buff *skb, /* skb: hdr + (possible reassembled) full MSDU payload; possibly still * encrypted/authenticated */ - if (ieee->host_decrypt && (fc & RTLLIB_FCTL_WEP) && + if ((fc & RTLLIB_FCTL_WEP) && rtllib_rx_frame_decrypt_msdu(ieee, skb, keyidx, crypt)) { netdev_info(ieee->dev, "%s: =3D=3D>decrypt msdu error\n", __func__); return -1; --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B8A24EB64DD for ; Sat, 24 Jun 2023 06:06:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232327AbjFXGGD (ORCPT ); Sat, 24 Jun 2023 02:06:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232240AbjFXGFe (ORCPT ); Sat, 24 Jun 2023 02:05:34 -0400 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 C0F542D61 for ; Fri, 23 Jun 2023 23:05:03 -0700 (PDT) Received: by mail-wm1-x334.google.com with SMTP id 5b1f17b1804b1-3f3284dff6cso3876985e9.0 for ; Fri, 23 Jun 2023 23:05:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586696; x=1690178696; 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=tet128yKFRAGmSck7VlR0R9HJycI8gkXHzRpAiz+cp4=; b=XfHsYRrLcYvqHbX5mezvMVFndkXXC8t3V60vN4rVd2S9FF4ERl+n/SESuVPhz6xE47 cKxcdjuq6csWg/Kg7tPwZRDn39A5TY3mlGMSD+Q9guhvByGPSlcyTvLrEH3Ij2rXSAz8 o3Jv8WEazYUFg3mt64C/Y+hRsbVJJmFiUdwq1oKXA58Mev1oTalYG3wuvWkwxNtjAvSt InyTT2idm4xMeg9XEGg+Y7DkOUKkmhYOEPvFiq2H6giwr7OyuwTu6IQuN+uUA25imLf7 SraojVtfkSHZXs2KwPE+5hPqqZ/oesb0th0qPCXHWSl9auPjXyAmgwqqlyuvoEmgoD55 WszQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586696; x=1690178696; 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=tet128yKFRAGmSck7VlR0R9HJycI8gkXHzRpAiz+cp4=; b=Dxk1MT86qrAis4qyAwW6Z1d9VWAr9YNnDpkRvGvZTzFj35MX8g1cZt/Dt9AjcJto6Q b9aKRo604Hb6xvYPpNzcd9ba8u73nr1AWYebCLp8wsXut8wOPHzzSpFvwTg4CDyslnBe KFY18441/lfFzshzSlX5h349nbJO9aDWV6UQDcbCSZVZYhflp3EZ/3I3K+kPNaFFNizg FSj7+/kjkjN1rRf3nSJb+Sak3assOVC+hA56InANeqQF4tPLTJmCcH9fI9NOOXhK2ToT I66v9jDy9CuPvGGtLq/QUDR9SxaGCzxu/iWM1jo9gFu5Owlcybjbi75U0G3KuPBkKJNZ OpAg== X-Gm-Message-State: AC+VfDzfEasW8Ao911HQ1fkttjFqiSSERp2Esas2C9COfqsR0f08Vv0A 1wKrtgAGCKkXex3papiWtFF6RYMJuzo= X-Google-Smtp-Source: ACHHUZ4eBS7OlQqScAhFpM4221U82I1snsSK/VLUX/ku9G/PMGOJnrVE3ffTabuNO72GZ0sAbIMBQg== X-Received: by 2002:a05:6402:2787:b0:516:463d:8a10 with SMTP id b7-20020a056402278700b00516463d8a10mr16811642ede.3.1687586674935; Fri, 23 Jun 2023 23:04:34 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id p2-20020a056402044200b0051beb873d98sm311422edw.27.2023.06.23.23.04.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:04:31 -0700 (PDT) Date: Sat, 24 Jun 2023 08:04:27 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] staging: rtl8192e: Remove variable card_type Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove variable card_type as it is initialized but never unused. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 -- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 ------ 2 files changed, 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 2f504a4838a8..e9eb55c6e6d8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -807,8 +807,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) =20 priv->rtllib->fts =3D DEFAULT_FRAG_THRESHOLD; =20 - priv->card_type =3D PCI; - priv->fw_info =3D vzalloc(sizeof(struct rt_firmware)); if (!priv->fw_info) netdev_err(dev, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index ec9e454299a8..1cb68d53a17e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -259,12 +259,6 @@ struct r8192_priv { u8 polling_timer_on; =20 /**********************************************************/ - - enum card_type { - PCI, MINIPCI, - CARDBUS, USB - } card_type; - struct work_struct qos_activate; =20 short promisc; --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFE80EB64DA for ; Sat, 24 Jun 2023 06:05:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232098AbjFXGFb (ORCPT ); Sat, 24 Jun 2023 02:05:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231991AbjFXGFG (ORCPT ); Sat, 24 Jun 2023 02:05:06 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26BC82D41 for ; Fri, 23 Jun 2023 23:04:42 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id 4fb4d7f45d1cf-51669dd574aso316593a12.0 for ; Fri, 23 Jun 2023 23:04:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586680; x=1690178680; 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=3T8C4UeShnoX/kA2p4evbH04NRgTdKwA7ilNwmOPeH0=; b=pNUfGZIMcZt4266HC7Nas0DONedBslUQYOy3Czp9p8MV4CWAnYLwGRRKhcKab5krAX 1yPxP+HdqWZETrukA8IcpXyy6wMu+CwDuzoVftHhFg+3wrOXCIQKVthogfobjSyZbR3E QuSiGPuoRf4Sn62DDG9PyaG4H718xXgFYcTIOSFwoT+CYoEjwGjq5slkG7HdojNSo553 SGvNNnqwNzfIVtaHT41O9FOnFZkVmdTM/wHAmv82Nu6iaPLu9pIa/tPmTiZek5g8rqOE UPYuf7AzQ3cf1U1UoVFh3CzGqrUr+AEBBEr0aHnSj2MyjhV13mVIEIFzFHbVDtFqgsLl BxYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586680; x=1690178680; 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=3T8C4UeShnoX/kA2p4evbH04NRgTdKwA7ilNwmOPeH0=; b=dd3gP8WvEMR4K3yTCNX/6ReVDvwMet233bhhcrQr0mvdnJt9fYh1biKoLyx89B+yR2 QvjvZZQGHz3dXwQTs+2nlUfGU2EhJufNaF9oYjM9Tp/T1jqrdy1xRE4p95uVXVK8Y0VC 32NmNFc4UVUNWeoV1tU67dTMCgAkTqlL8RV70fbCT9sxPQxwCQoJK6FAuA70wOEczVgy ekw1mkxa/UI0+gi2FPJH92tBUEb/AH7zGnINxH0ZOVHyWnXG9YzGQX1fkW7EsXM3nIy9 tkIGFR5McjvIczJaU5xXngoM3DBzJZiw5gliANtXzkT9HTltB7XmQ6i+qoX+jiwLTetC 2/Ew== X-Gm-Message-State: AC+VfDz3Ome92pG9IsH7TOswTWbi8sA6fxGr8ZeAWgaj65ekHFueITSb nJ9Y6fJPq8MdkSsi0vSm5A4= X-Google-Smtp-Source: ACHHUZ6rsTFYz7kROdutExy2vh/9WiuzbEnae/KU3XYefeFprKV5Shivkn2H8Wnar8MfFuUhr85ZrA== X-Received: by 2002:a05:6402:270f:b0:514:971b:7f36 with SMTP id y15-20020a056402270f00b00514971b7f36mr17612423edd.3.1687586680385; Fri, 23 Jun 2023 23:04:40 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id d26-20020aa7d69a000000b0051bfd21d21asm319307edr.46.2023.06.23.23.04.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:04:39 -0700 (PDT) Date: Sat, 24 Jun 2023 08:04:36 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] staging: rtl8192e: Remove variable bdisable_nic Message-ID: <6b083ce8c4aaf42f366c365cbc47178afa2636d4.1687583718.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove variable bdisable_nic as always set to false. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 ------------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 2 files changed, 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index e9eb55c6e6d8..23f9b729940b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -618,8 +618,6 @@ static int _rtl92e_sta_up(struct net_device *dev, bool = is_silent_reset) (&priv->rtllib->pwr_save_ctrl); bool init_status; =20 - priv->bdisable_nic =3D false; - priv->up =3D 1; priv->rtllib->ieee_up =3D 1; =20 @@ -760,7 +758,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->up_first_time =3D 1; priv->blinked_ingpio =3D false; priv->being_init_adapter =3D false; - priv->bdisable_nic =3D false; priv->txringcount =3D 64; priv->rxbuffersize =3D 9100; priv->rxringcount =3D MAX_RX_COUNT; @@ -1498,12 +1495,6 @@ static short _rtl92e_tx(struct net_device *dev, stru= ct sk_buff *skb) int idx; u32 fwinfo_size =3D 0; =20 - if (priv->bdisable_nic) { - netdev_warn(dev, "%s: Nic is disabled! Can't tx packet.\n", - __func__); - return skb->len; - } - priv->rtllib->bAwakePktSent =3D true; =20 fwinfo_size =3D sizeof(struct tx_fwinfo_8190pci); @@ -2245,20 +2236,17 @@ bool rtl92e_enable_nic(struct net_device *dev) =20 if (!priv->up) { netdev_warn(dev, "%s(): Driver is already down!\n", __func__); - priv->bdisable_nic =3D false; return false; } =20 init_status =3D rtl92e_start_adapter(dev); if (!init_status) { netdev_warn(dev, "%s(): Initialization failed!\n", __func__); - priv->bdisable_nic =3D false; return false; } RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); =20 rtl92e_irq_enable(dev); - priv->bdisable_nic =3D false; return init_status; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 1cb68d53a17e..38b215d86eeb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -322,7 +322,6 @@ struct r8192_priv { =20 bool rf_change_in_progress; bool set_rf_pwr_state_in_progress; - bool bdisable_nic; =20 u8 cck_pwr_enl; u16 tssi_13dBm; --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63DB5EB64DA for ; Sat, 24 Jun 2023 06:05:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232339AbjFXGFk (ORCPT ); Sat, 24 Jun 2023 02:05:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232358AbjFXGFQ (ORCPT ); Sat, 24 Jun 2023 02:05:16 -0400 Received: from mail-ej1-x62f.google.com (mail-ej1-x62f.google.com [IPv6:2a00:1450:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D2B6B30E6 for ; Fri, 23 Jun 2023 23:04:48 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-98de322d11fso10898566b.1 for ; Fri, 23 Jun 2023 23:04:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586687; x=1690178687; 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=JL2xUdrdhCmATetXsGKZFgi47jUsLBSoXQ95GNpVaGk=; b=jUnpVHYWYziKREX/8pUNaOPhrJbKE/3FgNWxsqvU80aAmKeZ5Iy3PdjTQsAD/AIPKV rUXSdVBDPYiuiphlnpzV0XKH8GqoxYzazLJ0HD1bwNxad1xGT99IpJzHVQvVQAnSjYhU glDY3VkkpKMftngSQyc70Il7EYepl7AwL0Hf5A77CFLUXyYkk45kHz63clZjM7e4kPZh St8/61LvxeM4bXV2rKvGXOeXw/Qo2oRSWotw+nALaV+OS1yr0QYQWAjoW6QF+fH707dG l/RVbDpw/DNYAkCq6JV0iiT/ymShnZKVakEfM1VBfa080SrO6VWI9Oov/EZfW4o99CNW vU+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586687; x=1690178687; 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=JL2xUdrdhCmATetXsGKZFgi47jUsLBSoXQ95GNpVaGk=; b=B/NG7ZbggNKpwq0Hy8B++zkN0yQ6Netw3Uenb0tdQAJz0lUVWVtHgnPm3mnaL3ntj7 aZT14xGhJppmztKjj/ptXbL52stwYc7U6RAzUM0WV628YNVP34noC1MPWb/b+7/IivCe 1ux4DY6ShW1X7/sCrdAvbhMj4m7hzeAZ/83muGKXFSUYBCukLGSq8pHGQLZtFVHl+5vZ Zbf1MlOqTSlUuuHY03Vm3+OUZSg8HLAfybPi6nBeMD4EB59F7XB7DntH5666jWLLTuEJ ymrtr5tI0BU2Y9gcf8O48iazukIuk2DBQ44z301Nx7YMuX87yVoKh0K4pNNCz+hoBjJZ UAXg== X-Gm-Message-State: AC+VfDzZfTydANNxvoN3NZJQG1+NgcOH7j9wGiMNJl3Tm8MZBAuvR/5E g8RjXGiAxHmW6E+S+6lNEe4= X-Google-Smtp-Source: ACHHUZ7Hy5IZ4Cn5agaSCY+j7xto3ytCgNnb98Wyez5BlPOzoT/MgNwM717Qks4R1+wYQzWf5Lk3JA== X-Received: by 2002:a17:906:5198:b0:987:6960:36c8 with SMTP id y24-20020a170906519800b00987696036c8mr15752481ejk.7.1687586687048; Fri, 23 Jun 2023 23:04:47 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id xa10-20020a170907b9ca00b00988955f7b5esm501331ejc.157.2023.06.23.23.04.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:04:46 -0700 (PDT) Date: Sat, 24 Jun 2023 08:04:44 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] staging: rtl8192e: Remove variable priv->reg_chnl_plan Message-ID: <0dd4f8eded4b172d75f0cb5d5a34ba3dc66e2e8f.1687583718.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove variable priv->reg_chnl_plan as it is only once initialized and only once evaluated. So the result is always the same. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 5 +---- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 1 - 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index e5925899402c..5ac6af7e3a79 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -419,10 +419,7 @@ static void _rtl92e_read_eeprom_info(struct net_device= *dev) =20 rtl92e_init_adaptive_rate(dev); =20 - if (priv->reg_chnl_plan =3D=3D 0xf) - priv->chnl_plan =3D priv->eeprom_chnl_plan; - else - priv->chnl_plan =3D priv->reg_chnl_plan; + priv->chnl_plan =3D priv->eeprom_chnl_plan; =20 switch (priv->eeprom_customer_id) { case EEPROM_CID_NetCore: diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 23f9b729940b..a24527585166 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -763,7 +763,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rxringcount =3D MAX_RX_COUNT; priv->irq_enabled =3D 0; priv->chan =3D 1; - priv->reg_chnl_plan =3D 0xf; priv->rtllib->mode =3D WIRELESS_MODE_AUTO; priv->rtllib->iw_mode =3D IW_MODE_INFRA; priv->rtllib->net_promiscuous_md =3D false; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 38b215d86eeb..fa82a0667813 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -316,7 +316,6 @@ struct r8192_priv { =20 bool tx_pwr_data_read_from_eeprom; =20 - u16 reg_chnl_plan; u16 chnl_plan; u8 hw_rf_off_action; =20 --=20 2.41.0 From nobody Sat Feb 7 17:55:35 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D66BCEB64DA for ; Sat, 24 Jun 2023 06:05:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232184AbjFXGF6 (ORCPT ); Sat, 24 Jun 2023 02:05:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60288 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232191AbjFXGFb (ORCPT ); Sat, 24 Jun 2023 02:05:31 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 54CD92D59 for ; Fri, 23 Jun 2023 23:04:59 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-98de322d11fso10899566b.1 for ; Fri, 23 Jun 2023 23:04:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687586696; x=1690178696; 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=2BWbcO1nwvpd6S1p5aHK6YNqJsjh6u2uTKVKHyBrc6U=; b=gyaBU3hGEcyfDQFaVIoIY85LxuTTosEfx7uk3Z1KH5gcty1zpE+PlK0OX6wNvY5nfa h3rllOG9uoSGkj+5OWoYL01CCqYIJshQ+NBJgD/S6zSUsadEaq2lnwtF7Cir0LUIw4GP ldkRQKotJegsLHJP7UoRvpXJ0b+FV7o1VGswEURyK+jHVoXJCosavKnvdExIRm7R1Y6b CIXKOdUV0dOVeAdK7dd9Xd8QxPupqVUrnO62TMmON4CzYNchuUq96J4t282qDgQqqPKQ jNkF60rbsTy2bP1KUzb7PXNKLStMZ0r/wjk3K7r9zRPbSeeXeiDCejSek0aLhmSCo8Vm 0Y0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687586696; x=1690178696; 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=2BWbcO1nwvpd6S1p5aHK6YNqJsjh6u2uTKVKHyBrc6U=; b=Pk+UgZ7rzY8B1GXPpyXaILEYsLVsCj0eRgxGsrDm/RI1GaQcJSe2Q6c6gtmOfnePep inho86jeRQpJw9y6BAxy0asuPC0WaSyM/vBoW2aYu/COmRItO4d+tZCxcH5qhmfPOxla fA52RbqzBTWpr2ElIdlo6eArEmuhdLQIyI9QFOmJKtIxYeXTs8flbF3MRrf9RM4tNYJs m3x2C0E9DiKJkZI9BDKGEu1EGv/KNRKXAaEJpDpxg3WlHooq+6ObiD0b3IpLrTiJbI99 42x8UhTFNcliXUBz3qYtJBJF7bzWn94+ZAC76hUk9yyxjUvAd4lsQ1kjH23zlQrBL55t FW0g== X-Gm-Message-State: AC+VfDz6jzRpV1RqhhzMin9wyPSDx4YGSSFDOjM7qBwtHDDy3+8tjiA7 3g2KEs1isRUNl8UnSFeVEuZhyaDrkl0= X-Google-Smtp-Source: ACHHUZ7be3ZRgN7ScfoKn8GtZlHQKSPn4jcQARRkgRHFYt1lBd1H8O8ZdujY0N/htmY1NI/zWgY0gQ== X-Received: by 2002:a17:906:64cc:b0:987:115d:ba05 with SMTP id p12-20020a17090664cc00b00987115dba05mr18950034ejn.3.1687586695801; Fri, 23 Jun 2023 23:04:55 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id a2-20020a1709065f8200b009827b97c89csm501286eju.102.2023.06.23.23.04.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Jun 2023 23:04:54 -0700 (PDT) Date: Sat, 24 Jun 2023 08:04:52 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] staging: rtl8192e: Remove variable ieee->short_slot Message-ID: <74fe53ccfafe2e0e18319b5502ed83544cc3ffd8.1687583718.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" ieee->short_slot also named priv->rtllib->short_slot is initialized to 1 and then unchanged. All evaluations will result accordingly. Remove resulting dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtllib.h | 1 - drivers/staging/rtl8192e/rtllib_softmac.c | 10 +++------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index a24527585166..aaff8d739efe 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -774,7 +774,6 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->retry_data =3D DEFAULT_RETRY_DATA; priv->rtllib->rts =3D DEFAULT_RTS_THRESHOLD; priv->rtllib->rate =3D 110; - priv->rtllib->short_slot =3D 1; priv->promisc =3D (dev->flags & IFF_PROMISC) ? 1 : 0; priv->bcck_in_ch14 =3D false; priv->cck_present_attn =3D 0; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index c7f800a0c48c..aa8abec390ca 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1486,7 +1486,6 @@ struct rtllib_device { =20 enum rtl_link_state link_state; =20 - int short_slot; int mode; /* A, B, G */ =20 /* used for forcing the ibss workqueue to terminate diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 23b33a239703..584371f0ce57 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -852,8 +852,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_= device *ieee, cpu_to_le16(ieee->current_network.capability & WLAN_CAPABILITY_SHORT_PREAMBLE); =20 - if (ieee->short_slot && (ieee->current_network.capability & - WLAN_CAPABILITY_SHORT_SLOT_TIME)) + if (ieee->current_network.capability & WLAN_CAPABILITY_SHORT_SLOT_TIME) beacon_buf->capability |=3D cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); =20 @@ -939,9 +938,7 @@ static struct sk_buff *rtllib_assoc_resp(struct rtllib_= device *ieee, u8 *dest) assoc->capability =3D cpu_to_le16(ieee->iw_mode =3D=3D IW_MODE_MASTER ? WLAN_CAPABILITY_ESS : WLAN_CAPABILITY_IBSS); =20 - if (ieee->short_slot) - assoc->capability |=3D - cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); + assoc->capability |=3D cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); =20 crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; =20 @@ -1190,8 +1187,7 @@ rtllib_association_req(struct rtllib_network *beacon, if (beacon->capability & WLAN_CAPABILITY_SHORT_PREAMBLE) hdr->capability |=3D cpu_to_le16(WLAN_CAPABILITY_SHORT_PREAMBLE); =20 - if (ieee->short_slot && - (beacon->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)) + if (beacon->capability & WLAN_CAPABILITY_SHORT_SLOT_TIME) hdr->capability |=3D cpu_to_le16(WLAN_CAPABILITY_SHORT_SLOT_TIME); =20 hdr->listen_interval =3D cpu_to_le16(beacon->listen_interval); --=20 2.41.0