From nobody Tue Jun 30 14:20:37 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 A8402C433EF for ; Sat, 15 Jan 2022 16:55:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233218AbiAOQzz (ORCPT ); Sat, 15 Jan 2022 11:55:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230028AbiAOQzx (ORCPT ); Sat, 15 Jan 2022 11:55:53 -0500 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 D41D1C06161C for ; Sat, 15 Jan 2022 08:55:52 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLE-0005N8-FY; Sat, 15 Jan 2022 17:55:48 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 01/11] staging: r8188eu: remove unused externl variables Date: Sat, 15 Jan 2022 17:55:26 +0100 Message-Id: <20220115165536.231210-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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 a group of external variables which are not used in osdep_service.h or in the files where osdep_service.h is included. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 6c8241372a06..f42e15117c95 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -99,12 +99,6 @@ static inline void rtw_netif_stop_queue(struct net_devic= e *pnetdev) =20 extern int RTW_STATUS_CODE(int error_code); =20 -extern unsigned char MCS_rate_2R[16]; -extern unsigned char MCS_rate_1R[16]; -extern unsigned char RTW_WPA_OUI[]; -extern unsigned char WPA_TKIP_CIPHER[4]; -extern unsigned char RSN_TKIP_CIPHER[4]; - void *rtw_malloc2d(int h, int w, int size); =20 #define rtw_init_queue(q) \ --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 96F7FC4332F for ; Sat, 15 Jan 2022 16:55:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233236AbiAOQz4 (ORCPT ); Sat, 15 Jan 2022 11:55:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34076 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233182AbiAOQzz (ORCPT ); Sat, 15 Jan 2022 11:55:55 -0500 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 91579C061574 for ; Sat, 15 Jan 2022 08:55:54 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLG-0005N8-O8; Sat, 15 Jan 2022 17:55:50 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 02/11] staging: r8188eu: remove unused macros Date: Sat, 15 Jan 2022 17:55:27 +0100 Message-Id: <20220115165536.231210-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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 some unused macros from osdep_service.h. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index f42e15117c95..2f6b8acd0a10 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -70,10 +70,6 @@ static inline void _cancel_timer(struct timer_list *ptim= er,u8 *bcancelled) *bcancelled=3D true;/* true =3D=3D1; false=3D=3D0 */ } =20 -#define RTW_TIMER_HDL_ARGS void *FunctionContext -#define RTW_TIMER_HDL_NAME(name) rtw_##name##_timer_hdl -#define RTW_DECLARE_TIMER_HDL(name) void RTW_TIMER_HDL_NAME(name)(RTW_TIME= R_HDL_ARGS) - static inline int rtw_netif_queue_stopped(struct net_device *pnetdev) { return netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 0)) && --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 70988C433FE for ; Sat, 15 Jan 2022 16:56:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233303AbiAOQ4D (ORCPT ); Sat, 15 Jan 2022 11:56:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34082 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233225AbiAOQz4 (ORCPT ); Sat, 15 Jan 2022 11:55:56 -0500 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 A51B0C06161C for ; Sat, 15 Jan 2022 08:55:55 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLH-0005N8-Pu; Sat, 15 Jan 2022 17:55:51 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 03/11] staging: r8188eu: remove unused bitshift function Date: Sat, 15 Jan 2022 17:55:28 +0100 Message-Id: <20220115165536.231210-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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 bitshift function from osdep_service.h is not used. Remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 2f6b8acd0a10..6d03e135d1e3 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -163,15 +163,6 @@ static inline u32 _RND512(u32 sz) return val; } =20 -static inline u32 bitshift(u32 bitmask) -{ - u32 i; - - for (i =3D 0; i <=3D 31; i++) - if (((bitmask>>i) & 0x1) =3D=3D 1) break; - return i; -} - /* limitation of path length */ #define PATH_LENGTH_MAX PATH_MAX =20 --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 54E9CC433EF for ; Sat, 15 Jan 2022 16:56:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233269AbiAOQ4C (ORCPT ); Sat, 15 Jan 2022 11:56:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233233AbiAOQz4 (ORCPT ); Sat, 15 Jan 2022 11:55:56 -0500 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 4BD10C061574 for ; Sat, 15 Jan 2022 08:55:56 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLI-0005N8-Qf; Sat, 15 Jan 2022 17:55:52 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 04/11] staging: r8188eu: remove unused PATH_LENGTH_MAX define Date: Sat, 15 Jan 2022 17:55:29 +0100 Message-Id: <20220115165536.231210-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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" PATH_LENGTH_MAX in osdep_service.h is not used and can be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 6d03e135d1e3..c5de424842cc 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -163,9 +163,6 @@ static inline u32 _RND512(u32 sz) return val; } =20 -/* limitation of path length */ -#define PATH_LENGTH_MAX PATH_MAX - struct rtw_netdev_priv_indicator { void *priv; u32 sizeof_priv; --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 047B0C433FE for ; Sat, 15 Jan 2022 16:56:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233238AbiAOQz7 (ORCPT ); Sat, 15 Jan 2022 11:55:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233237AbiAOQz5 (ORCPT ); Sat, 15 Jan 2022 11:55:57 -0500 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 C5F6AC06161C for ; Sat, 15 Jan 2022 08:55:56 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLJ-0005N8-Mr; Sat, 15 Jan 2022 17:55:53 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 05/11] staging: r8188eu: remove rtw_list_delete wrapper Date: Sat, 15 Jan 2022 17:55:30 +0100 Message-Id: <20220115165536.231210-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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_list_delete wrapper function. Call list_del_init directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_cmd.c | 2 +- drivers/staging/r8188eu/include/osdep_service.h | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 3d22a8888ea7..410b5dacfaa7 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -133,7 +133,7 @@ static struct cmd_obj *_rtw_dequeue_cmd(struct __queue = *queue) obj =3D NULL; } else { obj =3D container_of((&queue->queue)->next, struct cmd_obj, list); - rtw_list_delete(&obj->list); + list_del_init(&obj->list); } =20 spin_unlock_irqrestore(&queue->lock, flags); diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index c5de424842cc..8ca9f86e3c9b 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -54,11 +54,6 @@ static inline struct list_head *get_list_head(struct __q= ueue *queue) return (&(queue->queue)); } =20 -static inline void rtw_list_delete(struct list_head *plist) -{ - list_del_init(plist); -} - static inline void _set_timer(struct timer_list *ptimer,u32 delay_time) { mod_timer(ptimer , (jiffies+(delay_time*HZ/1000))); --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 5F390C433F5 for ; Sat, 15 Jan 2022 16:56:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233296AbiAOQ4F (ORCPT ); Sat, 15 Jan 2022 11:56:05 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233244AbiAOQz7 (ORCPT ); Sat, 15 Jan 2022 11:55:59 -0500 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 AC1AFC06161C for ; Sat, 15 Jan 2022 08:55:58 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLK-0005N8-Kf; Sat, 15 Jan 2022 17:55:54 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 06/11] staging: r8188eu: remove _cancel_timer wrapper Date: Sat, 15 Jan 2022 17:55:31 +0100 Message-Id: <20220115165536.231210-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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 _cancel_timer wrapper function and call del_timer_sync directly. None of the callers needs the bcancelled variable that's populated by _cancel_timer, these variables can be removed in the calling functions. rtw_surveydone_event_callback calls _cancel_timer only if it believes that the timer is currently running. We can drop this. It's safe to call del_timer_sync when the timer is not running. The timer in question, scan_to_timer, is used only for the site survey command (the rtw_survey functions) so we won't be stopping it while it's in use by someone else. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_cmd.c | 3 +-- drivers/staging/r8188eu/core/rtw_mlme.c | 14 ++++---------- drivers/staging/r8188eu/core/rtw_p2p.c | 4 +--- drivers/staging/r8188eu/include/osdep_service.h | 6 ------ 4 files changed, 6 insertions(+), 21 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_cmd.c b/drivers/staging/r8188= eu/core/rtw_cmd.c index 410b5dacfaa7..266bb7db5252 100644 --- a/drivers/staging/r8188eu/core/rtw_cmd.c +++ b/drivers/staging/r8188eu/core/rtw_cmd.c @@ -1460,7 +1460,6 @@ void rtw_joinbss_cmd_callback(struct adapter *padapte= r, struct cmd_obj *pcmd) =20 void rtw_createbss_cmd_callback(struct adapter *padapter, struct cmd_obj *= pcmd) { - u8 timer_cancelled; struct sta_info *psta =3D NULL; struct wlan_network *pwlan =3D NULL; struct mlme_priv *pmlmepriv =3D &padapter->mlmepriv; @@ -1470,7 +1469,7 @@ void rtw_createbss_cmd_callback(struct adapter *padap= ter, struct cmd_obj *pcmd) if (pcmd->res !=3D H2C_SUCCESS) _set_timer(&pmlmepriv->assoc_timer, 1); =20 - _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled); + del_timer_sync(&pmlmepriv->assoc_timer); =20 spin_lock_bh(&pmlmepriv->lock); =20 diff --git a/drivers/staging/r8188eu/core/rtw_mlme.c b/drivers/staging/r818= 8eu/core/rtw_mlme.c index 394e8a5ce03c..e76a11422f6f 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme.c +++ b/drivers/staging/r8188eu/core/rtw_mlme.c @@ -674,7 +674,6 @@ void rtw_survey_event_callback(struct adapter *adapter,= u8 *pbuf) void rtw_surveydone_event_callback(struct adapter *adapter, u8 *pbuf) { struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; - u8 timer_cancelled =3D 0; =20 spin_lock_bh(&pmlmepriv->lock); =20 @@ -684,16 +683,12 @@ void rtw_surveydone_event_callback(struct adapter *ad= apter, u8 *pbuf) pmlmepriv->wps_probe_req_ie =3D NULL; } =20 - if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) { - timer_cancelled =3D 1; - + if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY)) _clr_fwstate_(pmlmepriv, _FW_UNDER_SURVEY); - } =20 spin_unlock_bh(&pmlmepriv->lock); =20 - if (timer_cancelled) - _cancel_timer(&pmlmepriv->scan_to_timer, &timer_cancelled); + del_timer_sync(&pmlmepriv->scan_to_timer); =20 spin_lock_bh(&pmlmepriv->lock); rtw_set_signal_stat_timer(&adapter->recvpriv); @@ -1017,7 +1012,6 @@ static void rtw_joinbss_update_network(struct adapter= *padapter, struct wlan_net =20 void rtw_joinbss_event_prehandle(struct adapter *adapter, u8 *pbuf) { - u8 timer_cancelled; struct sta_info *ptarget_sta =3D NULL, *pcur_sta =3D NULL; struct sta_priv *pstapriv =3D &adapter->stapriv; struct mlme_priv *pmlmepriv =3D &adapter->mlmepriv; @@ -1092,8 +1086,8 @@ void rtw_joinbss_event_prehandle(struct adapter *adap= ter, u8 *pbuf) rtw_indicate_connect(adapter); } =20 - /* s5. Cancle assoc_timer */ - _cancel_timer(&pmlmepriv->assoc_timer, &timer_cancelled); + /* s5. Cancel assoc_timer */ + del_timer_sync(&pmlmepriv->assoc_timer); } else { spin_unlock_bh(&pmlmepriv->scanned_queue.lock); goto ignore_joinbss_callback; diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188= eu/core/rtw_p2p.c index 7b30b9b64b41..50b4fca869a7 100644 --- a/drivers/staging/r8188eu/core/rtw_p2p.c +++ b/drivers/staging/r8188eu/core/rtw_p2p.c @@ -1380,9 +1380,7 @@ u8 process_p2p_group_negotation_confirm(struct wifidi= rect_info *pwdinfo, u8 *pfr result =3D attr_content; =20 if (attr_content =3D=3D P2P_STATUS_SUCCESS) { - u8 bcancelled =3D 0; - - _cancel_timer(&pwdinfo->restore_p2p_state_timer, &bcancelled); + del_timer_sync(&pwdinfo->restore_p2p_state_timer); =20 /* Commented by Albert 20100911 */ /* Todo: Need to handle the case which both Intents are the same. */ diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 8ca9f86e3c9b..754691cb2b12 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -59,12 +59,6 @@ static inline void _set_timer(struct timer_list *ptimer,= u32 delay_time) mod_timer(ptimer , (jiffies+(delay_time*HZ/1000))); } =20 -static inline void _cancel_timer(struct timer_list *ptimer,u8 *bcancelled) -{ - del_timer_sync(ptimer); - *bcancelled=3D true;/* true =3D=3D1; false=3D=3D0 */ -} - static inline int rtw_netif_queue_stopped(struct net_device *pnetdev) { return netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 0)) && --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 632F0C433F5 for ; Sat, 15 Jan 2022 16:56:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232254AbiAOQ4G (ORCPT ); Sat, 15 Jan 2022 11:56:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34114 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233253AbiAOQ4B (ORCPT ); Sat, 15 Jan 2022 11:56:01 -0500 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 4053CC061574 for ; Sat, 15 Jan 2022 08:56:00 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLL-0005N8-Ov; Sat, 15 Jan 2022 17:55:55 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 07/11] staging: r8188eu: call msecs_to_jiffies in _set_timer Date: Sat, 15 Jan 2022 17:55:32 +0100 Message-Id: <20220115165536.231210-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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 _set_timer wrapper function takes a timeout in milliseconds. Call msecs_to_jiffies to convert the timeout to jiffies. Don't do the calculation ourselves. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 754691cb2b12..e52e78b2c6b0 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -56,7 +56,7 @@ static inline struct list_head *get_list_head(struct __qu= eue *queue) =20 static inline void _set_timer(struct timer_list *ptimer,u32 delay_time) { - mod_timer(ptimer , (jiffies+(delay_time*HZ/1000))); + mod_timer(ptimer, jiffies + msecs_to_jiffies(delay_time)); } =20 static inline int rtw_netif_queue_stopped(struct net_device *pnetdev) --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 D0AA8C433FE for ; Sat, 15 Jan 2022 16:56:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233376AbiAOQ4P (ORCPT ); Sat, 15 Jan 2022 11:56:15 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233274AbiAOQ4B (ORCPT ); Sat, 15 Jan 2022 11:56:01 -0500 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 0DCB5C06173E for ; Sat, 15 Jan 2022 08:56:01 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLM-0005N8-NC; Sat, 15 Jan 2022 17:55:56 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 08/11] staging: r8188eu: remove rtw_netif_wake_queue wrapper Date: Sat, 15 Jan 2022 17:55:33 +0100 Message-Id: <20220115165536.231210-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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_netif_wake_queue wrapper function. Call netif_tx_wake_all_queues directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 5 ----- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index e52e78b2c6b0..b8f983a1254e 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -67,11 +67,6 @@ static inline int rtw_netif_queue_stopped(struct net_dev= ice *pnetdev) netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 3)); } =20 -static inline void rtw_netif_wake_queue(struct net_device *pnetdev) -{ - netif_tx_wake_all_queues(pnetdev); -} - static inline void rtw_netif_start_queue(struct net_device *pnetdev) { netif_tx_start_all_queues(pnetdev); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 08d719822062..2e4ad090c77c 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -656,7 +656,7 @@ int _netdev_open(struct net_device *pnetdev) if (!rtw_netif_queue_stopped(pnetdev)) rtw_netif_start_queue(pnetdev); else - rtw_netif_wake_queue(pnetdev); + netif_tx_wake_all_queues(pnetdev); =20 netdev_br_init(pnetdev); =20 --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 1B7D6C433F5 for ; Sat, 15 Jan 2022 16:56:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233306AbiAOQ4K (ORCPT ); Sat, 15 Jan 2022 11:56:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233239AbiAOQ4B (ORCPT ); Sat, 15 Jan 2022 11:56:01 -0500 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 8FCF3C06161C for ; Sat, 15 Jan 2022 08:56:01 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLN-0005N8-PX; Sat, 15 Jan 2022 17:55:57 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 09/11] staging: r8188eu: remove rtw_netif_start_queue wrapper Date: Sat, 15 Jan 2022 17:55:34 +0100 Message-Id: <20220115165536.231210-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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_netif_start_queue wrapper function. Call netif_tx_start_all_queues directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 5 ----- drivers/staging/r8188eu/os_dep/os_intfs.c | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index b8f983a1254e..51a22ffe41e2 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -67,11 +67,6 @@ static inline int rtw_netif_queue_stopped(struct net_dev= ice *pnetdev) netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 3)); } =20 -static inline void rtw_netif_start_queue(struct net_device *pnetdev) -{ - netif_tx_start_all_queues(pnetdev); -} - static inline void rtw_netif_stop_queue(struct net_device *pnetdev) { netif_tx_stop_all_queues(pnetdev); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 2e4ad090c77c..96b49cee3ac4 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -654,7 +654,7 @@ int _netdev_open(struct net_device *pnetdev) rtw_set_pwr_state_check_timer(&padapter->pwrctrlpriv); =20 if (!rtw_netif_queue_stopped(pnetdev)) - rtw_netif_start_queue(pnetdev); + netif_tx_start_all_queues(pnetdev); else netif_tx_wake_all_queues(pnetdev); =20 --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 E5D7DC433EF for ; Sat, 15 Jan 2022 16:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233350AbiAOQ4M (ORCPT ); Sat, 15 Jan 2022 11:56:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34132 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233304AbiAOQ4D (ORCPT ); Sat, 15 Jan 2022 11:56:03 -0500 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 222FEC061574 for ; Sat, 15 Jan 2022 08:56:03 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLP-0005N8-F2; Sat, 15 Jan 2022 17:55:59 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 10/11] staging: r8188eu: remove rtw_netif_stop_queue wrapper Date: Sat, 15 Jan 2022 17:55:35 +0100 Message-Id: <20220115165536.231210-11-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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_netif_stop_queue wrapper function. Call netif_tx_stop_all_queues directly. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/osdep_service.h | 5 ----- drivers/staging/r8188eu/os_dep/os_intfs.c | 4 ++-- drivers/staging/r8188eu/os_dep/usb_intf.c | 2 +- 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index 51a22ffe41e2..fca8f3d116c2 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -67,11 +67,6 @@ static inline int rtw_netif_queue_stopped(struct net_dev= ice *pnetdev) netif_tx_queue_stopped(netdev_get_tx_queue(pnetdev, 3)); } =20 -static inline void rtw_netif_stop_queue(struct net_device *pnetdev) -{ - netif_tx_stop_all_queues(pnetdev); -} - extern int RTW_STATUS_CODE(int error_code); =20 void *rtw_malloc2d(int h, int w, int size); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index 96b49cee3ac4..ef4ba0f22c09 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -667,7 +667,7 @@ int _netdev_open(struct net_device *pnetdev) netdev_open_error: padapter->bup =3D false; netif_carrier_off(pnetdev); - rtw_netif_stop_queue(pnetdev); + netif_tx_stop_all_queues(pnetdev); DBG_88E("-88eu_drv - drv_open fail, bup =3D%d\n", padapter->bup); return -1; } @@ -769,7 +769,7 @@ int netdev_close(struct net_device *pnetdev) /* s1. */ if (pnetdev) { if (!rtw_netif_queue_stopped(pnetdev)) - rtw_netif_stop_queue(pnetdev); + netif_tx_stop_all_queues(pnetdev); } =20 /* s2. */ diff --git a/drivers/staging/r8188eu/os_dep/usb_intf.c b/drivers/staging/r8= 188eu/os_dep/usb_intf.c index 91792dfd3bbe..1b1b8bb165ba 100644 --- a/drivers/staging/r8188eu/os_dep/usb_intf.c +++ b/drivers/staging/r8188eu/os_dep/usb_intf.c @@ -236,7 +236,7 @@ static int rtw_suspend(struct usb_interface *pusb_intf,= pm_message_t message) /* s1. */ if (pnetdev) { netif_carrier_off(pnetdev); - rtw_netif_stop_queue(pnetdev); + netif_tx_stop_all_queues(pnetdev); } =20 /* s2. */ --=20 2.30.2 From nobody Tue Jun 30 14:20:37 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 87D96C433F5 for ; Sat, 15 Jan 2022 16:56:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233289AbiAOQ4Q (ORCPT ); Sat, 15 Jan 2022 11:56:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34150 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233277AbiAOQ4F (ORCPT ); Sat, 15 Jan 2022 11:56:05 -0500 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 59A99C06173F for ; Sat, 15 Jan 2022 08:56:05 -0800 (PST) Received: from dslb-178-004-201-171.178.004.pools.vodafone-ip.de ([178.4.201.171] 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 1n8mLQ-0005N8-GU; Sat, 15 Jan 2022 17:56:00 +0100 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 11/11] staging: r8188eu: remove _cancel_timer_ex wrapper Date: Sat, 15 Jan 2022 17:55:36 +0100 Message-Id: <20220115165536.231210-12-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220115165536.231210-1-martin@kaiser.cx> References: <20220115165536.231210-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" Replace the _cancel_timer_ex wrapper function with a call to del_timer_sync. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_mlme_ext.c | 38 +++++++++---------- drivers/staging/r8188eu/core/rtw_p2p.c | 10 ++--- drivers/staging/r8188eu/core/rtw_recv.c | 2 +- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 6 +-- .../staging/r8188eu/include/osdep_service.h | 5 --- drivers/staging/r8188eu/os_dep/ioctl_linux.c | 2 +- drivers/staging/r8188eu/os_dep/os_intfs.c | 16 ++++---- 7 files changed, 37 insertions(+), 42 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/= r8188eu/core/rtw_mlme_ext.c index a169a7a39ebc..beb3b3392387 100644 --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c @@ -389,9 +389,9 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext) return; =20 if (padapter->bDriverStopped) { - _cancel_timer_ex(&pmlmeext->survey_timer); - _cancel_timer_ex(&pmlmeext->link_timer); - /* _cancel_timer_ex(&pmlmeext->ADDBA_timer); */ + del_timer_sync(&pmlmeext->survey_timer); + del_timer_sync(&pmlmeext->link_timer); + /* del_timer_sync(&pmlmeext->ADDBA_timer); */ } } =20 @@ -1402,7 +1402,7 @@ unsigned int OnAssocRsp(struct adapter *padapter, str= uct recv_frame *precv_frame if (pmlmeinfo->state & WIFI_FW_ASSOC_SUCCESS) return _SUCCESS; =20 - _cancel_timer_ex(&pmlmeext->link_timer); + del_timer_sync(&pmlmeext->link_timer); =20 /* status */ status =3D le16_to_cpu(*(__le16 *)(pframe + WLAN_HDR_A3_LEN + 2)); @@ -1481,7 +1481,7 @@ unsigned int OnDeAuth(struct adapter *padapter, struc= t recv_frame *precv_frame) return _SUCCESS; =20 if (pwdinfo->rx_invitereq_info.scan_op_ch_only) { - _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); + del_timer_sync(&pwdinfo->reset_ch_sitesurvey); _set_timer(&pwdinfo->reset_ch_sitesurvey, 10); } =20 @@ -1556,7 +1556,7 @@ unsigned int OnDisassoc(struct adapter *padapter, str= uct recv_frame *precv_frame return _SUCCESS; =20 if (pwdinfo->rx_invitereq_info.scan_op_ch_only) { - _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); + del_timer_sync(&pwdinfo->reset_ch_sitesurvey); _set_timer(&pwdinfo->reset_ch_sitesurvey, 10); } =20 @@ -3737,7 +3737,7 @@ static unsigned int on_action_public_p2p(struct recv_= frame *precv_frame) if (rtw_action_public_decache(precv_frame, dialogToken) =3D=3D _FAIL) return _FAIL; =20 - _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); + del_timer_sync(&pwdinfo->reset_ch_sitesurvey); /* Do nothing if the driver doesn't enable the P2P function. */ if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE) || rtw_p2p_chk_state(pwdin= fo, P2P_STATE_IDLE)) return _SUCCESS; @@ -3755,7 +3755,7 @@ static unsigned int on_action_public_p2p(struct recv_= frame *precv_frame) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_FAIL)) { /* Commented by Albert 20110526 */ /* In this case, this means the previous nego fail doesn't be reset yet= . */ - _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); + del_timer_sync(&pwdinfo->restore_p2p_state_timer); /* Restore the previous p2p state */ rtw_p2p_set_state(pwdinfo, rtw_p2p_pre_state(pwdinfo)); DBG_88E("[%s] Restore the previous p2p state to %d\n", __func__, rtw_p2= p_state(pwdinfo)); @@ -3784,7 +3784,7 @@ static unsigned int on_action_public_p2p(struct recv_= frame *precv_frame) if (rtw_p2p_chk_state(pwdinfo, P2P_STATE_GONEGO_ING)) { /* Commented by Albert 20110425 */ /* The restore timer is enabled when issuing the nego request frame of = rtw_p2p_connect function. */ - _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); + del_timer_sync(&pwdinfo->restore_p2p_state_timer); pwdinfo->nego_req_info.benable =3D false; result =3D process_p2p_group_negotation_resp(pwdinfo, frame_body, len); issue_p2p_GO_confirm(pwdinfo->padapter, GetAddr2Ptr(pframe), result); @@ -3935,7 +3935,7 @@ static unsigned int on_action_public_p2p(struct recv_= frame *precv_frame) u32 attr_contentlen =3D 0; =20 DBG_88E("[%s] Got invite response frame!\n", __func__); - _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); + del_timer_sync(&pwdinfo->restore_p2p_state_timer); p2p_ie =3D rtw_get_p2p_ie(frame_body + _PUBLIC_ACTION_IE_OFFSET_, len - = _PUBLIC_ACTION_IE_OFFSET_, NULL, &p2p_ielen); if (p2p_ie) { rtw_get_p2p_attr_content(p2p_ie, p2p_ielen, P2P_ATTR_STATUS, &attr_cont= ent, &attr_contentlen); @@ -3993,7 +3993,7 @@ static unsigned int on_action_public_p2p(struct recv_= frame *precv_frame) DBG_88E("[%s] Got Provisioning Discovery Response Frame\n", __func__); /* Commented by Albert 20110426 */ /* The restore timer is enabled when issuing the provisioing request fra= me in rtw_p2p_prov_disc function. */ - _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); + del_timer_sync(&pwdinfo->restore_p2p_state_timer); rtw_p2p_set_state(pwdinfo, P2P_STATE_RX_PROVISION_DIS_RSP); process_p2p_provdisc_resp(pwdinfo, pframe); _set_timer(&pwdinfo->restore_p2p_state_timer, P2P_PROVISION_TIMEOUT); @@ -5605,7 +5605,7 @@ static int _issue_deauth(struct adapter *padapter, un= signed char *da, unsigned s struct wifidirect_info *pwdinfo =3D &padapter->wdinfo; =20 if (!(rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) && (pwdinfo->rx_inviter= eq_info.scan_op_ch_only)) { - _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); + del_timer_sync(&pwdinfo->reset_ch_sitesurvey); _set_timer(&pwdinfo->reset_ch_sitesurvey, 10); } =20 @@ -6454,7 +6454,7 @@ void start_clnt_auth(struct adapter *padapter) struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 - _cancel_timer_ex(&pmlmeext->link_timer); + del_timer_sync(&pmlmeext->link_timer); =20 pmlmeinfo->state &=3D (~WIFI_FW_AUTH_NULL); pmlmeinfo->state |=3D WIFI_FW_AUTH_STATE; @@ -6483,7 +6483,7 @@ void start_clnt_assoc(struct adapter *padapter) struct mlme_ext_priv *pmlmeext =3D &padapter->mlmeextpriv; struct mlme_ext_info *pmlmeinfo =3D &pmlmeext->mlmext_info; =20 - _cancel_timer_ex(&pmlmeext->link_timer); + del_timer_sync(&pmlmeext->link_timer); =20 pmlmeinfo->state &=3D (~(WIFI_FW_AUTH_NULL | WIFI_FW_AUTH_STATE)); pmlmeinfo->state |=3D (WIFI_FW_AUTH_SUCCESS | WIFI_FW_ASSOC_STATE); @@ -7102,7 +7102,7 @@ void mlmeext_sta_del_event_callback(struct adapter *p= adapter) /* set MSR to no link state -> infra. mode */ Set_MSR(padapter, _HW_STATE_STATION_); =20 - _cancel_timer_ex(&pmlmeext->link_timer); + del_timer_sync(&pmlmeext->link_timer); } } =20 @@ -7441,7 +7441,7 @@ u8 createbss_hdl(struct adapter *padapter, u8 *pbuf) Switch_DM_Func(padapter, DYNAMIC_FUNC_DISABLE, false); =20 /* cancel link timer */ - _cancel_timer_ex(&pmlmeext->link_timer); + del_timer_sync(&pmlmeext->link_timer); =20 /* clear CAM */ flush_all_cam_entry(padapter); @@ -7481,7 +7481,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) /* clear CAM */ flush_all_cam_entry(padapter); =20 - _cancel_timer_ex(&pmlmeext->link_timer); + del_timer_sync(&pmlmeext->link_timer); =20 /* set MSR to nolink -> infra. mode */ Set_MSR(padapter, _HW_STATE_STATION_); @@ -7566,7 +7566,7 @@ u8 join_cmd_hdl(struct adapter *padapter, u8 *pbuf) SetHwReg8188EU(padapter, HW_VAR_MLME_JOIN, (u8 *)(&join_type)); =20 /* cancel link timer */ - _cancel_timer_ex(&pmlmeext->link_timer); + del_timer_sync(&pmlmeext->link_timer); =20 start_clnt_join(padapter); =20 @@ -7609,7 +7609,7 @@ u8 disconnect_hdl(struct adapter *padapter, unsigned = char *pbuf) =20 flush_all_cam_entry(padapter); =20 - _cancel_timer_ex(&pmlmeext->link_timer); + del_timer_sync(&pmlmeext->link_timer); =20 rtw_free_uc_swdec_pending_queue(padapter); =20 diff --git a/drivers/staging/r8188eu/core/rtw_p2p.c b/drivers/staging/r8188= eu/core/rtw_p2p.c index 50b4fca869a7..718f67ad5ddb 100644 --- a/drivers/staging/r8188eu/core/rtw_p2p.c +++ b/drivers/staging/r8188eu/core/rtw_p2p.c @@ -1947,11 +1947,11 @@ int rtw_p2p_enable(struct adapter *padapter, enum P= 2P_ROLE role) =20 /* Disable P2P function */ if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { - _cancel_timer_ex(&pwdinfo->find_phase_timer); - _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); - _cancel_timer_ex(&pwdinfo->pre_tx_scan_timer); - _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey); - _cancel_timer_ex(&pwdinfo->reset_ch_sitesurvey2); + del_timer_sync(&pwdinfo->find_phase_timer); + del_timer_sync(&pwdinfo->restore_p2p_state_timer); + del_timer_sync(&pwdinfo->pre_tx_scan_timer); + del_timer_sync(&pwdinfo->reset_ch_sitesurvey); + del_timer_sync(&pwdinfo->reset_ch_sitesurvey2); rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE); rtw_p2p_set_role(pwdinfo, P2P_ROLE_DISABLE); memset(&pwdinfo->rx_prov_disc_info, 0x00, sizeof(struct rx_provdisc_req= _info)); diff --git a/drivers/staging/r8188eu/core/rtw_recv.c b/drivers/staging/r818= 8eu/core/rtw_recv.c index 5438a73ba06b..318c71ed90e1 100644 --- a/drivers/staging/r8188eu/core/rtw_recv.c +++ b/drivers/staging/r8188eu/core/rtw_recv.c @@ -1714,7 +1714,7 @@ static int recv_indicatepkt_reorder(struct adapter *p= adapter, struct recv_frame spin_unlock_bh(&ppending_recvframe_queue->lock); } else { spin_unlock_bh(&ppending_recvframe_queue->lock); - _cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer); + del_timer_sync(&preorder_ctrl->reordering_ctrl_timer); } =20 return _SUCCESS; diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r= 8188eu/core/rtw_sta_mgt.c index 54561ff239a0..6553bfa314fa 100644 --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c @@ -138,7 +138,7 @@ u32 _rtw_free_sta_priv(struct sta_priv *pstapriv) =20 for (i =3D 0; i < 16; i++) { preorder_ctrl =3D &psta->recvreorder_ctrl[i]; - _cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer); + del_timer_sync(&preorder_ctrl->reordering_ctrl_timer); } } } @@ -276,7 +276,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct s= ta_info *psta) _rtw_init_sta_xmit_priv(&psta->sta_xmitpriv); _rtw_init_sta_recv_priv(&psta->sta_recvpriv); =20 - _cancel_timer_ex(&psta->addba_retry_timer); + del_timer_sync(&psta->addba_retry_timer); =20 /* for A-MPDU Rx reordering buffer control, cancel reordering_ctrl_timer = */ for (i =3D 0; i < 16 ; i++) { @@ -287,7 +287,7 @@ u32 rtw_free_stainfo(struct adapter *padapter, struct s= ta_info *psta) =20 preorder_ctrl =3D &psta->recvreorder_ctrl[i]; =20 - _cancel_timer_ex(&preorder_ctrl->reordering_ctrl_timer); + del_timer_sync(&preorder_ctrl->reordering_ctrl_timer); =20 ppending_recvframe_queue =3D &preorder_ctrl->pending_recvframe_queue; =20 diff --git a/drivers/staging/r8188eu/include/osdep_service.h b/drivers/stag= ing/r8188eu/include/osdep_service.h index fca8f3d116c2..1e27706c50bc 100644 --- a/drivers/staging/r8188eu/include/osdep_service.h +++ b/drivers/staging/r8188eu/include/osdep_service.h @@ -83,11 +83,6 @@ s32 rtw_get_passing_time_ms(u32 start); =20 void rtw_usleep_os(int us); =20 -static inline unsigned char _cancel_timer_ex(struct timer_list *ptimer) -{ - return del_timer_sync(ptimer); -} - static inline void flush_signals_thread(void) { if (signal_pending (current)) diff --git a/drivers/staging/r8188eu/os_dep/ioctl_linux.c b/drivers/staging= /r8188eu/os_dep/ioctl_linux.c index b9f9698d70cf..aae7401367c3 100644 --- a/drivers/staging/r8188eu/os_dep/ioctl_linux.c +++ b/drivers/staging/r8188eu/os_dep/ioctl_linux.c @@ -3045,7 +3045,7 @@ static int rtw_p2p_connect(struct net_device *dev, memcpy(pwdinfo->nego_req_info.peerDevAddr, pnetwork->network.MacAddress,= ETH_ALEN); pwdinfo->nego_req_info.benable =3D true; =20 - _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); + del_timer_sync(&pwdinfo->restore_p2p_state_timer); if (rtw_p2p_state(pwdinfo) !=3D P2P_STATE_GONEGO_OK) { /* Restore to the listen state if the current p2p state is not nego OK = */ rtw_p2p_set_state(pwdinfo, P2P_STATE_LISTEN); diff --git a/drivers/staging/r8188eu/os_dep/os_intfs.c b/drivers/staging/r8= 188eu/os_dep/os_intfs.c index ef4ba0f22c09..3c9d5142af48 100644 --- a/drivers/staging/r8188eu/os_dep/os_intfs.c +++ b/drivers/staging/r8188eu/os_dep/os_intfs.c @@ -525,18 +525,18 @@ u8 rtw_init_drv_sw(struct adapter *padapter) =20 void rtw_cancel_all_timer(struct adapter *padapter) { - _cancel_timer_ex(&padapter->mlmepriv.assoc_timer); + del_timer_sync(&padapter->mlmepriv.assoc_timer); =20 - _cancel_timer_ex(&padapter->mlmepriv.scan_to_timer); + del_timer_sync(&padapter->mlmepriv.scan_to_timer); =20 - _cancel_timer_ex(&padapter->mlmepriv.dynamic_chk_timer); + del_timer_sync(&padapter->mlmepriv.dynamic_chk_timer); =20 /* cancel sw led timer */ rtl8188eu_DeInitSwLeds(padapter); =20 - _cancel_timer_ex(&padapter->pwrctrlpriv.pwr_state_check_timer); + del_timer_sync(&padapter->pwrctrlpriv.pwr_state_check_timer); =20 - _cancel_timer_ex(&padapter->recvpriv.signal_stat_timer); + del_timer_sync(&padapter->recvpriv.signal_stat_timer); } =20 u8 rtw_free_drv_sw(struct adapter *padapter) @@ -547,9 +547,9 @@ u8 rtw_free_drv_sw(struct adapter *padapter) { struct wifidirect_info *pwdinfo =3D &padapter->wdinfo; if (!rtw_p2p_chk_state(pwdinfo, P2P_STATE_NONE)) { - _cancel_timer_ex(&pwdinfo->find_phase_timer); - _cancel_timer_ex(&pwdinfo->restore_p2p_state_timer); - _cancel_timer_ex(&pwdinfo->pre_tx_scan_timer); + del_timer_sync(&pwdinfo->find_phase_timer); + del_timer_sync(&pwdinfo->restore_p2p_state_timer); + del_timer_sync(&pwdinfo->pre_tx_scan_timer); rtw_p2p_set_state(pwdinfo, P2P_STATE_NONE); } } --=20 2.30.2