From nobody Mon Apr 6 03:10:24 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 F2ACEC6FA82 for ; Sat, 10 Sep 2022 18:03:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229598AbiIJSDD (ORCPT ); Sat, 10 Sep 2022 14:03:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55994 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbiIJSCy (ORCPT ); Sat, 10 Sep 2022 14:02:54 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A416B3AE70 for ; Sat, 10 Sep 2022 11:02:52 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oX4oZ-0000f7-SX; Sat, 10 Sep 2022 20:02:47 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 1/4] staging: r8188eu: remove empty rtw_set_scan_deny macro Date: Sat, 10 Sep 2022 20:02:33 +0200 Message-Id: <20220910180236.489808-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220910180236.489808-1-martin@kaiser.cx> References: <20220910180236.489808-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rtw_set_scan_deny macro does nothing. Remove it. Signed-off-by: Martin Kaiser Acked-by: Pavel Skripkin Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 2 -- drivers/staging/r8188eu/core/rtw_xmit.c | 3 --- drivers/staging/r8188eu/include/rtw_mlme.h | 1 - 3 files changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 2c80635b6478..596bb03b6ee3 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -904,8 +904,6 @@ void rtw_indicate_connect(struct adapter *padapter) } =20 pmlmepriv->to_roaming =3D 0; - - rtw_set_scan_deny(padapter, 3000); } =20 /* diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index d41d1d09d8ae..98864fc55b25 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -550,9 +550,6 @@ static s32 update_attrib(struct adapter *padapter, stru= ct sk_buff *pkt, struct p } } =20 - if ((pattrib->ether_type =3D=3D 0x888e) || (pattrib->dhcp_pkt =3D=3D 1)) - rtw_set_scan_deny(padapter, 3000); - /* If EAPOL , ARP , OR DHCP packet, driver must be in active mode. */ if ((pattrib->ether_type =3D=3D 0x0806) || (pattrib->ether_type =3D=3D 0x= 888e) || (pattrib->dhcp_pkt =3D=3D 1)) rtw_lps_ctrl_wk_cmd(padapter, LPS_CTRL_SPECIAL_PACKET, 1); diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index a959e2100c3f..30fb9b7d7ad2 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -540,7 +540,6 @@ void rtw_scan_timeout_handler(struct adapter *adapter); #define rtw_is_scan_deny(adapter) false #define rtw_clear_scan_deny(adapter) do {} while (0) #define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0) -#define rtw_set_scan_deny(adapter, ms) do {} while (0) =20 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); =20 --=20 2.30.2 From nobody Mon Apr 6 03:10:24 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 AA721ECAAD3 for ; Sat, 10 Sep 2022 18:03:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229594AbiIJSDE (ORCPT ); Sat, 10 Sep 2022 14:03:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229546AbiIJSCy (ORCPT ); Sat, 10 Sep 2022 14:02:54 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 84EA83AE5E for ; Sat, 10 Sep 2022 11:02:52 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oX4oa-0000f7-QL; Sat, 10 Sep 2022 20:02:48 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 2/4] staging: r8188eu: remove rtw_set_scan_deny_timer_hdl Date: Sat, 10 Sep 2022 20:02:34 +0200 Message-Id: <20220910180236.489808-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220910180236.489808-1-martin@kaiser.cx> References: <20220910180236.489808-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Remove the rtw_set_scan_deny_timer_hdl macro, it's not used. Signed-off-by: Martin Kaiser Acked-by: Pavel Skripkin Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/include/rtw_mlme.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 30fb9b7d7ad2..e000f0565458 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -539,7 +539,6 @@ void rtw_scan_timeout_handler(struct adapter *adapter); void rtw_dynamic_check_timer_handlder(struct adapter *adapter); #define rtw_is_scan_deny(adapter) false #define rtw_clear_scan_deny(adapter) do {} while (0) -#define rtw_set_scan_deny_timer_hdl(adapter) do {} while (0) =20 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); =20 --=20 2.30.2 From nobody Mon Apr 6 03:10:24 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 98869C6FA82 for ; Sat, 10 Sep 2022 18:02:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229560AbiIJSC4 (ORCPT ); Sat, 10 Sep 2022 14:02:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229504AbiIJSCy (ORCPT ); Sat, 10 Sep 2022 14:02:54 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A450B3AE72 for ; Sat, 10 Sep 2022 11:02:53 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oX4ob-0000f7-O2; Sat, 10 Sep 2022 20:02:49 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 3/4] staging: r8188eu: remove rtw_clear_scan_deny Date: Sat, 10 Sep 2022 20:02:35 +0200 Message-Id: <20220910180236.489808-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220910180236.489808-1-martin@kaiser.cx> References: <20220910180236.489808-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rtw_clear_scan_deny macro is empty. Remove it. Signed-off-by: Martin Kaiser Acked-by: Pavel Skripkin Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_mlme.c | 3 --- drivers/staging/r8188eu/include/rtw_mlme.h | 1 - 2 files changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 596bb03b6ee3..de722c199cce 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -264,8 +264,6 @@ int rtw_init_mlme_priv(struct adapter *padapter)/* stru= ct mlme_priv *pmlmepriv) =20 /* allocate DMA-able/Non-Page memory for cmd_buf and rsp_buf */ =20 - rtw_clear_scan_deny(padapter); - rtw_init_mlme_timer(padapter); =20 exit: @@ -928,7 +926,6 @@ void rtw_indicate_disconnect(struct adapter *padapter) =20 _clr_fwstate_(pmlmepriv, _FW_LINKED); rtw_led_control(padapter, LED_CTL_NO_LINK); - rtw_clear_scan_deny(padapter); } p2p_ps_wk_cmd(padapter, P2P_PS_DISABLE, 1); =20 diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index e000f0565458..47bf7ce228aa 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -538,7 +538,6 @@ void rtw_scan_timeout_handler(struct adapter *adapter); =20 void rtw_dynamic_check_timer_handlder(struct adapter *adapter); #define rtw_is_scan_deny(adapter) false -#define rtw_clear_scan_deny(adapter) do {} while (0) =20 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); =20 --=20 2.30.2 From nobody Mon Apr 6 03:10:24 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 C566BC6FA83 for ; Sat, 10 Sep 2022 18:03:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229451AbiIJSDG (ORCPT ); Sat, 10 Sep 2022 14:03:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56000 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229547AbiIJSCy (ORCPT ); Sat, 10 Sep 2022 14:02:54 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4FA84386A7 for ; Sat, 10 Sep 2022 11:02:54 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oX4oc-0000f7-MI; Sat, 10 Sep 2022 20:02:50 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 4/4] staging: r8188eu: rtw_is_scan_deny is always false Date: Sat, 10 Sep 2022 20:02:36 +0200 Message-Id: <20220910180236.489808-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220910180236.489808-1-martin@kaiser.cx> References: <20220910180236.489808-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The rtw_is_scan_deny macro returns false. Remove the macro and resulting dead code. Signed-off-by: Martin Kaiser Acked-by: Pavel Skripkin Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_ioctl_set.c | 5 ----- drivers/staging/r8188eu/include/rtw_mlme.h | 1 - 2 files changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_ioctl_set.c b/drivers/staging= /r8188eu/core/rtw_ioctl_set.c index d163a1a256ed..55e6b0f41dc3 100644 --- a/drivers/staging/r8188eu/core/rtw_ioctl_set.c +++ b/drivers/staging/r8188eu/core/rtw_ioctl_set.c @@ -351,11 +351,6 @@ u8 rtw_set_802_11_bssid_list_scan(struct adapter *pada= pter, struct ndis_802_11_s /* Scan or linking is in progress, do nothing. */ res =3D true; } else { - if (rtw_is_scan_deny(padapter)) { - indicate_wx_scan_complete_event(padapter); - return _SUCCESS; - } - spin_lock_bh(&pmlmepriv->lock); =20 res =3D rtw_sitesurvey_cmd(padapter, pssid, ssid_max_num); diff --git a/drivers/staging/r8188eu/include/rtw_mlme.h b/drivers/staging/r= 8188eu/include/rtw_mlme.h index 47bf7ce228aa..b69989cbab21 100644 --- a/drivers/staging/r8188eu/include/rtw_mlme.h +++ b/drivers/staging/r8188eu/include/rtw_mlme.h @@ -537,7 +537,6 @@ void _rtw_join_timeout_handler(struct adapter *adapter); void rtw_scan_timeout_handler(struct adapter *adapter); =20 void rtw_dynamic_check_timer_handlder(struct adapter *adapter); -#define rtw_is_scan_deny(adapter) false =20 void rtw_free_mlme_priv_ie_data(struct mlme_priv *pmlmepriv); =20 --=20 2.30.2