From nobody Mon Feb 9 04:30:08 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 8B8C4C001DC for ; Sat, 29 Jul 2023 07:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229445AbjG2Hwo (ORCPT ); Sat, 29 Jul 2023 03:52:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229626AbjG2Hwk (ORCPT ); Sat, 29 Jul 2023 03:52:40 -0400 Received: from mail-ed1-x52c.google.com (mail-ed1-x52c.google.com [IPv6:2a00:1450:4864:20::52c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 97C6E4208 for ; Sat, 29 Jul 2023 00:52:38 -0700 (PDT) Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5221ee3dd76so832909a12.0 for ; Sat, 29 Jul 2023 00:52:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617157; x=1691221957; 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=ktco/0n5t/HDVDJQ8DdZKkOO0x7lbAhQv9MKtg9SERo=; b=QLo4auealrQ/TNfcwOTZ5nzxBOH1Aw3ZFwSBEyD+UD4WR9dFt3jFwhvzzqZEw+vrqD dUSAdUoFqLQEwRXRY3p0TiZNcX0zaVyfupBE0N6D3ktDUNFe6FmhFJ2/kF3Nftgtohib j5vMrvhVlqz40FsruiNBFJNIqQxDR3+8o5/cE4DwTh6Tu2Pq0fsWeVcI0JmVcfg+uQp9 ZNGiboohVpHtEkuhC/DlkAhzmT0rxaAKCOAGLY0Nsl/tfi3/1wbfcBAOjzXqAdFrDAr/ eKXBZS8iUJM7rwTR8y3EHYz/vqGquyuxpnbaWF7+bNUsbLnSxcHkoh44HszCI3QfuPTT MpdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617157; x=1691221957; 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=ktco/0n5t/HDVDJQ8DdZKkOO0x7lbAhQv9MKtg9SERo=; b=AtvQ3YtmgF44e2tQL9zQdLIVIyR7guJ4M/d9T3Mm76ZEFz/xHT0v9w0S67sBbfbPg0 +XwMI6FTx9YxKmDzZ6+f9TM2kVlV/OKnr3IJbMS7j2i+EQt4S78EH47EtjONmzPCmABX R8wb2runFbUPICRhaWSZU4itWrWsni7hOXzJI6cESK6y2g3VZpEh537OTfoleJ0FkfKh bgZZaJ6XIIGHRsnuRC61uvPvBkiBSkUeCtq9+fD1aQ9i09p4bK/P7gTwtY09sBuxhY9q psmDtuGkeMAusuf0wG1tJefzNIUFqRKmV1QPHPbfL84wZnxM+tTEeTo92AKoQxcsTSjn +VyQ== X-Gm-Message-State: ABy/qLaxv4Uup0jfUrfXkVaP/KoK9AEbPw0YzE1V++RhroAAYVKn/W2g hN60TipO2N5EYIevb/sGNDA= X-Google-Smtp-Source: APBJJlGZILCzcfl6g9OzlFTMCyGvQlM75U3RGWYE5aOC0anDRMckkWuY44EQvBI6MuX9F/iO52cr3w== X-Received: by 2002:a17:906:112:b0:99b:c845:7917 with SMTP id 18-20020a170906011200b0099bc8457917mr1448447eje.4.1690617156836; Sat, 29 Jul 2023 00:52:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id i10-20020a170906250a00b0099304c10fd3sm2981025ejb.196.2023.07.29.00.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:52:36 -0700 (PDT) Date: Sat, 29 Jul 2023 09:52:34 +0200 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 variable p_intb Message-ID: <196f555d3762bf4fa8302f19b46f1510ea68cb31.1690615475.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 variable p_intb of rtl92e_ack_irq. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 5ac6af7e3a79..5bfd84b08dd9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1912,7 +1912,7 @@ void rtl92e_enable_tx(struct net_device *dev) rtl92e_writel(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma); } =20 -void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb) +void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta) { *p_inta =3D rtl92e_readl(dev, ISR); rtl92e_writel(dev, ISR, *p_inta); diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.h index fa3b71dbb091..11366fda4ec3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h @@ -13,7 +13,7 @@ bool rtl92e_is_halfn_supported_by_ap(struct net_device *d= ev); bool rtl92e_get_nmode_support_by_sec(struct net_device *dev); bool rtl92e_is_tx_stuck(struct net_device *dev); bool rtl92e_is_rx_stuck(struct net_device *dev); -void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta, u32 *p_intb); +void rtl92e_ack_irq(struct net_device *dev, u32 *p_inta); void rtl92e_enable_rx(struct net_device *dev); void rtl92e_enable_tx(struct net_device *dev); void rtl92e_enable_irq(struct net_device *dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index aaff8d739efe..cfad170008c6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1982,7 +1982,7 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev) =20 spin_lock_irqsave(&priv->irq_th_lock, flags); =20 - rtl92e_ack_irq(dev, &inta, &intb); + rtl92e_ack_irq(dev, &inta); =20 if (!inta) { spin_unlock_irqrestore(&priv->irq_th_lock, flags); --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 9AF76C04A6A for ; Sat, 29 Jul 2023 07:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229917AbjG2Hww (ORCPT ); Sat, 29 Jul 2023 03:52:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49892 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229835AbjG2Hwt (ORCPT ); Sat, 29 Jul 2023 03:52:49 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C46693A84 for ; Sat, 29 Jul 2023 00:52:45 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-99bd67facffso77485266b.0 for ; Sat, 29 Jul 2023 00:52:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617164; x=1691221964; 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=1szKMdZwkmMXHdwn2jyX7UsMVVQqZQ9qEgjK+BqxWBI=; b=eS69vhUXOsdSXZwFmG35XILBdgDz0M7uz/0odSm3CtIssI6jH9sFoq8XsReS3Md9UV kmHgRTzVXFNjo8Pl6fuPxeQzQzlcIn5/DON8uHqJPdkgSqv2LEt9fonzC5McB8344+le M+fHRGkI0NDH25AtvMNlbRUm4t+F7ZHPVjFKIR3lZ5BH5sAUG5KuTQBdj/qySxGP0Zm9 hENzd7vCcKa7nCol/WYeWfKvKXntzvpCpMc3U5wcz12OE+laCDH/Y/EBWFZw2lhHtNLU nTVRK5OtBcPIfbuSbAGHJ7xBz1PKdLy2ZzSYuisGmDhiahHzkFt1q8+MofjAuspcUDVO bG/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617164; x=1691221964; 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=1szKMdZwkmMXHdwn2jyX7UsMVVQqZQ9qEgjK+BqxWBI=; b=Zuh6T4iKm3B/XnCZUrNthsA3rIBP2sdOgIYh0Sz/+4BUREItcQhwos2mXtrVRJRouj 0wma8eBH864ktD7SRHWRYnuDUjXBph3+S2UefGWNI0FlwoewHKKmD0m7b4MG/01lgnwy VsmPw5f2Tg2nifVv5MCAPGju/PtMKx9oSh1dImwmrkHmukWz7OPXUj3a5JWbjuNzkov+ ri47uLV2ZErPtBwOLOolD17qkHOPCxdPCRgXXhKTcrUBBoJkR5oRUo9HYrTIpjW/IBrL LUXdWoiiylWiBbAzcJeFdL9B8vCCDAwgIj6c4Y4QGTAxD7r0jPhZu3yb+/hujzKnhqrJ Qr2Q== X-Gm-Message-State: ABy/qLbPTt3X5YtHDx+fGXD4nT/qXSEhTi/jIVEgIe/2V9zsfCn9LUdo N3qKMue/3z1e0bHyT8yFJKk= X-Google-Smtp-Source: APBJJlHFgqfYGjEPpuk8F4KBojbefOXxDsu5/wnHBcsSPQsaf8kti6nZ1y7poN8nypQESxruJo0tRw== X-Received: by 2002:a05:6402:2708:b0:521:f2a7:d57a with SMTP id y8-20020a056402270800b00521f2a7d57amr1369926edd.2.1690617164037; Sat, 29 Jul 2023 00:52:44 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id z17-20020a170906815100b0099bcdfff7cbsm2964854ejw.160.2023.07.29.00.52.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:52:43 -0700 (PDT) Date: Sat, 29 Jul 2023 09:52:41 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Remove unused variable intb in _rtl92e_irq() Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Remove unused variable intb in _rtl92e_irq(). Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index cfad170008c6..50eb8f3494ec 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1973,9 +1973,6 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev) struct r8192_priv *priv =3D rtllib_priv(dev); unsigned long flags; u32 inta; - u32 intb; - - intb =3D 0; =20 if (priv->irq_enabled =3D=3D 0) goto done; --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 AA83FC41513 for ; Sat, 29 Jul 2023 07:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229939AbjG2HxF (ORCPT ); Sat, 29 Jul 2023 03:53:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50190 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229682AbjG2HxD (ORCPT ); Sat, 29 Jul 2023 03:53:03 -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 07705F3 for ; Sat, 29 Jul 2023 00:52:55 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-99bd67facffso77488666b.0 for ; Sat, 29 Jul 2023 00:52:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617174; x=1691221974; 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=s2H6tflOurC5lB+k8RugmRyTItQh4+yHSnzSMw6/Y4c=; b=lhjvhARPFi4OFqqhJd6llr2p5r8VZOARMkKfsdPLXLh4lJKDTmtBXs6rMHuNX/x5UD nNVQJM/RW5Cu+QkrGGpMyJJQd5xy7jX5IL2lqZJnfL/SLMHwaC0U3hNW4Kxqw7QMYPa/ sE6N3fuWcZdp1PdjZrnsPD0M0Eirq56o1IesuM4YpIZka3WYbRfdYRitHRFx+Sc+AwSR 7d65neDmpOd032wJxQkSh+i6n3lQZlsDL4J3yrNEOE/ls7zusFPs9IYRORr/uqNOOQ8h k5Jdx0ogMwDN5spHGCcams+FKNVP5ZhE2Can+IaLAGgp7/NnWCntmiXAIaeNCcG8gZer gLWQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617174; x=1691221974; 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=s2H6tflOurC5lB+k8RugmRyTItQh4+yHSnzSMw6/Y4c=; b=VJYLk/EzzJl6rl7WOgRb4rMLSBx6ipfLHfoc5w3Pp9Hu0olCSh3/rHsAob7AMCC9Pr xQYA6ns9NJklNFkDHdyDPpknFaX1Ll3X+96LxR3BfClSEdUMZEd1thfbmmXaWmoSFBGb RmkzQl90h20nwlLc9uZIu+uqQUXqIzWMXAe07gQ8yVj0F0LqKRfF+UuB9yUs3tQnlBfd ixUKkliJbKVYRC0nRr9jidBmo1p6jzsihOIYZMRp1EO2E7c+X3a95h6ieUCG66Ugz8SQ tZ9pfXRnOHMh9WK9KraZ2mcOvgUUMVLHSqnohxkTMC6GCCuL2TY039K5yVuwvb2s8J+s LRYA== X-Gm-Message-State: ABy/qLZaBCiMi6wVyA1XKLW6Nmzb84gRMQOBiMaBnIRxq5jmc1knvW5H /71ex8Gu6rhhM5xor67RjQV/epZbdxY= X-Google-Smtp-Source: APBJJlHbHxqDmJ7Qjpy9DTyOWDjeo+wlp2ZfaBDb2aUIKGsfdiCX8tJD2hpsFxHiOPlcMDZ1gIM0GQ== X-Received: by 2002:a17:906:64c9:b0:994:33b2:c32d with SMTP id p9-20020a17090664c900b0099433b2c32dmr1196575ejn.5.1690617174016; Sat, 29 Jul 2023 00:52:54 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id z10-20020a170906714a00b00985bdb7dd5fsm2966141ejj.201.2023.07.29.00.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:52:53 -0700 (PDT) Date: Sat, 29 Jul 2023 09:52:51 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Remove empty function rtllib_rx_Master() Message-ID: <9604360121c5547cfaa282f73af5b948cdfbd769.1690615475.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" Function rtllib_rx_Master() returns always 0. Variable ret is already initialized with 0. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_rx.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 195ce0fecd29..b9d220b015f6 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1445,12 +1445,6 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device= *ieee, struct sk_buff *skb, return 0; } =20 -static int rtllib_rx_Master(struct rtllib_device *ieee, struct sk_buff *sk= b, - struct rtllib_rx_stats *rx_stats) -{ - return 0; -} - static int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *s= kb, struct rtllib_rx_stats *rx_stats) { @@ -1510,7 +1504,6 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_b= uff *skb, break; case IW_MODE_MASTER: case IW_MODE_REPEAT: - ret =3D rtllib_rx_Master(ieee, skb, rx_stats); break; case IW_MODE_MONITOR: ret =3D rtllib_rx_Monitor(ieee, skb, rx_stats); --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 C5AFEC001E0 for ; Sat, 29 Jul 2023 07:53:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230184AbjG2HxZ (ORCPT ); Sat, 29 Jul 2023 03:53:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230042AbjG2HxW (ORCPT ); Sat, 29 Jul 2023 03:53:22 -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 E069749F5 for ; Sat, 29 Jul 2023 00:53:07 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-98273ae42d0so75725066b.0 for ; Sat, 29 Jul 2023 00:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617186; x=1691221986; 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=JtNNMKVctD5AB1/ghPcVnIk7MTbF2tjuWXvT1X7yr94=; b=fSMC6wj31p92FQd0M6sBG77NpbA8cMu7xV8Tf+cbWzl5ka0pLFp9d5WJ8r3iMOP5ZC 63+koSetpSqAmMoaRGWTBIH6FKJwrFrZzdxMdxNpk8yB30FXRNIwAFHO7Liaf1PHS555 eKWE+I4AlfJodfb23CnWQ74+huvAPms4nvDBn41vczmpgEoc/K8E8rRPoh8Nz9iMcAcr z6ghqrzdJVoACTnlSx8q48liBKBB2BgvdzymKalrsPGMVuYW79/wQBAjriAzAJI2ZTjx iwSOFw768I1wmqoJmSzUwmWg67mE/4u+cY361Uqo+d7Y/JO2ITxFO9s4DcKAcIbqJHyc DV4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617186; x=1691221986; 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=JtNNMKVctD5AB1/ghPcVnIk7MTbF2tjuWXvT1X7yr94=; b=X9APH05pVZB7h+K3E44fhqhTbZihnUELjz3SAuBSwoEo806tQln8nFp3QGelgSzJof kTGWpmvAFmcYiA+5a94Lw6cKRn2gSahmILY6HQ0MOT1qW0TVxVUjbN0Mv3Oq+PEJxQwg l6zWtYOdmbTRlQXFeuGNv+sccjmyh65aGYT3y2Alsr+vCotnXs+nbchZh1m+e5WO7FMj xPwA6K+0SJVfGTfxO+eaoYPY2jKXVwnZefhRy8pr9c0vYRFDoGFJHUQlQUraNhzalGPD Lxqkj0PBegVCIijwIrTLxbVj8O/oilrpi0/TkaJG9nRLpfvuGRlawh9bs7HTgs6ga7SX +zQg== X-Gm-Message-State: ABy/qLZzt4LwyrC/mX7lXdzkq3UysS4/eX6nCRBSWL9iRSICi3/vIwU8 Ha28Dok0NPRJlJVIGM9zrk0= X-Google-Smtp-Source: APBJJlHTzHLEeG0vOMaH+EkCFgU3IUP7z+nK1TOpr2dvGXKiJ+2zB5geKAdvUyZFiQQfGdHQf15nAQ== X-Received: by 2002:a17:906:20d0:b0:993:eed1:8f7 with SMTP id c16-20020a17090620d000b00993eed108f7mr1467115ejc.3.1690617186162; Sat, 29 Jul 2023 00:53:06 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id n21-20020a170906689500b009944e955e19sm2974774ejr.30.2023.07.29.00.53.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:53:05 -0700 (PDT) Date: Sat, 29 Jul 2023 09:53:03 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Remove empty function rtllib_rx_Mesh() Message-ID: <7c1aee16a95cd52149faf80c83b6fa19d6499913.1690615475.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" Function rtllib_rx_Mesh() returns always 0. Variable ret is already initialized with 0. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_rx.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index b9d220b015f6..8a4029f26835 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1473,12 +1473,6 @@ static int rtllib_rx_Monitor(struct rtllib_device *i= eee, struct sk_buff *skb, return 1; } =20 -static int rtllib_rx_Mesh(struct rtllib_device *ieee, struct sk_buff *skb, - struct rtllib_rx_stats *rx_stats) -{ - return 0; -} - /* All received frames are sent to this function. @skb contains the frame = in * IEEE 802.11 format, i.e., in the format it was sent over air. * This function is called only as a tasklet (software IRQ). @@ -1509,7 +1503,6 @@ int rtllib_rx(struct rtllib_device *ieee, struct sk_b= uff *skb, ret =3D rtllib_rx_Monitor(ieee, skb, rx_stats); break; case IW_MODE_MESH: - ret =3D rtllib_rx_Mesh(ieee, skb, rx_stats); break; default: netdev_info(ieee->dev, "%s: ERR iw mode!!!\n", __func__); --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 1D66AC41513 for ; Sat, 29 Jul 2023 07:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230238AbjG2Hxl (ORCPT ); Sat, 29 Jul 2023 03:53:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230005AbjG2Hxg (ORCPT ); Sat, 29 Jul 2023 03:53:36 -0400 Received: from mail-ej1-x634.google.com (mail-ej1-x634.google.com [IPv6:2a00:1450:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E54BE4227 for ; Sat, 29 Jul 2023 00:53:19 -0700 (PDT) Received: by mail-ej1-x634.google.com with SMTP id a640c23a62f3a-99bd67facffso77496066b.0 for ; Sat, 29 Jul 2023 00:53:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617198; x=1691221998; 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=9Z67sNb2ca9lHFDIHurmdit1dilARScJ78IbTHBwj2o=; b=JoAMObnuHO/2LNJ6xIuJ89HH9EW+jUz5zpp1GKfmrK4Wsp2Xk1yJq9dRyyYVjMjHW4 /U6QqsFzDGsjuo9pbb2+dQXHhDLcRbEigBe6tcTmYN++TrM6t0FP8ZlhKOTfl43YoMvf 0Rv+hthKNOdIanzQh2EOZ/pxGJjdKN/7mE0G/7P3vg0yRJ/g2Scp+PK6E4+zMub5WAyZ iJY6qJXRdNHoYXf14Hz73LKAEYqVeToTGICm7wf65oAIzeLnrzuxO8yUV9r0t1NZ40jx o5a6v4pNOz/pIjs584ukuUk0BDQXjnAAJah2VF+ID2Ff89SAOY6Kehy/2hjgeG3LW01y ny4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617198; x=1691221998; 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=9Z67sNb2ca9lHFDIHurmdit1dilARScJ78IbTHBwj2o=; b=SzYsg9jA+A/SfLsaL/8wAvoAicCHh4YLO69gkweUCaK4hBUx5kGjx34NfLXK9NU7s5 fG/2XtqmPnokcerx507DMLObgfwKI8bXde7GpTCKNDYiMxXkCNKOPA+ypKwgIyW3G8Gv N5sHI9LynYqDc3J40cA3l9lv5Bowm+rbafm2UtdfYfbFGU1ZgOPK5wqkijwdt5EqoxCQ YP8OUjxe7c6u7cYla+PY6+jlG6wpu9jj7q5wncioQBZO0q4GCziNG3THS6GZ2DCTA9Vp CRpRKRlyZwWtCkocxNgxDMMJ0WFqqTIYZUsCWsfgA0XJpPEuDRJNsjEEvmDFc/OrLdsL 7Z3g== X-Gm-Message-State: ABy/qLY4DFl2BdPmpcm1nRWYvpeUDsgGTd3CfejGd9bfohTQT6TdVIFd StToz3w3LC7Qf9i/9XYqH0cpy54/2lA= X-Google-Smtp-Source: APBJJlEHiNukjkWDySoFY2Jcu0Co64zuCrz4VCeELVb5MMsnneo1ivRg9/tHI0Ut/PR8xhHi1PG4og== X-Received: by 2002:a17:906:64c9:b0:994:33b2:c32d with SMTP id p9-20020a17090664c900b0099433b2c32dmr1197040ejn.5.1690617198132; Sat, 29 Jul 2023 00:53:18 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id a26-20020a17090640da00b009829dc0f2a0sm2992359ejk.111.2023.07.29.00.53.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:53:17 -0700 (PDT) Date: Sat, 29 Jul 2023 09:53:14 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Remove unused variable is_mesh from rtllib_send_probe Message-ID: <5b1f4b9d8f81790c151adc7f9b6611f0b5cd94a5.1690615475.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" Function rtllib_send_probe() has unused parameter is_mesh. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 584371f0ce57..06b872c1ad68 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -449,7 +449,7 @@ void rtllib_DisableIntelPromiscuousMode(struct net_devi= ce *dev, } EXPORT_SYMBOL(rtllib_DisableIntelPromiscuousMode); =20 -static void rtllib_send_probe(struct rtllib_device *ieee, u8 is_mesh) +static void rtllib_send_probe(struct rtllib_device *ieee) { struct sk_buff *skb; =20 @@ -464,8 +464,8 @@ static void rtllib_send_probe_requests(struct rtllib_de= vice *ieee, u8 is_mesh) { if (ieee->active_scan && (ieee->softmac_features & IEEE_SOFTMAC_PROBERQ)) { - rtllib_send_probe(ieee, 0); - rtllib_send_probe(ieee, 0); + rtllib_send_probe(ieee); + rtllib_send_probe(ieee); } } =20 --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 9C924C001DC for ; Sat, 29 Jul 2023 07:53:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230204AbjG2Hxs (ORCPT ); Sat, 29 Jul 2023 03:53:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230064AbjG2Hxj (ORCPT ); Sat, 29 Jul 2023 03:53:39 -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 9989335AB for ; Sat, 29 Jul 2023 00:53:25 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id 4fb4d7f45d1cf-522a9e0e6e9so309357a12.1 for ; Sat, 29 Jul 2023 00:53:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617204; x=1691222004; 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=faBqIZ3yezrIb7jUJEkGY6pcGmEoUQ5K1cfQPvpPu3Y=; b=WWLJiSrZ36YPa3OhEeXxE5Q5F6zNm9i4bWmNBky9lNgX1ICW3hhMMHsvHGtVppGqlW Ru9eQOThE2rK3m3NDBb1TM36V0g4m8bbC72Ph4mz4gSWibtE3DDV3QZDALGm9L5wFwN3 83ECAaDkqOyni3P9keuwtNTOoUAL1gdI7sTUdFVM2/adANhI4iDHPOO9/0ii6Lx91kGZ 4uYa/AU55VCwAnmSC9cn8LOaPygmIvSjh2xL4YuW3R2ERq+O1yuLfa/Y/aA8abLiboPF qWl+0aVi9pZs4K7E9FVPtKucmjduexiOj0Ft6vode+Bp9zZtnCTDeEFgPZ5/7w2GksSx hjoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617204; x=1691222004; 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=faBqIZ3yezrIb7jUJEkGY6pcGmEoUQ5K1cfQPvpPu3Y=; b=G/HB83CUeE34QDc3GyxDBc1y9YSJ2MJ+uoOWlyJLoyNfqcFkwkvUtsHU8ibYZO/sN9 YagubonoT/aEdpCTWQxmmh4r6UE0yNu++/nOZy5SPMuKlJHoOrAGZNTKyzGWY4E2Fj1e 6IvUoZ1PzTzgOc1PeHHrYnVF/yE4mIPwBR/oj0Os6NdjB/xSno4Y9iuOWorMgn+hMNd2 ZeEqgpNusPrsgRMXMLLgTPCTPf8L6s8x1Cy70Xxttt4SaPY0Oq8HEdLK4m61YR0+hR5n qEMA61uK9nxTZxOpDKJRse7zmOKNyPTzJpJQ2WUQRjCz0SltzvtUmP7T9lwy29mbPwlQ v0Xw== X-Gm-Message-State: ABy/qLYfDP9O+BrxSQeDj2LweevjGVvA4R1eh68ZWrAFobumaHIbYjTj VSkX3OVkKGzAZSuzJ/9AQl14Gd0higU= X-Google-Smtp-Source: APBJJlGxpEAKnLzA/W8E7sdqeYIbhGqonODNFSz4M8UbE9ZD9NErNo14UVcZKxjFtiZwOWaSXej6jA== X-Received: by 2002:a17:906:10c9:b0:99b:b3a1:4376 with SMTP id v9-20020a17090610c900b0099bb3a14376mr1355615ejv.2.1690617203907; Sat, 29 Jul 2023 00:53:23 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id sb2-20020a170906edc200b0099b76c3041csm3026106ejb.7.2023.07.29.00.53.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:53:23 -0700 (PDT) Date: Sat, 29 Jul 2023 09:53:21 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] staging: rtl8192e: Remove is_mesh from rtllib_send_probe_requests Message-ID: <06a4c66112e22d6131711969dd4f5ac9fab91426.1690615475.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" Function rtllib_send_probe_requests() has unused parameter is_mesh. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 06b872c1ad68..614f19603af1 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -460,7 +460,7 @@ static void rtllib_send_probe(struct rtllib_device *iee= e) } } =20 -static void rtllib_send_probe_requests(struct rtllib_device *ieee, u8 is_m= esh) +static void rtllib_send_probe_requests(struct rtllib_device *ieee) { if (ieee->active_scan && (ieee->softmac_features & IEEE_SOFTMAC_PROBERQ)) { @@ -525,7 +525,7 @@ static void rtllib_softmac_scan_syncro(struct rtllib_de= vice *ieee, u8 is_mesh) =20 ieee->set_chan(ieee->dev, ch); if (ieee->active_channel_map[ch] =3D=3D 1) - rtllib_send_probe_requests(ieee, 0); + rtllib_send_probe_requests(ieee); =20 /* this prevent excessive time wait when we * need to wait for a syncro scan to end.. @@ -587,7 +587,7 @@ static void rtllib_softmac_scan_wq(void *data) ieee->set_chan(ieee->dev, ieee->current_network.channel); =20 if (ieee->active_channel_map[ieee->current_network.channel] =3D=3D 1) - rtllib_send_probe_requests(ieee, 0); + rtllib_send_probe_requests(ieee); =20 schedule_delayed_work(&ieee->softmac_scan_wq, msecs_to_jiffies(RTLLIB_SOFTMAC_SCAN_TIME)); --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 16319C001DC for ; Sat, 29 Jul 2023 07:54:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230310AbjG2HyL (ORCPT ); Sat, 29 Jul 2023 03:54:11 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51456 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230256AbjG2HyH (ORCPT ); Sat, 29 Jul 2023 03:54:07 -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 B4D8C49F5 for ; Sat, 29 Jul 2023 00:53:48 -0700 (PDT) Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-522a9e0e6e9so309428a12.1 for ; Sat, 29 Jul 2023 00:53:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617227; x=1691222027; 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=hVWQ1qgQBZbo3g2eHf7eEhO2KwwCTOPLq8N55bF/Iys=; b=ry2S7MIBiphN89rqme7WRSPfdaAdnoEu30RE/Jrl3LOfUaDLdiok5B7orZFJWzl5rP N92XktACc8wSfi8qpVNaRAKLHXib+NuPQE2fJP5QTIMk832xXqN0StkFuyVhHsIq6Suz Kjg7s6tXCx0mvet4eA/xhbDHYtjZW4i8n+UTvKwRCjDSiV+qG1c8cIQ85J+MVXTNqlJN OMWbZ17eTkaKTSvLaPDNPM7PBZCyrY9o3+krnh7bg7yJuSiW7r8tRHE6QMxhv/h0b+vm YhqaTuiaZB1ipi1yUg3G9DlyqKj1HxOLziFhfoz2MIxGmnu9InS/gZIztFe/cRgM8YOP 4Rog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617227; x=1691222027; 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=hVWQ1qgQBZbo3g2eHf7eEhO2KwwCTOPLq8N55bF/Iys=; b=iSaSsZJ0CE6wFRVjZXPhED/d+BqZGFqGk5FkTPxC/Nk9zSmINcXpRkul4zo5X/XAZ8 cG8UqZ9g4AJwUHNJGuUPGuvA/JH9i6PA4ZQ3QGXegkTtuEJhVxXt+qN1OLLyvjUmewjL tNrehHKepgqPWFFeS7+nnFK4iA7T2it5B5cuqGVavRVLYSToyALLPd+o+zFOl25enKzK ECWDuRmgpteWpnPgjegrfvz7h2B5jNdEhkGZ9AdeWL2QBpliTCo7qRIfPwITh28Mq0qF B4DICs/WuYAfz/ZRDYBcEuuRia4PucJcwfS1t61jPG8HBNEY99g43K+6AkqPucg2AVs6 9pfg== X-Gm-Message-State: ABy/qLbCYA0wiNPe1Yhy1ZPXXKQIEVsy1pOi2GXzgGs7/YQ2bH8AaWyK 7BdPSipK1nKc3/iB3fDPr3I= X-Google-Smtp-Source: APBJJlEc+PkwdkqIq/G7SBlX2NW2HCabzZ3kTPcZVXqqe5S4l7PuL9tYBNb31Kn7cISVhi5Owy9NtA== X-Received: by 2002:a05:6402:430b:b0:521:d2fb:caa1 with SMTP id m11-20020a056402430b00b00521d2fbcaa1mr1970432edc.0.1690617226701; Sat, 29 Jul 2023 00:53:46 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id bf19-20020a0564021a5300b0051ded17b30bsm2633934edb.40.2023.07.29.00.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:53:46 -0700 (PDT) Date: Sat, 29 Jul 2023 09:53:43 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] staging: rtl8192e: Remove is_mesh from rtllib_start_scan_syncro Message-ID: <6050a1d7764364190dda252f79d75c7cc47143de.1690615475.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" Function rtllib_start_scan_syncro() has parameter is_mesh which is in all calls 0. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++--- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 88975dc804c6..74747348b573 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -428,7 +428,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, =20 ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP); =20 - rtllib_start_scan_syncro(priv->rtllib, 0); + rtllib_start_scan_syncro(priv->rtllib); =20 ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_RESTORE); } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index aa8abec390ca..9603a3485868 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1887,7 +1887,7 @@ void rtllib_disassociate(struct rtllib_device *ieee); void rtllib_stop_scan(struct rtllib_device *ieee); bool rtllib_act_scanning(struct rtllib_device *ieee, bool sync_scan); void rtllib_stop_scan_syncro(struct rtllib_device *ieee); -void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh); +void rtllib_start_scan_syncro(struct rtllib_device *ieee); void rtllib_sta_ps_send_null_frame(struct rtllib_device *ieee, short pwr); void rtllib_sta_ps_send_pspoll_frame(struct rtllib_device *ieee); void rtllib_start_protocol(struct rtllib_device *ieee); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 614f19603af1..7b866b3a46ef 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -707,7 +707,7 @@ static void rtllib_start_scan(struct rtllib_device *iee= e) } =20 /* called with wx_mutex held */ -void rtllib_start_scan_syncro(struct rtllib_device *ieee, u8 is_mesh) +void rtllib_start_scan_syncro(struct rtllib_device *ieee) { if (IS_DOT11D_ENABLE(ieee)) { if (IS_COUNTRY_IE_VALID(ieee)) @@ -715,7 +715,7 @@ void rtllib_start_scan_syncro(struct rtllib_device *iee= e, u8 is_mesh) } ieee->sync_scan_hurryup =3D 0; if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) - rtllib_softmac_scan_syncro(ieee, is_mesh); + rtllib_softmac_scan_syncro(ieee, 0); } EXPORT_SYMBOL(rtllib_start_scan_syncro); =20 @@ -2500,7 +2500,7 @@ static void rtllib_start_ibss_wq(void *data) * associated. */ if (ieee->link_state =3D=3D MAC80211_NOLINK) - rtllib_start_scan_syncro(ieee, 0); + rtllib_start_scan_syncro(ieee); =20 /* the network definitively is not here.. create a new cell */ if (ieee->link_state =3D=3D MAC80211_NOLINK) { diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 1a7575ab9d6d..aad91dad134c 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -310,7 +310,7 @@ void rtllib_wx_sync_scan_wq(void *data) =20 mutex_lock(&ieee->wx_mutex); if (!(ieee->softmac_features & IEEE_SOFTMAC_SCAN)) { - rtllib_start_scan_syncro(ieee, 0); + rtllib_start_scan_syncro(ieee); goto out; } =20 @@ -339,7 +339,7 @@ void rtllib_wx_sync_scan_wq(void *data) HT_EXTCHNL_OFFSET_NO_EXT); } =20 - rtllib_start_scan_syncro(ieee, 0); + rtllib_start_scan_syncro(ieee); =20 if (b40M) { if (chan_offset =3D=3D HT_EXTCHNL_OFFSET_UPPER) --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 C2699C001E0 for ; Sat, 29 Jul 2023 07:54:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230192AbjG2HyC (ORCPT ); Sat, 29 Jul 2023 03:54:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230256AbjG2Hxx (ORCPT ); Sat, 29 Jul 2023 03:53:53 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B2DB73592 for ; Sat, 29 Jul 2023 00:53:38 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-99bded9d93dso67273066b.1 for ; Sat, 29 Jul 2023 00:53:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617217; x=1691222017; 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=vBQvA7PidF0G5yJQQDU0VXGO4IEZc5NbIaIsAqJ7tbs=; b=Dp27GgGxBiNTmPkOQnVqGdr5F9RxNvkQ5/GOds9VxvAA5B77Gz/abPY0pFNhJlzKf9 TLMA3+pF0vDCmdEEDUR/4EcelyeSmeA2LCtoPbSqazaRX56QXynyfXyWoHkjd0L8zZXg mw3qGcVhmPDKYENZo5HosFNbltgp+bqcFjj/vmVMYgv2VQ02mjWRVZABlYqGeHNNLbEA Im7dYI99T6/BwX2uDWe++/uEvMzU3fKEkQEc5ZgsMzSnWdnX7+gWhziRWTNUTnlfKbgg yKioxPKEa8G1dfwvTo5UFMK/d1BXKdzEUkjJl+f8UvMtxo1u5eeQvbcpIUEk1dhEmupS yV0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617217; x=1691222017; 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=vBQvA7PidF0G5yJQQDU0VXGO4IEZc5NbIaIsAqJ7tbs=; b=bZEaWiFhRFKOq/JOFQUYE9eCB47LcB3NpDGbs9fYlzaSpCXCapvIQ9mNAwnJE4H77Y mi219UaBosFiArC/DioFq4ptf6aqsEqt45qPCdKYKUMThnr6jv9im6NxLO85pcdFvnVj T+Mb/ZneNMYOsRyNoO8QQBOJ390cd7frsTOok1yGJAOu/ZQef9tcfc9tEAsqHC4af3+p 515V1/Vcnt5z11aQEgIvFfuyi5s6iJxU9nF+WjU2kCo8xxfvy4KuMZ0IFIt5JF3GJ8si QNQdzOajrajJj9gbo5sUfq6JyeB01IIWEPoXJ8b6UsLYtLtw9kfwJjU5zCtNx4/M3PIa 7JNg== X-Gm-Message-State: ABy/qLYI/YgOrRhHN0HSUsV+9Oc7geCUryO2KPCLShqEog9ue40h56Wh JLT70EiJ5b5v3z9Vsa+kp5I= X-Google-Smtp-Source: APBJJlHnz/pKlZ3uSK8sTzQwjoUEr9DWV7dXYRLLKsBz2TJlaMtBlL8BlZJMyYHQ7mFXqDLDQW6uxw== X-Received: by 2002:a17:906:5303:b0:99b:4670:aca9 with SMTP id h3-20020a170906530300b0099b4670aca9mr1233266ejo.1.1690617217146; Sat, 29 Jul 2023 00:53:37 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id w23-20020a170906481700b009927d4d7a6bsm2987619ejq.53.2023.07.29.00.53.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:53:36 -0700 (PDT) Date: Sat, 29 Jul 2023 09:53:34 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Remove is_mesh from rtllib_softmac_scan_syncro Message-ID: <9fcd1193c155ef992493af3526442fb84032166f.1690615475.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" Function rtllib_softmac_scan_syncro() has unused parameter is_mesh. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib_softmac.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 7b866b3a46ef..0e52b207942d 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -478,7 +478,7 @@ static void rtllib_update_active_chan_map(struct rtllib= _device *ieee) /* this performs syncro scan blocking the caller until all channels * in the allowed channel map has been checked. */ -static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee, u8 is_m= esh) +static void rtllib_softmac_scan_syncro(struct rtllib_device *ieee) { union iwreq_data wrqu; short ch =3D 0; @@ -715,7 +715,7 @@ void rtllib_start_scan_syncro(struct rtllib_device *iee= e) } ieee->sync_scan_hurryup =3D 0; if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) - rtllib_softmac_scan_syncro(ieee, 0); + rtllib_softmac_scan_syncro(ieee); } EXPORT_SYMBOL(rtllib_start_scan_syncro); =20 --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 7EA38C001DC for ; Sat, 29 Jul 2023 07:54:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230317AbjG2HyP (ORCPT ); Sat, 29 Jul 2023 03:54:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230292AbjG2HyK (ORCPT ); Sat, 29 Jul 2023 03:54:10 -0400 Received: from mail-ej1-x62e.google.com (mail-ej1-x62e.google.com [IPv6:2a00:1450:4864:20::62e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4AE45524D for ; Sat, 29 Jul 2023 00:53:52 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-991f9148334so71549466b.1 for ; Sat, 29 Jul 2023 00:53:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617230; x=1691222030; 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=jZTouIE3bYlS4ML1ECutlOlFs3Ssf3ayt3aS6iRC8mI=; b=SNnlPt/BeIx4nHo/DW+/WEZl95UmgkWw3HxVw3ohC1u6I2aqHINyLLSeQ8FuJPf6lT ky/AmSBcFUMTCeThqK3KbKQS+Ppwup1zwP9H+ymvjtMkJDpG4pZyZ+T3VbmZoUYaaVS+ 70czk8zHc0kQaL3kUlchsLIwDROJv/69OAo9gcUPRhDXelRk/TCk9GZvab/9WkdU/kwo rzJHD2IYkGQuzPXwI4BFjxCApj7Baw8ox86sDJEl/RPpEQyZ9x2CncBWksBr/xaS1tgX Ndq2qgWj5IjnSZN7wwOqrhnz9LVDZxhVWkyTy+ctTAuuzZUmlmgoXGfElD9MfoEu75yB wGSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617230; x=1691222030; 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=jZTouIE3bYlS4ML1ECutlOlFs3Ssf3ayt3aS6iRC8mI=; b=k43NFz2NOEBMclV+FxfxPJ0FyRgrcp6YqL/C09C1e7Vgw5yiI4Ak59XvBe8lY1vMMQ aOjY+tlHnvc0HQ6tckoa+K9YsRTpt8bxa8EaJBkActbvz64phz5qV6y31E9AUBIK/xI5 KgwK/3cVGr7UMt7chS1yhDUzs3Qgu6zvp/z8u+uLio6R4s6bnEYYUNlrZLzgfC2cyj56 HTgCQt5soXWhgKVPAeSt/G0kx6kHowBAvJQkkKoKh9nLybw3saHuuy3R01nxhO0A0MyL 2/qV6umrvosV4fF2vu2sLgM8y/Uyk2RqgRUL18XKamOrGpfE9/WztMNB9Huao3l2zgqs kfWQ== X-Gm-Message-State: ABy/qLaqqVD11uhsEr+u12FW9MiNnvAQEgStnOnuhBVFK0s/xRB3XtqG 70rRaLrrDYPu6Jp52BKI8cocSncBU/k= X-Google-Smtp-Source: APBJJlEqTfqQQaB5nHCL80qYQsgm6XnYbcOdq+GVp2sJzulq6utdzf5i+PTL+RkDXqFEwmVkK/g4vw== X-Received: by 2002:a17:906:73dd:b0:998:bac1:3bdd with SMTP id n29-20020a17090673dd00b00998bac13bddmr1353725ejl.2.1690617230519; Sat, 29 Jul 2023 00:53:50 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id i10-20020a170906250a00b0099304c10fd3sm2982067ejb.196.2023.07.29.00.53.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:53:50 -0700 (PDT) Date: Sat, 29 Jul 2023 09:53:48 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Remove is_mesh from rtl92e_set_swcam Message-ID: <5d324977054f3a27b89c5c73da82e9c01c6dca45.1690615475.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" Function rtl92e_set_swcam() has parameter is_mesh which is in all calls 0. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 16 +++++++--------- drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 10 ++++------ 3 files changed, 12 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 6d9e5c27017d..f9ddb8384752 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -50,7 +50,7 @@ void rtl92e_enable_hw_security_config(struct net_device *= dev) =20 void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, const u8 *MacAddr, u8 DefaultKey, - u32 *KeyContent, u8 is_mesh) + u32 *KeyContent) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rtllib_device *ieee =3D priv->rtllib; @@ -58,14 +58,12 @@ void rtl92e_set_swcam(struct net_device *dev, u8 EntryN= o, u8 KeyIndex, if (EntryNo >=3D TOTAL_CAM_ENTRY) return; =20 - if (!is_mesh) { - ieee->swcamtable[EntryNo].bused =3D true; - ieee->swcamtable[EntryNo].key_index =3D KeyIndex; - ieee->swcamtable[EntryNo].key_type =3D KeyType; - memcpy(ieee->swcamtable[EntryNo].macaddr, MacAddr, 6); - ieee->swcamtable[EntryNo].useDK =3D DefaultKey; - memcpy(ieee->swcamtable[EntryNo].key_buf, (u8 *)KeyContent, 16); - } + ieee->swcamtable[EntryNo].bused =3D true; + ieee->swcamtable[EntryNo].key_index =3D KeyIndex; + ieee->swcamtable[EntryNo].key_type =3D KeyType; + memcpy(ieee->swcamtable[EntryNo].macaddr, MacAddr, 6); + ieee->swcamtable[EntryNo].useDK =3D DefaultKey; + memcpy(ieee->swcamtable[EntryNo].key_buf, (u8 *)KeyContent, 16); } =20 void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u8 KeyIndex, diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.h index 1ebd92e27441..fcfde5f6cf2f 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h @@ -20,7 +20,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u= 8 KeyIndex, u32 *KeyContent); void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, u16 KeyType, const u8 *MacAddr, u8 DefaultKey, - u32 *KeyContent, u8 is_mesh); + u32 *KeyContent); void rtl92e_cam_restore(struct net_device *dev); =20 #endif diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 74747348b573..644762f925b7 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -712,7 +712,7 @@ static int _rtl92e_wx_set_enc(struct net_device *dev, rtl92e_set_key(dev, key_idx, key_idx, KEY_TYPE_WEP104, zero_addr[key_idx], 0, hwkey); rtl92e_set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104, - zero_addr[key_idx], 0, hwkey, 0); + zero_addr[key_idx], 0, hwkey); } else { netdev_info(dev, "wrong type in WEP, not WEP40 and WEP104\n"); @@ -857,21 +857,19 @@ static int _rtl92e_wx_set_encode_ext(struct net_devic= e *dev, if (ext->key_len =3D=3D 13) ieee->pairwise_key_type =3D alg =3D KEY_TYPE_WEP104; rtl92e_set_key(dev, idx, idx, alg, zero, 0, key); - rtl92e_set_swcam(dev, idx, idx, alg, zero, 0, key, 0); + rtl92e_set_swcam(dev, idx, idx, alg, zero, 0, key); } else if (group) { ieee->group_key_type =3D alg; rtl92e_set_key(dev, idx, idx, alg, broadcast_addr, 0, key); - rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 0, - key, 0); + rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 0, key); } else { if ((ieee->pairwise_key_type =3D=3D KEY_TYPE_CCMP) && ieee->ht_info->bCurrentHTSupport) rtl92e_writeb(dev, 0x173, 1); rtl92e_set_key(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr, 0, key); - rtl92e_set_swcam(dev, 4, idx, alg, - (u8 *)ieee->ap_mac_addr, 0, key, 0); + rtl92e_set_swcam(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr, 0, key); } } =20 --=20 2.41.0 From nobody Mon Feb 9 04:30:08 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 51437C001E0 for ; Sat, 29 Jul 2023 07:54:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230197AbjG2Hyl (ORCPT ); Sat, 29 Jul 2023 03:54:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230180AbjG2Hyh (ORCPT ); Sat, 29 Jul 2023 03:54:37 -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 D423D49ED for ; Sat, 29 Jul 2023 00:54:08 -0700 (PDT) Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-991f9148334so71550466b.1 for ; Sat, 29 Jul 2023 00:54:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1690617235; x=1691222035; 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=/cWNXtNWkZB1EXNrbyq7/j6lsC1SsNmw/WUGK+ol4U4=; b=OP8cB46YwORbeq8DePcyMkG0DslF+lYefcJarWenP3neEwdqUPNgikMAU2QkMTDHBA 5lNgMpt8x00OfxhxD4bch2EUVEhGro0yi1/a8xhAvIXFbK/a9qNgGGU7Niivv1TCKpvg WKY7A2m27wZngPMys4ZMQD0j/1aIhSsABSk0skhkUcjtwpRzuBsmGtW0ZId2tlOap+FA 5sgRAgKh8H43i3MetGvuB8744b4PsxHbugfd3j474TDLsrbzt8TOVKys1SsvUZe76C4I WzeKbLdrZSoS1VLrDKWlUvrOChP3AYvkiuitG19OtxaP0RA8jYtDMlCJucg4d0+F27RJ YWiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690617235; x=1691222035; 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=/cWNXtNWkZB1EXNrbyq7/j6lsC1SsNmw/WUGK+ol4U4=; b=KbeivOeMen41LCs3xKz+hDlzYTcDDzd1Ui4RSfDAr7ZgZmmqNMPgrxAXPTzbNaMD9b +e0hhZb87f81hdcFebapKmpCY1HPd89xCZyWevI4ehEisNlUwOFNeJpXXKOV81thqIwK Gq3NJfc88ImODUYlL5pZMemnPry2x/MyNlnMwOJBKf4QahtSfDV+Q823808jSYa89GZf UZbsS0KSAn2ZF08tCtamBZ5bd9YXq2Z708tFOeiZ2mS0pqlsjOvMvqt/XkOF/iyTXiYj t2WngfUZm9XcIKUNf+5hDwCIUg4TpzL+Xqbwg5ZVuGOGzy8106FZy8PjeiHYOa1vDNbB JlnQ== X-Gm-Message-State: ABy/qLbnp/98fzZ63zuHlb+ZAeGTBtBFjske0potspnoVbRQAH/cjL8v qGcDtu6ZkwXJ/nHVGEdFaD4= X-Google-Smtp-Source: APBJJlEy1d3dMdMhZQIrxMTC2h/2G5mapgplcTZ5OPNc0ppw6M0covT6fayqx1AvveNGYEpq3ygd0g== X-Received: by 2002:a17:906:6489:b0:993:d88e:41e3 with SMTP id e9-20020a170906648900b00993d88e41e3mr1297335ejm.4.1690617235540; Sat, 29 Jul 2023 00:53:55 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2e0b.dip0.t-ipconnect.de. [87.186.46.11]) by smtp.gmail.com with ESMTPSA id qq5-20020a17090720c500b009882e53a42csm2994460ejb.81.2023.07.29.00.53.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 29 Jul 2023 00:53:55 -0700 (PDT) Date: Sat, 29 Jul 2023 09:53:53 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Remove DefaultKey from rtl92e_set_swcam Message-ID: <9390014fe045028ac2a32ce7c9745c7cddbd4adf.1690615475.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" Function rtl92e_set_swcam() has parameter DefaultKey which is in all calls 0. Remove dead code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 5 ++--- drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 3 +-- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 8 ++++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index f9ddb8384752..944cc73fb2b6 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -49,8 +49,7 @@ void rtl92e_enable_hw_security_config(struct net_device *= dev) } =20 void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, - u16 KeyType, const u8 *MacAddr, u8 DefaultKey, - u32 *KeyContent) + u16 KeyType, const u8 *MacAddr, u32 *KeyContent) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rtllib_device *ieee =3D priv->rtllib; @@ -62,7 +61,7 @@ void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo,= u8 KeyIndex, ieee->swcamtable[EntryNo].key_index =3D KeyIndex; ieee->swcamtable[EntryNo].key_type =3D KeyType; memcpy(ieee->swcamtable[EntryNo].macaddr, MacAddr, 6); - ieee->swcamtable[EntryNo].useDK =3D DefaultKey; + ieee->swcamtable[EntryNo].useDK =3D 0; memcpy(ieee->swcamtable[EntryNo].key_buf, (u8 *)KeyContent, 16); } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.h index fcfde5f6cf2f..bd33ef105107 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.h @@ -19,8 +19,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u= 8 KeyIndex, u16 KeyType, const u8 *MacAddr, u8 DefaultKey, u32 *KeyContent); void rtl92e_set_swcam(struct net_device *dev, u8 EntryNo, u8 KeyIndex, - u16 KeyType, const u8 *MacAddr, u8 DefaultKey, - u32 *KeyContent); + u16 KeyType, const u8 *MacAddr, u32 *KeyContent); void rtl92e_cam_restore(struct net_device *dev); =20 #endif diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 644762f925b7..189798852568 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -712,7 +712,7 @@ static int _rtl92e_wx_set_enc(struct net_device *dev, rtl92e_set_key(dev, key_idx, key_idx, KEY_TYPE_WEP104, zero_addr[key_idx], 0, hwkey); rtl92e_set_swcam(dev, key_idx, key_idx, KEY_TYPE_WEP104, - zero_addr[key_idx], 0, hwkey); + zero_addr[key_idx], hwkey); } else { netdev_info(dev, "wrong type in WEP, not WEP40 and WEP104\n"); @@ -857,19 +857,19 @@ static int _rtl92e_wx_set_encode_ext(struct net_devic= e *dev, if (ext->key_len =3D=3D 13) ieee->pairwise_key_type =3D alg =3D KEY_TYPE_WEP104; rtl92e_set_key(dev, idx, idx, alg, zero, 0, key); - rtl92e_set_swcam(dev, idx, idx, alg, zero, 0, key); + rtl92e_set_swcam(dev, idx, idx, alg, zero, key); } else if (group) { ieee->group_key_type =3D alg; rtl92e_set_key(dev, idx, idx, alg, broadcast_addr, 0, key); - rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, 0, key); + rtl92e_set_swcam(dev, idx, idx, alg, broadcast_addr, key); } else { if ((ieee->pairwise_key_type =3D=3D KEY_TYPE_CCMP) && ieee->ht_info->bCurrentHTSupport) rtl92e_writeb(dev, 0x173, 1); rtl92e_set_key(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr, 0, key); - rtl92e_set_swcam(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr, 0, key); + rtl92e_set_swcam(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr, key); } } =20 --=20 2.41.0