From nobody Wed Feb 11 03:42:03 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 50ADDC77B7F for ; Sat, 13 May 2023 18:09:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234752AbjEMSJC (ORCPT ); Sat, 13 May 2023 14:09:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229826AbjEMSIt (ORCPT ); Sat, 13 May 2023 14:08:49 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 01FAEBA for ; Sat, 13 May 2023 11:08:47 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-96a2b6d698cso125052666b.1 for ; Sat, 13 May 2023 11:08:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001326; x=1686593326; 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=XhqmfTNs3O4aemS47cLwnp5JHS1eigTcrbPVaEBITLY=; b=ssrGWKWHZqt4kX9TGCoHYjCmXiv+JT50D42PU4JEFfcPO6OJ0xaI7vMIBhxZ9aa1HM PBePBa8L8W3u3xZNfzPL4B9d3s524aWJ27R9UHRlxGAgqFHGXbBiYho/YEW5uy4exhPe cw/+O6jgjp+hTfjSUSeNzatRSF5yDv7PP+hhBNTHKxCHlJqWs3qOpWCHMmNFQzjH5jXM feP8pUQ5GzaqDYJcrURDjT+CIfHwD9EaQ4FQjCM0ysry2fgikuAjR+KW5FgVI4TonX0f ktFE1ILID6m9co9vfx+P5NlmL96TAR+qlTn8jbixMeHz23HpISi451Q2IHp/nI/fPtr1 b/sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001326; x=1686593326; 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=XhqmfTNs3O4aemS47cLwnp5JHS1eigTcrbPVaEBITLY=; b=OYcj9y4blAXjSdofDRFNhVJv2CjfGQ8SA71wfeUST0/FcW7wl53q+xWqG3J0y15zoN Ir6yAWFZdi4o6IVOiLu8lvXQMHVt2OH1lXaxC1HgqCyfRbhGFeq16VldmB6O2MpoCwYX Khbw2Kq7w6fFd8FMeLiqV/TH70uWfrZ8oA5tsF1UNiaZ+4Yrkhc1TL8ifKS9O7BOPDk2 IURAmHV9OyBl0uYkoqzksC2TW0tLxmJOE+/HP5JDcoacCBpjve4HiNz77hxtbvG0ofPI C2tpHdwvzVzzzrHCoRm88qaAlz3vTZT9iQTCBduS8Ah0843inh6yJE7pJMm+N3F7U6mb SNzw== X-Gm-Message-State: AC+VfDwoqo2D23e6S2piIWBfMYFu1FXEMfQNZBYJuvGss8ZUOXPXRSaS udk0q8igK2aJh2+h6sayNLY= X-Google-Smtp-Source: ACHHUZ6fPHC+SO/3fr62xNUQkvSYxn6BfeekkuRqg+xGpyP/T8HtkimK2xcAGkKrY6iQQxKeLGKwKg== X-Received: by 2002:a17:906:217:b0:94f:66af:b1f7 with SMTP id 23-20020a170906021700b0094f66afb1f7mr22945364ejd.1.1684001326063; Sat, 13 May 2023 11:08:46 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id mm10-20020a170906cc4a00b00960005e09a3sm7096686ejb.61.2023.05.13.11.08.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:08:45 -0700 (PDT) Date: Sat, 13 May 2023 20:08:43 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 1/9] staging: rtl8192e: Remove undefined function data_hard_stop Message-ID: <4cc180b9538d6c9c32ff0f56646a642fa217a4a4.1683960684.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 function data_hard_stop as it is not defined. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 6 ------ drivers/staging/rtl8192e/rtllib_softmac.c | 5 ----- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 3 --- 3 files changed, 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index d5f5ea5615fc..b356cde80f84 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1682,12 +1682,6 @@ struct rtllib_device { void (*softmac_data_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev, int rate); =20 - /* stops the HW queue for DATA frames. Useful to avoid - * waste time to TX data frame when we are reassociating - * This function can sleep. - */ - void (*data_hard_stop)(struct net_device *dev); - /* OK this is complementing to data_poll_hard_stop */ void (*data_hard_resume)(struct net_device *dev); =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 1ca77cdbafa3..65eecbc94b93 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1575,9 +1575,6 @@ static void rtllib_associate_procedure_wq(void *data) ieee->rtllib_ips_leave(ieee->dev); mutex_lock(&ieee->wx_mutex); =20 - if (ieee->data_hard_stop) - ieee->data_hard_stop(ieee->dev); - rtllib_stop_scan(ieee); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); if (ieee->rf_power_state =3D=3D rf_off) { @@ -2734,8 +2731,6 @@ void rtllib_disassociate(struct rtllib_device *ieee) if (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE) rtllib_reset_queue(ieee); =20 - if (ieee->data_hard_stop) - ieee->data_hard_stop(ieee->dev); if (IS_DOT11D_ENABLE(ieee)) dot11d_reset(ieee); ieee->state =3D RTLLIB_NOLINK; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 1f2fa711e60b..d7166d6772df 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -345,9 +345,6 @@ void rtllib_wx_sync_scan_wq(void *data) rtllib_sta_ps_send_null_frame(ieee, 1); =20 rtllib_stop_all_queues(ieee); - - if (ieee->data_hard_stop) - ieee->data_hard_stop(ieee->dev); rtllib_stop_send_beacons(ieee); ieee->state =3D RTLLIB_LINKED_SCANNING; ieee->link_change(ieee->dev); --=20 2.40.1 From nobody Wed Feb 11 03:42:03 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 8AA34C7EE24 for ; Sat, 13 May 2023 18:09:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236355AbjEMSJH (ORCPT ); Sat, 13 May 2023 14:09:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229633AbjEMSI4 (ORCPT ); Sat, 13 May 2023 14:08:56 -0400 Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 10FEA1726 for ; Sat, 13 May 2023 11:08:54 -0700 (PDT) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-94ea38c90ccso303351466b.1 for ; Sat, 13 May 2023 11:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001332; x=1686593332; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=5/2jtntFcCEy2HLu74Pr7lsSBwQYzCqz7UQ3TltHgMM=; b=I7um9lN73aB3KVdmHhTH3v+3GZKH1TEyOVqVzE3qOHH1iCW447Qp2KTVwX++rS88dh 8kB+qG05V6xfO6mofnRgzfD8x9LW8ZGdQvrz+AVgCIzjznM4KidIqjNYIN8DnNVDvB1A /fnhWzH7EWRmjaeeUiIDx+l+X7UVyweDQo5kNMHY6/jopeAnaSNvkln2G1oNzs4OCb9T PrOuwuCra4E8/+Eg/WM8eAn4y8atBc7oNst+cSDZQ7Dg9CWpAjE+go6Z0PEODWW8qyEN d+re04MdYJCWWOanvrlQx8k9iOgRVqWvhHSjs4wEPljA89npi6no5rF5riWHFnwLCDj1 a0xQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001332; x=1686593332; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5/2jtntFcCEy2HLu74Pr7lsSBwQYzCqz7UQ3TltHgMM=; b=TAVvn52IrywSigfKfSavtFjQGFUp+Fm2iZumd45MQzC57oktCE70MSDnr1RphbiZk/ drDLAoMksMj/c21vP9U7V6lytn3ui1cNNDfb16r6Q95Ob2wReKYYmlohpJN8p2wMCOEO Yt6aOPdxvDcr1bW2RpKMWdSlz1OpXJE9pteGlplgLrTXQ5XiOzkEooH/NbUCzY93ng1e Ix+04N9Kdylp7KG2Q7tErR7LC7+ZIxVjudGDs93XaG7sD72IqiAX+vYtX1jTKf6dFlEL mVA15L80cNMTNbepd5g1Kl/gwoD+QophgaFfkN56v8FCOqiFBT4rWQXd57GWkZ54CW26 JXTg== X-Gm-Message-State: AC+VfDxhQD3md9Uz7q32bBIcJjlvy5CGwgJSY0q22L3omhCsySdLlXTN oeecGIpZRUTY0acwA0JzIHo= X-Google-Smtp-Source: ACHHUZ4AcNbu25m6sJyt27XScjARpWHHXNOJ2uu2aSdEI+Rp+jk1TOoMGgmjiEM442HnQEuiN/Bkog== X-Received: by 2002:a17:906:14e:b0:965:9602:3ee1 with SMTP id 14-20020a170906014e00b0096596023ee1mr22936127ejh.2.1684001332326; Sat, 13 May 2023 11:08:52 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id va8-20020a17090711c800b0094f282fc29asm6887951ejb.207.2023.05.13.11.08.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:08:51 -0700 (PDT) Date: Sat, 13 May 2023 20:08:50 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 2/9] staging: rtl8192e: Remove undefined function data_hard_resume Message-ID: <07048d775759fffe1d1c63d0416214da8311129a.1683960684.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 function data_hard_resume as it is not defined. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 3 --- drivers/staging/rtl8192e/rtllib_softmac.c | 18 +----------------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 10 +--------- 3 files changed, 2 insertions(+), 29 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index b356cde80f84..9b49a15de889 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1682,9 +1682,6 @@ struct rtllib_device { void (*softmac_data_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev, int rate); =20 - /* OK this is complementing to data_poll_hard_stop */ - void (*data_hard_resume)(struct net_device *dev); - /* ask to the driver to retune the radio. * This function can sleep. the driver should ensure * the radio has been switched before return. diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 65eecbc94b93..fe36a52b4c91 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1546,10 +1546,6 @@ static void rtllib_associate_complete_wq(void *data) netdev_info(ieee->dev, "silent reset associate\n"); ieee->is_silent_reset =3D false; } - - if (ieee->data_hard_resume) - ieee->data_hard_resume(ieee->dev); - } =20 static void rtllib_sta_send_associnfo(struct rtllib_device *ieee) @@ -2534,22 +2530,14 @@ static void rtllib_start_master_bss(struct rtllib_d= evice *ieee) ieee->state =3D RTLLIB_LINKED; ieee->link_change(ieee->dev); notify_wx_assoc_event(ieee); - - if (ieee->data_hard_resume) - ieee->data_hard_resume(ieee->dev); - netif_carrier_on(ieee->dev); } =20 static void rtllib_start_monitor_mode(struct rtllib_device *ieee) { /* reset hardware status */ - if (ieee->raw_tx) { - if (ieee->data_hard_resume) - ieee->data_hard_resume(ieee->dev); - + if (ieee->raw_tx) netif_carrier_on(ieee->dev); - } } =20 static void rtllib_start_ibss_wq(void *data) @@ -2674,10 +2662,6 @@ static void rtllib_start_ibss_wq(void *data) rtllib_start_send_beacons(ieee); =20 notify_wx_assoc_event(ieee); - - if (ieee->data_hard_resume) - ieee->data_hard_resume(ieee->dev); - netif_carrier_on(ieee->dev); =20 mutex_unlock(&ieee->wx_mutex); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index d7166d6772df..371864f0087f 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -389,10 +389,6 @@ void rtllib_wx_sync_scan_wq(void *data) ieee->link_detect_info.NumRecvBcnInPeriod =3D 1; ieee->link_detect_info.NumRecvDataInPeriod =3D 1; } - - if (ieee->data_hard_resume) - ieee->data_hard_resume(ieee->dev); - if (ieee->iw_mode =3D=3D IW_MODE_ADHOC || ieee->iw_mode =3D=3D IW_MODE_MA= STER) rtllib_start_send_beacons(ieee); =20 @@ -505,12 +501,8 @@ int rtllib_wx_set_rawtx(struct rtllib_device *ieee, ieee->raw_tx ? "enabled" : "disabled"); =20 if (ieee->iw_mode =3D=3D IW_MODE_MONITOR) { - if (prev =3D=3D 0 && ieee->raw_tx) { - if (ieee->data_hard_resume) - ieee->data_hard_resume(ieee->dev); - + if (prev =3D=3D 0 && ieee->raw_tx) netif_carrier_on(ieee->dev); - } =20 if (prev && ieee->raw_tx =3D=3D 1) netif_carrier_off(ieee->dev); --=20 2.40.1 From nobody Wed Feb 11 03:42:03 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 E895FC77B7F for ; Sat, 13 May 2023 18:09:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237486AbjEMSJS (ORCPT ); Sat, 13 May 2023 14:09:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231363AbjEMSJC (ORCPT ); Sat, 13 May 2023 14:09:02 -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 B3BCCD1 for ; Sat, 13 May 2023 11:09:00 -0700 (PDT) Received: by mail-ej1-x633.google.com with SMTP id a640c23a62f3a-9659dee48edso302725566b.0 for ; Sat, 13 May 2023 11:09:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001339; x=1686593339; 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=DcwlzjzKqkae2M3+WAsm07p04ignv4QKU8BX1mAajHU=; b=hgyUA8ODnif+kjj87+sm3sOz5g5PDVSp3MsBjq4/IbnDSykJGxf1CqK8Qz9W/MeIgb lVpA0Yk8kmzceEyW2bPsexqGuE53b9tfTd5O4njFbhn7ELXlbQMVnd19pH603ejPMCmK fnWmR9y3vga3KlRdqY89TrcAplzSJHflzTd2D9QppT6x3DEfKgXFJDvVKZMM0OKkrRmO pgvvxFnimulorLQHNdvsvp4IP8olb+moehwqDqjG2aIxAOyiQbJynKg5W+FGCHNKLZf/ XQCGsTeYH/Hwv2q3u6yzsAEV1T97gbV4bcY5dHF3oUZuQtsKOVXJZlThOFfJbfkAaQAw UlNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001339; x=1686593339; 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=DcwlzjzKqkae2M3+WAsm07p04ignv4QKU8BX1mAajHU=; b=FXrr08z+qLgBMtLQAgN9fMsEDJeVKnOwwPLIxxA46lWX0024J//rYt/xFnFWH588+/ 1ETC/XnXnB0TMFecddX5iwqrpzz+9dCB9Fq32FtAsmJaLLlkHgOnk/8vQj8NgUXPzkxU hJnGveJTDsQnMZ1yWwqaaNMItq1FuBnLcVimrpAi5jg8vwyKWXpnO43hFT/ukd1goz0s Jwp62OJZsFznaFPVcDFB6wR9Vik3h6z+sNPKZgSyqWa4poqr5AjkIaZqg4UEnWEvLWC5 fDYHuNOTnxKlna5KqHSloIcuhdmfYdXjyhqOpFIipB0Mys/rN5jt9gpoUtW7HFwBaMHo bBOQ== X-Gm-Message-State: AC+VfDyNeQEUeK9N5RABgY6HfiqTPnNzXNaRZ5Ji872vWxRKkNZ5G9aD oz0AjNc1WoBBVxyoxn79STI= X-Google-Smtp-Source: ACHHUZ4r2RFmZkxtfknvOyKXIHfIO7asWw+HWG/qoaFSt4TAG+YZEBJRk36LbrCdJ/zks7FSju4npg== X-Received: by 2002:a17:906:7794:b0:965:9c7d:df96 with SMTP id s20-20020a170906779400b009659c7ddf96mr22113326ejm.1.1684001338815; Sat, 13 May 2023 11:08:58 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id ka11-20020a170907990b00b0096602a5ab25sm7041150ejc.92.2023.05.13.11.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:08:58 -0700 (PDT) Date: Sat, 13 May 2023 20:08:56 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 3/9] staging: rtl8192e: Remove functions rtllib_start_hw_scan and stop Message-ID: <868524470321b8936f63d3ea06ba86c34fc89bb7.1683960684.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 functions rtllib_start_hw_scan and rtllib_stop_hw_scan as they are not defined. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 3 --- drivers/staging/rtl8192e/rtllib_softmac.c | 21 +++------------------ 2 files changed, 3 insertions(+), 21 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 9b49a15de889..aac71fda4541 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1688,9 +1688,6 @@ struct rtllib_device { */ void (*set_chan)(struct net_device *dev, short ch); =20 - void (*rtllib_start_hw_scan)(struct net_device *dev); - void (*rtllib_stop_hw_scan)(struct net_device *dev); - /* indicate the driver that the link state is changed * for example it may indicate the card is associated now. * Driver might be interested in this to apply RX filter diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index fe36a52b4c91..bb28414b88bc 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -691,23 +691,15 @@ static void rtllib_softmac_stop_scan(struct rtllib_de= vice *ieee) =20 void rtllib_stop_scan(struct rtllib_device *ieee) { - if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) { + if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) rtllib_softmac_stop_scan(ieee); - } else { - if (ieee->rtllib_stop_hw_scan) - ieee->rtllib_stop_hw_scan(ieee->dev); - } } EXPORT_SYMBOL(rtllib_stop_scan); =20 void rtllib_stop_scan_syncro(struct rtllib_device *ieee) { - if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) { + if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) ieee->sync_scan_hurryup =3D 1; - } else { - if (ieee->rtllib_stop_hw_scan) - ieee->rtllib_stop_hw_scan(ieee->dev); - } } EXPORT_SYMBOL(rtllib_stop_scan_syncro); =20 @@ -739,9 +731,6 @@ static void rtllib_start_scan(struct rtllib_device *iee= e) ieee->scanning_continue =3D 1; schedule_delayed_work(&ieee->softmac_scan_wq, 0); } - } else { - if (ieee->rtllib_start_hw_scan) - ieee->rtllib_start_hw_scan(ieee->dev); } } =20 @@ -753,12 +742,8 @@ void rtllib_start_scan_syncro(struct rtllib_device *ie= ee, u8 is_mesh) RESET_CIE_WATCHDOG(ieee); } ieee->sync_scan_hurryup =3D 0; - if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) { + if (ieee->softmac_features & IEEE_SOFTMAC_SCAN) rtllib_softmac_scan_syncro(ieee, is_mesh); - } else { - if (ieee->rtllib_start_hw_scan) - ieee->rtllib_start_hw_scan(ieee->dev); - } } EXPORT_SYMBOL(rtllib_start_scan_syncro); =20 --=20 2.40.1 From nobody Wed Feb 11 03:42:03 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 A557BC77B7A for ; Sat, 13 May 2023 18:09:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237516AbjEMSJd (ORCPT ); Sat, 13 May 2023 14:09:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49330 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237293AbjEMSJO (ORCPT ); Sat, 13 May 2023 14:09:14 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7E9CB4696 for ; Sat, 13 May 2023 11:09:07 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-965aa9d1d19so307551966b.0 for ; Sat, 13 May 2023 11:09:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001346; x=1686593346; 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=0Y1rZV1MmREzrVxUKPP6KLxWKeW+vjNzBkwfZoTYQPs=; b=oW2BTlZv06GJHQgOMs+JHJERgBNw3DCYSrqWmlpjcRvpjzifJMBlQk+N1u8o1iDZS1 /y6ybJ1ADRb7POgVRx1BnBgla5ndAY9ItiBT0kVY3KowMHoZKBDvcfngAY0qAKH42oXy Q3BkaKo8uyMak0jGHeEIMcQP184ll3UtjpWwphGVfkiNlrr/r3Afuq9H/iY1aey7rSoF WwBHmYTnp8lPs8u+LghU+hRVoVg76ATY1zUJXXcn8XJa7o1S+k8d5IVfD7045Udt3tMI ExZkBVTnC2th0YwgR6PBPyq+RWboqCA3wJer0/GTedRf644VYrAchqPvCZFSJkvcYX2/ Xjlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001346; x=1686593346; 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=0Y1rZV1MmREzrVxUKPP6KLxWKeW+vjNzBkwfZoTYQPs=; b=hgWIc2CfARx/rjOBEvReVBcfc/HCd/PhpgHh/jRkOp+rZaVp2mqXF/YlgL3xcPCK68 3/QGaFpme1PDB5h46b9DXOhxaPmQ0dwf0Q36Kby4gbsHPOqpgfdhXisS5BimSRwTqXsG prVBXpCalqqdiXYxLJRU75Llrahz5zPYBXmPDktN8eVtgfT1e4HUMwc8wUVIoC88jc5s kO8oiPWPyGph3VJQciu46dQGDvUYfqwXyWEq98MIfJei9XxZipo5TBMXkg2rdmiC8buG WGCglBbGSyVmq4teN1wM1MGvbr/qeuRZXiEgKdyxKvVwC/DijnA4LOmENsHeAjjzu6gs 8lrw== X-Gm-Message-State: AC+VfDyyxwpO5hSRT2QlTQ8m2ZFhCTIviOxYn2N4zQ7EmnIpwUOGyBOA ZUmxuKrwQBUIUMevaEkZVGg= X-Google-Smtp-Source: ACHHUZ50OzxFPaGRr070VMQlCM0/PqcDsup8HIQ/SBm4Mr7SnRdU9WAgTZyuBOqxrMvKZj/0BGPwQg== X-Received: by 2002:a17:906:217:b0:94f:66af:b1f7 with SMTP id 23-20020a170906021700b0094f66afb1f7mr22946006ejd.1.1684001345848; Sat, 13 May 2023 11:09:05 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id p15-20020a17090653cf00b0094ebc041e20sm6952776ejo.46.2023.05.13.11.09.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:09:05 -0700 (PDT) Date: Sat, 13 May 2023 20:09:03 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 4/9] staging: rtl8192e: Remove undefined function reset_port 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 function reset_port as it is not defined. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_wx.c | 19 ------------------- 2 files changed, 21 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index aac71fda4541..cc4247ebea6b 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1661,8 +1661,6 @@ struct rtllib_device { int (*hard_start_xmit)(struct rtllib_txb *txb, struct net_device *dev); =20 - int (*reset_port)(struct net_device *dev); - /* Softmac-generated frames (management) are TXed via this * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is * not set. As some cards may have different HW queues that diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192= e/rtllib_wx.c index d6691f3c7c70..1876ff75c31c 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/drivers/staging/rtl8192e/rtllib_wx.c @@ -420,18 +420,6 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, if (ieee->set_security) ieee->set_security(dev, &sec); =20 - /* Do not reset port if card is in Managed mode since resetting will - * generate new IEEE 802.11 authentication which may end up in looping - * with IEEE 802.1X. If your hardware requires a reset after WEP - * configuration (for example... Prism2), implement the reset_port in - * the callbacks structures used to initialize the 802.11 stack. - */ - if (ieee->reset_on_keychange && - ieee->iw_mode !=3D IW_MODE_INFRA && - ieee->reset_port && ieee->reset_port(dev)) { - netdev_dbg(dev, "%s: reset_port failed\n", dev->name); - return -EINVAL; - } return 0; } EXPORT_SYMBOL(rtllib_wx_set_encode); @@ -625,13 +613,6 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *iee= e, done: if (ieee->set_security) ieee->set_security(ieee->dev, &sec); - - if (ieee->reset_on_keychange && - ieee->iw_mode !=3D IW_MODE_INFRA && - ieee->reset_port && ieee->reset_port(dev)) { - netdev_dbg(ieee->dev, "Port reset failed\n"); - return -EINVAL; - } return ret; } EXPORT_SYMBOL(rtllib_wx_set_encode_ext); --=20 2.40.1 From nobody Wed Feb 11 03:42:03 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 8429AC77B7F for ; Sat, 13 May 2023 18:10:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229756AbjEMSKb (ORCPT ); Sat, 13 May 2023 14:10:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49870 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231363AbjEMSKH (ORCPT ); Sat, 13 May 2023 14:10:07 -0400 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [IPv6:2a00:1450:4864:20::12d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A82815FE7 for ; Sat, 13 May 2023 11:09:34 -0700 (PDT) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-4f252a86ca7so1414042e87.0 for ; Sat, 13 May 2023 11:09:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001372; x=1686593372; 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=ecItjrrmoNNrjpM5Xnudv7ep0+/pzn0LcIKgPQDDuqk=; b=A0+z9p3ZrgaZ8l0LG4OXmMb2UrwdHc/U/PWf2oto37mlzUAeqZ/dpU9mDbQADBXg05 8QbtkVFA8FJWxv7XnltNK8xZG9v8swoCTm8SpOHqIrdKTedym2xBNslnCQ7qFOlKmjYs 5f/gUSURsDIJHfwFHV+iDh8SsGVPHW6W1pAn5nc28TXT55rbWpSuC6RJ60H56obgnALz ahEBnGIzGBzLRLtvxHlhPLkL2o6rdJA1CV5CZlWyZE3lc1CGtqjIx5KUlfVKD/e7YTNM trDjjtfqBE+MrX6OZM7LezX6rySBNjxqOwSUGUelzbsKlMtg+VxPfXM9LviPUht1q32D D/JA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001372; x=1686593372; 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=ecItjrrmoNNrjpM5Xnudv7ep0+/pzn0LcIKgPQDDuqk=; b=fvynY/WXotjaaeSr1bweM8CteSjF4/1q041iPNtvPVryMEGy7R9FqQucnGnin6Txhu nyybkeY5fl1D2PBh8WRlloMNBSZU3QgdHfvsFlPZ7tEatldOYzLnmCXdzv9JMK6duz5v aDXn+owBEuWJPOUqDa1x8rTa55VK/lFbhjpjSWJdsHrnpUNe/1Buq5ePW60MJ6Xg4q+/ GR9EZ308RAoPZUrGVMV2u/JFX1ayDGSU8NsY8PlLZO1rCrL74Z7YMSFXyhI15Fr7kZ82 OxuD/rYKTiwesgAhF5uF5yFhWCupPjA1k/Rl83gX8V69jg/qKZ2qNnsh6vobCWDBeLag nmYg== X-Gm-Message-State: AC+VfDyyMEhzbHuPInnw41ZH5CDByrWoTymwlmxD53IK3+pOrtyeTBtV 7egDHIOlr8i6qiofmGmy7ERFIb67Xu8= X-Google-Smtp-Source: ACHHUZ4nfwDHku7aKvlbwj61Ico7w84ukD4Dneu3ddMfP2G+h5jX0bdNZ6yHEZC3yNpZkiL3T+glLA== X-Received: by 2002:a17:906:5349:b0:953:2918:71e7 with SMTP id j9-20020a170906534900b00953291871e7mr2464704ejo.5.1684001352023; Sat, 13 May 2023 11:09:12 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id jy11-20020a170907762b00b0094f3b18044bsm7040634ejc.218.2023.05.13.11.09.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:09:11 -0700 (PDT) Date: Sat, 13 May 2023 20:09:09 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 5/9] staging: rtl8192e: Remove undefined function hard_start_xmit Message-ID: <603a143ba506ca031d7bd70a844b9f080872d601.1683960684.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 function hard_start_xmit as it is not defined. Equation !ieee->hard_start_xmit always evaluates to true. When (*ieee->hard_start_xmit)(txb, dev) =3D=3D 0 is called the my computer is freezing. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 7 ------- drivers/staging/rtl8192e/rtllib_tx.c | 8 +------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index cc4247ebea6b..7be02cfe56fe 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1654,13 +1654,6 @@ struct rtllib_device { void (*set_security)(struct net_device *dev, struct rtllib_security *sec); =20 - /* Used to TX data frame by using txb structs. - * this is not used if in the softmac_features - * is set the flag IEEE_SOFTMAC_TX_QUEUE - */ - int (*hard_start_xmit)(struct rtllib_txb *txb, - struct net_device *dev); - /* Softmac-generated frames (management) are TXed via this * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is * not set. As some cards may have different HW queues that diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 54119fba8a57..c3f1910d9f58 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -572,8 +572,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struc= t net_device *dev) /* If there is no driver handler to take the TXB, don't bother * creating it... */ - if ((!ieee->hard_start_xmit && !(ieee->softmac_features & - IEEE_SOFTMAC_TX_QUEUE)) || + if (!(ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE) || ((!ieee->softmac_data_hard_start_xmit && (ieee->softmac_features & IEEE_SOFTMAC_TX_QUEUE)))) { netdev_warn(ieee->dev, "No xmit handler.\n"); @@ -938,11 +937,6 @@ static int rtllib_xmit_inter(struct sk_buff *skb, stru= ct net_device *dev) dev->stats.tx_bytes +=3D le16_to_cpu(txb->payload_size); rtllib_softmac_xmit(txb, ieee); } else { - if ((*ieee->hard_start_xmit)(txb, dev) =3D=3D 0) { - stats->tx_packets++; - stats->tx_bytes +=3D le16_to_cpu(txb->payload_size); - return 0; - } rtllib_txb_free(txb); } } --=20 2.40.1 From nobody Wed Feb 11 03:42:03 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 D1D68C77B7A for ; Sat, 13 May 2023 18:10:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236896AbjEMSKQ (ORCPT ); Sat, 13 May 2023 14:10:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50062 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237557AbjEMSJv (ORCPT ); Sat, 13 May 2023 14:09:51 -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 12D2E5FF7 for ; Sat, 13 May 2023 11:09:21 -0700 (PDT) Received: by mail-ej1-x62e.google.com with SMTP id a640c23a62f3a-94ea38c90ccso303364966b.1 for ; Sat, 13 May 2023 11:09:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001359; x=1686593359; 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=f90+s7Igr7R0Bh3E9BN/GprSOguGxSIypRawQW0lt1w=; b=GBAyjJwgrlQBo4qCirom1I3kazZPGDJHZ8/vLMAev4jETPYQ5ZI8oaf+GfYlRDB+ih Hm9HffyZ1EldF6ZrrrnxhFScj9LDNi9JmJEx0wm0zzp5c5HEDHMo8A/cih+DV+sgx2p8 fK+vQNhNXIEhnYG+ArEnjrk8a6G/RHGPpcJ72HcTPy2fk9RZj8RJdrNB45Leii2kQ9Lt kii+y9JQWkh0MSd4iIn0LX+0vJFIRvzNCd/vq3VxroUaOY1sl9pT4mf3dTauY1GLjmxW PYC5aFncSAvzVOkT2r5RVj0gdjAAVIiO45Civ66G/Ywno29kQlKqvddTszJi1HOpRkV+ WFYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001359; x=1686593359; 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=f90+s7Igr7R0Bh3E9BN/GprSOguGxSIypRawQW0lt1w=; b=P9rGkJDlpyr0CT18/re1LGO3Iil5PFFkkL+zsQ6m31NlyZiXVtAWj99Z/LMbl0J6vi oWlEIdWFXQ21UuawhPbMPi+q7m9rsPKwpY1vuH5OsEljG4lsmykRwbJLkWSYb5enz8wE J02O6sWv0i1SZEBfORufZ9AP5O+hU9+volkOvYRPw4/OjJRqnwPRJjzlqUxbwsu/3FBe 8ieUHCShS8eFBA/E7rhOUEAjMHb1lGQ+sfEIT+IsLDydpG9oxJFpPOEBfaggwC7ZR0cd kFBIPlG7hURAYcWgnJkACah6PBCV2fetWpH+5cwwpQTOqlD34/UQIdAk9dZJh//9INWQ iiXQ== X-Gm-Message-State: AC+VfDwhYzT4/A+mHBSvE/djZtawxgnc4kBfCRSTk6WVLJ6HygBBSB2C K6D+eEY17uNzCyPO9lk4Y/Y= X-Google-Smtp-Source: ACHHUZ4HDT3yZlY7XILkad4uBH71A/7AoaB5cNMR6d6DGOHLDzP21vRLhXERUMNrwPu4Il7VkzJqSg== X-Received: by 2002:a17:906:7a50:b0:94a:5f0d:d9d6 with SMTP id i16-20020a1709067a5000b0094a5f0dd9d6mr23904887ejo.4.1684001359187; Sat, 13 May 2023 11:09:19 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id ig25-20020a1709072e1900b0094ee3e4c934sm7039695ejc.221.2023.05.13.11.09.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:09:18 -0700 (PDT) Date: Sat, 13 May 2023 20:09:17 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 6/9] staging: rtl8192e: Remove undefined function set_security 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 function set_security as it is not defined. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_wx.c | 6 ------ 2 files changed, 8 deletions(-) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 7be02cfe56fe..cc1ce106678c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1651,8 +1651,6 @@ struct rtllib_device { }; =20 /* Callback functions */ - void (*set_security)(struct net_device *dev, - struct rtllib_security *sec); =20 /* Softmac-generated frames (management) are TXed via this * callback if the flag IEEE_SOFTMAC_SINGLE_QUEUE is diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192= e/rtllib_wx.c index 1876ff75c31c..82b537da8b21 100644 --- a/drivers/staging/rtl8192e/rtllib_wx.c +++ b/drivers/staging/rtl8192e/rtllib_wx.c @@ -416,10 +416,6 @@ int rtllib_wx_set_encode(struct rtllib_device *ieee, */ sec.flags |=3D SEC_LEVEL; sec.level =3D SEC_LEVEL_1; /* 40 and 104 bit WEP */ - - if (ieee->set_security) - ieee->set_security(dev, &sec); - return 0; } EXPORT_SYMBOL(rtllib_wx_set_encode); @@ -611,8 +607,6 @@ int rtllib_wx_set_encode_ext(struct rtllib_device *ieee, sec.flags &=3D ~SEC_LEVEL; } done: - if (ieee->set_security) - ieee->set_security(ieee->dev, &sec); return ret; } EXPORT_SYMBOL(rtllib_wx_set_encode_ext); --=20 2.40.1 From nobody Wed Feb 11 03:42:03 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 78DB1C77B7A for ; Sat, 13 May 2023 18:10:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237550AbjEMSKU (ORCPT ); Sat, 13 May 2023 14:10:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49694 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237240AbjEMSJ4 (ORCPT ); Sat, 13 May 2023 14:09:56 -0400 Received: from mail-ej1-x635.google.com (mail-ej1-x635.google.com [IPv6:2a00:1450:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EE57A3596 for ; Sat, 13 May 2023 11:09:28 -0700 (PDT) Received: by mail-ej1-x635.google.com with SMTP id a640c23a62f3a-9659dee48edso302733066b.0 for ; Sat, 13 May 2023 11:09:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001365; x=1686593365; 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=CmA/3ovmaGe5dWQW+NLjn0vPr5rS/Ohpr12MEunuBaM=; b=LBz3jPLeKCK6RJpCX7HTpolOd1zS12HKWhl39VsPHtyhjWYdQ4NtKJtJLg5lo57BmK 8U5yJbvSju/pmenELtNqU3bW8iIK8dCDyjb0HR9EfHvVcyuKeGPEnEooxV8EXWokFrhj AYSLV/JAFO3qx4vqivyPXkMlO9wTKFsrNogJIUzuyJ5xuRUbmwJwqLXxakD3oORCKuUV k6bmVizf8OeP4fzVapBaauMilJetkyvcueGndWtbgmY42E49swdJeyIPaN5BiSRdLq7j 9+adubpVtiyA2XYdMXFMSC3WTzplX/KfwRhtDB4ipQbUiE68FxuehSBJe2gW9eHHS43U 1JfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001365; x=1686593365; 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=CmA/3ovmaGe5dWQW+NLjn0vPr5rS/Ohpr12MEunuBaM=; b=GCLecUe6gcBqB69UhC/D8b+3fRbxOS70eLW3rQVVeMRNUOCf9rZLeAgmL0//N5WKIE vUofSDdDjfdH/RXIa3s6gfhf+e8hDBsYejtzXI2XIOwyZ8hPRfWAb5E41NtnkrPBgqbN Gyvxuo6Nvq9ON9aidQ3KpdX5FviVauNhqGhegLprdah6X8d2T2IykhNq35zk3w6y8Huo q4D4NekFUIwLaOy6kG/K2+vXUc8nv1bQF+oUDSgWAEXOJEpBIQJsoDMJsGJTj9KF2px0 sz3KKHHYDRvAXR+b5t+MowJGziGWDpJEYbZYrrckR5OrhDzZJ0/xuUeimWO0/cXjRi5w QBAg== X-Gm-Message-State: AC+VfDz05LGiHrKDBU4mCxx4VW/aQu+gq4gYFNVOOW4dYkX/1kEtdQFv XUKAADKza9zMhVyhrky8L0Ozjhqkj84= X-Google-Smtp-Source: ACHHUZ6xg1n4MHIZ0/r7v9eCEhrd0yFtS1SRMjCiO1k+HvzW50ns4eSb6I48NXe48zTcv0hSdQEpzA== X-Received: by 2002:a17:906:7a50:b0:94a:5f0d:d9d6 with SMTP id i16-20020a1709067a5000b0094a5f0dd9d6mr23905006ejo.4.1684001365267; Sat, 13 May 2023 11:09:25 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id e26-20020a170906845a00b00965cd15c9bbsm7086908ejy.62.2023.05.13.11.09.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:09:24 -0700 (PDT) Date: Sat, 13 May 2023 20:09:23 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 7/9] staging: rtl8192e: Remove undefined function SetFwCmdHandler 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 function SetFwCmdHandler as it is not defined. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 1 - drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 13 +++---------- drivers/staging/rtl8192e/rtllib.h | 2 -- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index b58a30d68f2f..3f8a58e32930 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -734,7 +734,6 @@ static void _rtl92e_init_priv_handler(struct net_device= *dev) =20 priv->rtllib->SetHwRegHandler =3D rtl92e_set_reg; priv->rtllib->AllowAllDestAddrHandler =3D rtl92e_set_monitor_mode; - priv->rtllib->SetFwCmdHandler =3D NULL; priv->rtllib->InitialGainHandler =3D rtl92e_init_gain; priv->rtllib->rtllib_ips_leave_wq =3D rtl92e_rtllib_ips_leave_wq; priv->rtllib->rtllib_ips_leave =3D rtl92e_rtllib_ips_leave; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index 5a1cd22f5e25..54a21c14cc75 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -217,12 +217,8 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) if (psc->bLeisurePs) { if (psc->LpsIdleCount >=3D RT_CHECK_FOR_HANG_PERIOD) { =20 - if (priv->rtllib->ps =3D=3D RTLLIB_PS_DISABLED) { - if (priv->rtllib->SetFwCmdHandler) - priv->rtllib->SetFwCmdHandler(dev, FW_CMD_LPS_ENTER); - _rtl92e_ps_set_mode(dev, RTLLIB_PS_MBCAST | - RTLLIB_PS_UNICAST); - } + if (priv->rtllib->ps =3D=3D RTLLIB_PS_DISABLED) + _rtl92e_ps_set_mode(dev, RTLLIB_PS_MBCAST | RTLLIB_PS_UNICAST); } else psc->LpsIdleCount++; } @@ -235,10 +231,7 @@ void rtl92e_leisure_ps_leave(struct net_device *dev) &priv->rtllib->pwr_save_ctrl; =20 if (psc->bLeisurePs) { - if (priv->rtllib->ps !=3D RTLLIB_PS_DISABLED) { + if (priv->rtllib->ps !=3D RTLLIB_PS_DISABLED) _rtl92e_ps_set_mode(dev, RTLLIB_PS_DISABLED); - if (priv->rtllib->SetFwCmdHandler) - priv->rtllib->SetFwCmdHandler(dev, FW_CMD_LPS_LEAVE); - } } } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index cc1ce106678c..6c1f56324bd6 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1714,8 +1714,6 @@ struct rtllib_device { bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device *dev); u8 (*rtllib_ap_sec_type)(struct rtllib_device *ieee); void (*InitialGainHandler)(struct net_device *dev, u8 Operation); - bool (*SetFwCmdHandler)(struct net_device *dev, - enum fw_cmd_io_type FwCmdIO); void (*UpdateBeaconInterruptHandler)(struct net_device *dev, bool start); void (*ScanOperationBackupHandler)(struct net_device *dev, --=20 2.40.1 From nobody Wed Feb 11 03:42:03 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 BB355C77B7A for ; Sat, 13 May 2023 18:10:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236538AbjEMSKj (ORCPT ); Sat, 13 May 2023 14:10:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50070 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236812AbjEMSKP (ORCPT ); Sat, 13 May 2023 14:10:15 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1C1D12D47 for ; Sat, 13 May 2023 11:09:43 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-50a20bfe366so2790270a12.0 for ; Sat, 13 May 2023 11:09:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001376; x=1686593376; 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=8VxLMT4xRiLk8QG1zBEjB+qxmXTQtCzKqJP+7ubfx9I=; b=T5BIobgx5E3zQz9zM+pzdOcJm+WOm1bdelItHUofUdvVj5cJILc8xgab7gnWVLqPF6 PjAR3tB4wX7Q2oGD7uTeNVgjf8g8FggS4M/JUwUX2wrW+LPPCFK13Ec2xm5ACsVHZ2sv gWc0RKDgdLJ1Oe4PpSDMFiSBNaRgprrxVdrCbpcm0StORYi5ztrCM6j4x9qWaoJtKeQL rGO0GlhgWI3AsVlAM/6mBW+cglLS1sKAWLJYBeKUc3y9GTg/wRMRjZ7AsGWl9JXmPbge 1HpeoeH2j/X6hfWdZT4p+c5EEJKoxQJy5P3fHPvmziF9pnI2j6QXmkPObvMDo98d4EWz y4Uw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001376; x=1686593376; 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=8VxLMT4xRiLk8QG1zBEjB+qxmXTQtCzKqJP+7ubfx9I=; b=FyUBlnOkJcW1qIolaHT3GjnI2n9Ik4Ic5kacsiHK2rYGyTHRrwClHyJUseU/Iysc7S oHMTWx7unN87V87dfrBz92GU24qSs9ZUiyzdg5p/bJ7IEQ1BDDzgK1vuS9lmzmjW6kVS kq6SRQz04jBTcn83Rl+9p+eEccYFSY5IoDHWYLVBhiijOkctOuBFNciPa+/RfynP3Jy3 LxSK/wleN4jZbEBnxM91TegWVhiOZev7wHBLXvhJzMkgClrLzGJK5q7yXaV3tM9TSPwY Bkt0kNukXMRVrjFk5SDscraV6jxkJsyUrSFGVxYCraDOSTY0rKTdt++BNQPfOu/2Rrru rHlw== X-Gm-Message-State: AC+VfDwFP5+8mKkyG6jvVCFhHlmwUqQl4f7/j+x5POePJ6MS10bubyk0 Bbu95lAWR1ixg4OKeWUMmVMDxAxUUHY= X-Google-Smtp-Source: ACHHUZ4ft+cn12hTN4Uuj5t0P2JuEBm/GeW5Gx0Gl8rrISnGI1AWEoPUKTxA0gNYCXIRPQICiyfrPw== X-Received: by 2002:a05:6402:2742:b0:50d:9ba4:52dc with SMTP id z2-20020a056402274200b0050d9ba452dcmr3206515edd.0.1684001376457; Sat, 13 May 2023 11:09:36 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id bn13-20020a170906c0cd00b0096599bf7029sm7119706ejb.145.2023.05.13.11.09.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:09:36 -0700 (PDT) Date: Sat, 13 May 2023 20:09:34 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 8/9] staging: rtl8192e: Remove undefined function UpdateBeaconInterruptHandler Message-ID: <7cc71096fb1e6fee755dd96de0095ef1fb6d51e1.1683960685.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 function UpdateBeaconInterruptHandler as it is not defined. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 -- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ------ 3 files changed, 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 3f8a58e32930..5fdee7b54f24 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -739,8 +739,6 @@ static void _rtl92e_init_priv_handler(struct net_device= *dev) priv->rtllib->rtllib_ips_leave =3D rtl92e_rtllib_ips_leave; =20 priv->rtllib->LedControlHandler =3D NULL; - priv->rtllib->UpdateBeaconInterruptHandler =3D NULL; - priv->rtllib->ScanOperationBackupHandler =3D rtl92e_scan_op_backup; } =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 6c1f56324bd6..8bafee31e50c 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1714,8 +1714,6 @@ struct rtllib_device { bool (*GetHalfNmodeSupportByAPsHandler)(struct net_device *dev); u8 (*rtllib_ap_sec_type)(struct rtllib_device *ieee); void (*InitialGainHandler)(struct net_device *dev, u8 Operation); - void (*UpdateBeaconInterruptHandler)(struct net_device *dev, - bool start); void (*ScanOperationBackupHandler)(struct net_device *dev, u8 Operation); void (*LedControlHandler)(struct net_device *dev, diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index bb28414b88bc..1fe0675033cb 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -2882,9 +2882,6 @@ void rtllib_start_protocol(struct rtllib_device *ieee) ieee->last_packet_time[i] =3D 0; } =20 - if (ieee->UpdateBeaconInterruptHandler) - ieee->UpdateBeaconInterruptHandler(ieee->dev, false); - ieee->wmm_acm =3D 0; /* if the user set the MAC of the ad-hoc cell and then * switch to managed mode, shall we make sure that association @@ -2894,9 +2891,6 @@ void rtllib_start_protocol(struct rtllib_device *ieee) if (ieee->iw_mode =3D=3D IW_MODE_INFRA) { rtllib_start_bss(ieee); } else if (ieee->iw_mode =3D=3D IW_MODE_ADHOC) { - if (ieee->UpdateBeaconInterruptHandler) - ieee->UpdateBeaconInterruptHandler(ieee->dev, true); - rtllib_start_ibss(ieee); =20 } else if (ieee->iw_mode =3D=3D IW_MODE_MASTER) { --=20 2.40.1 From nobody Wed Feb 11 03:42:03 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 62B3BC77B7A for ; Sat, 13 May 2023 18:10:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237587AbjEMSKy (ORCPT ); Sat, 13 May 2023 14:10:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237586AbjEMSKV (ORCPT ); Sat, 13 May 2023 14:10:21 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7532B49FF for ; Sat, 13 May 2023 11:09:54 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-504d149839bso2614970a12.1 for ; Sat, 13 May 2023 11:09:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684001383; x=1686593383; 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=wNF95drdMe2nB4iU+FTUbRjzrVIn7SuCBsnSfgapJkY=; b=dlwfiRMkQLXkcseVb90U1cEULAs6+E7XraQqo4ZmA5TuxA+R5VZSwGMT7ZIA0OdCvd XqaSnG4xBZegzSI3aO3KB5OrcLcbA/qQbsfOz+JODBDm8/1WxxVtzhS9pf0tkui09hPA UnWFdQ9TgQNjLnhFEs5cGBcqKaebC/qh1VesSnxqxjQPxbF0zTTwpsj+SFEb/V5SWGqg wNQMNu4wucwZnic91pqOdVJjsLxbfCndFWKxNoIGwTecFRBDwNKac7p1HE2zVRoVmjGt xfzwp9NMxqRE/5dfZN+nENrwjzeafL1WaIohLgfFlvvMe6iFntHVd59KkTLmwzmMnEfz +Xzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684001383; x=1686593383; 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=wNF95drdMe2nB4iU+FTUbRjzrVIn7SuCBsnSfgapJkY=; b=PpqQt92qBV02/M97+mT3TN7gGwsJaL8UaU5Ke4NHGjcsimFbQOdxzUnGsinQTPAw6q er+NLyYniZ4j3Lm2tx0MWy/DCNcB9clzRR6NMLMrrWnPbRCM8mJmX0h5qNyU0zhnw+ik XDOIuZgu/mpGbTvb7gCNtJVOEvpVDW5sd69V64wYovLtpluHiNT0ctrq63L/q1T9nIpR JKkr34RwfI7OFKiSXTXxJcIfbNrgE790IB5hvvyW9O17GGUEjfwK0BxAIJCd9LEaXNWZ SJWDLzMEZ2UnCXHbnFiH9Ln58oLxZMAnc+r/ef84w+XuDSUi9aa2MIDFvPJMVGE2VCgX HjDA== X-Gm-Message-State: AC+VfDxELUjxypFbKkyuKWL/2t4WRoga4XwUoscA1bheLctyLJ81KSRY uNGe5Sj0AIoVeP45ZMxuu4QZfziNxBM= X-Google-Smtp-Source: ACHHUZ4TTkgB5bvS27tjUvNXgCZHLYv/6cvfU1HY4C1jEGAq6jjQmFotJsYd96Br742mvn8UeeCuUw== X-Received: by 2002:a17:906:74d1:b0:965:9602:3ef0 with SMTP id z17-20020a17090674d100b0096596023ef0mr25591824ejl.0.1684001383077; Sat, 13 May 2023 11:09:43 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57935e01.dip0.t-ipconnect.de. [87.147.94.1]) by smtp.gmail.com with ESMTPSA id d4-20020a170907272400b00965e9b435dfsm7065022ejl.65.2023.05.13.11.09.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 May 2023 11:09:42 -0700 (PDT) Date: Sat, 13 May 2023 20:09:40 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 9/9] staging: rtl8192e: Remove undefined function LedControlHandler 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 function LedControlHandler as it is not defined. Remove resulting unused local variables bLedBlinking, type, fc and LedAction. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 26 ------------------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 --- drivers/staging/rtl8192e/rtllib.h | 2 -- drivers/staging/rtl8192e/rtllib_softmac.c | 10 ------- 5 files changed, 46 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index c612e31d1a84..d9d056d18fa3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -46,7 +46,6 @@ static void _rtl92e_update_msr(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); u8 msr; - enum led_ctl_mode LedAction =3D LED_CTL_NO_LINK; =20 msr =3D rtl92e_readb(dev, MSR); msr &=3D ~MSR_LINK_MASK; @@ -55,7 +54,6 @@ static void _rtl92e_update_msr(struct net_device *dev) case IW_MODE_INFRA: if (priv->rtllib->state =3D=3D RTLLIB_LINKED) msr |=3D MSR_LINK_MANAGED; - LedAction =3D LED_CTL_LINK; break; case IW_MODE_ADHOC: if (priv->rtllib->state =3D=3D RTLLIB_LINKED) @@ -70,8 +68,6 @@ static void _rtl92e_update_msr(struct net_device *dev) } =20 rtl92e_writeb(dev, MSR, msr); - if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler(dev, LedAction); } =20 void rtl92e_set_reg(struct net_device *dev, u8 variable, u8 *val) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 5fdee7b54f24..17b70dde7eeb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -737,8 +737,6 @@ static void _rtl92e_init_priv_handler(struct net_device= *dev) priv->rtllib->InitialGainHandler =3D rtl92e_init_gain; priv->rtllib->rtllib_ips_leave_wq =3D rtl92e_rtllib_ips_leave_wq; priv->rtllib->rtllib_ips_leave =3D rtl92e_rtllib_ips_leave; - - priv->rtllib->LedControlHandler =3D NULL; priv->rtllib->ScanOperationBackupHandler =3D rtl92e_scan_op_backup; } =20 @@ -1272,10 +1270,6 @@ static void _rtl92e_watchdog_wq_cb(void *data) ieee->is_roaming =3D true; ieee->is_set_key =3D false; ieee->link_change(dev); - if (ieee->LedControlHandler) - ieee->LedControlHandler(ieee->dev, - LED_CTL_START_TO_LINK); - notify_wx_assoc_event(ieee); =20 if (!(ieee->rtllib_ap_sec_type(ieee) & @@ -1506,7 +1500,6 @@ static short _rtl92e_tx(struct net_device *dev, struc= t sk_buff *skb) MAX_DEV_ADDR_SIZE); struct tx_desc *pdesc =3D NULL; struct rtllib_hdr_1addr *header =3D NULL; - u16 fc =3D 0, type =3D 0; u8 *pda_addr =3D NULL; int idx; u32 fwinfo_size =3D 0; @@ -1522,8 +1515,6 @@ static short _rtl92e_tx(struct net_device *dev, struc= t sk_buff *skb) fwinfo_size =3D sizeof(struct tx_fwinfo_8190pci); =20 header =3D (struct rtllib_hdr_1addr *)(((u8 *)skb->data) + fwinfo_size); - fc =3D le16_to_cpu(header->frame_ctl); - type =3D WLAN_FC_GET_TYPE(fc); pda_addr =3D header->addr1; =20 if (!is_broadcast_ether_addr(pda_addr) && !is_multicast_ether_addr(pda_ad= dr)) @@ -1545,11 +1536,6 @@ static short _rtl92e_tx(struct net_device *dev, stru= ct sk_buff *skb) spin_unlock_irqrestore(&priv->irq_th_lock, flags); return skb->len; } - - if (type =3D=3D RTLLIB_FTYPE_DATA) { - if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler(dev, LED_CTL_TX); - } rtl92e_fill_tx_desc(dev, pdesc, tcb_desc, skb); __skb_queue_tail(&ring->queue, skb); pdesc->OWN =3D 1; @@ -1776,8 +1762,6 @@ static void _rtl92e_rx_normal(struct net_device *dev) struct r8192_priv *priv =3D rtllib_priv(dev); struct rtllib_hdr_1addr *rtllib_hdr =3D NULL; bool unicast_packet =3D false; - bool bLedBlinking =3D true; - u16 fc =3D 0, type =3D 0; u32 skb_len =3D 0; int rx_queue_idx =3D RX_MPDU_QUEUE; =20 @@ -1821,16 +1805,6 @@ static void _rtl92e_rx_normal(struct net_device *dev) /* unicast packet */ unicast_packet =3D true; } - fc =3D le16_to_cpu(rtllib_hdr->frame_ctl); - type =3D WLAN_FC_GET_TYPE(fc); - if (type =3D=3D RTLLIB_FTYPE_MGMT) - bLedBlinking =3D false; - - if (bLedBlinking) - if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler(dev, - LED_CTL_RX); - skb_len =3D skb->len; =20 if (!rtllib_rx(priv->rtllib, skb, &stats)) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 0bb657fda06c..8b656980ee25 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -421,10 +421,6 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, mutex_unlock(&priv->rtllib->ips_mutex); } rtllib_stop_scan(priv->rtllib); - if (priv->rtllib->LedControlHandler) - priv->rtllib->LedControlHandler(dev, - LED_CTL_SITE_SURVEY); - if (priv->rtllib->rf_power_state !=3D rf_off) { priv->rtllib->actscanning =3D true; =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 8bafee31e50c..4aa5ce9f7792 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1716,8 +1716,6 @@ struct rtllib_device { void (*InitialGainHandler)(struct net_device *dev, u8 Operation); void (*ScanOperationBackupHandler)(struct net_device *dev, u8 Operation); - void (*LedControlHandler)(struct net_device *dev, - enum led_ctl_mode LedAction); void (*SetHwRegHandler)(struct net_device *dev, u8 variable, u8 *val); =20 void (*AllowAllDestAddrHandler)(struct net_device *dev, diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 1fe0675033cb..18885cda60f6 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1680,9 +1680,6 @@ inline void rtllib_softmac_new_net(struct rtllib_devi= ce *ieee, false; =20 ieee->state =3D RTLLIB_ASSOCIATING; - if (ieee->LedControlHandler !=3D NULL) - ieee->LedControlHandler(ieee->dev, - LED_CTL_START_TO_LINK); schedule_delayed_work( &ieee->associate_procedure_wq, 0); } else { @@ -2343,10 +2340,6 @@ rtllib_rx_deauth(struct rtllib_device *ieee, struct = sk_buff *skb) ieee->link_detect_info.bBusyTraffic =3D false; rtllib_disassociate(ieee); RemovePeerTS(ieee, header->addr2); - if (ieee->LedControlHandler !=3D NULL) - ieee->LedControlHandler(ieee->dev, - LED_CTL_START_TO_LINK); - if (!(ieee->rtllib_ap_sec_type(ieee) & (SEC_ALG_CCMP|SEC_ALG_TKIP))) schedule_delayed_work( @@ -2641,9 +2634,6 @@ static void rtllib_start_ibss_wq(void *data) ieee->link_change(ieee->dev); =20 HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); - if (ieee->LedControlHandler !=3D NULL) - ieee->LedControlHandler(ieee->dev, LED_CTL_LINK); - rtllib_start_send_beacons(ieee); =20 notify_wx_assoc_event(ieee); --=20 2.40.1