From nobody Sat Sep 13 20:26:27 2025 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 39206C636D3 for ; Mon, 30 Jan 2023 19:53:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237820AbjA3Tx2 (ORCPT ); Mon, 30 Jan 2023 14:53:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237621AbjA3TxZ (ORCPT ); Mon, 30 Jan 2023 14:53:25 -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 2667F46D78 for ; Mon, 30 Jan 2023 11:53:23 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDN-0007S2-5D; Mon, 30 Jan 2023 20:53:17 +0100 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/9] staging: r8188eu: rtw_free_xmitframe_queue needs no spinlock Date: Mon, 30 Jan 2023 20:52:55 +0100 Message-Id: <20230130195303.138941-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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" There's no need for a spinlock in rtw_free_xmitframe_queue. This function is called only from rtw_free_stainfo. rtw_free_stainfo holds pxmitpriv->lock during all rtw_free_xmitframe_queue calls. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index f50e10f0d51f..4e49f1d49eb5 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1330,8 +1330,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmit= priv, struct __queue *pfram struct list_head *plist, *phead; struct xmit_frame *pxmitframe; =20 - spin_lock_bh(&pframequeue->lock); - phead =3D get_list_head(pframequeue); plist =3D phead->next; =20 @@ -1342,7 +1340,6 @@ void rtw_free_xmitframe_queue(struct xmit_priv *pxmit= priv, struct __queue *pfram =20 rtw_free_xmitframe(pxmitpriv, pxmitframe); } - spin_unlock_bh(&pframequeue->lock); } =20 struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct = hw_xmit *phwxmit_i) --=20 2.30.2 From nobody Sat Sep 13 20:26:27 2025 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 DE439C636D3 for ; Mon, 30 Jan 2023 19:53:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238050AbjA3Txd (ORCPT ); Mon, 30 Jan 2023 14:53:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237635AbjA3TxZ (ORCPT ); Mon, 30 Jan 2023 14:53:25 -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 1F4093F283 for ; Mon, 30 Jan 2023 11:53:23 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDN-0007S2-Sm; Mon, 30 Jan 2023 20:53:17 +0100 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/9] staging: r8188eu: change function param from __queue to list_head Date: Mon, 30 Jan 2023 20:52:56 +0100 Message-Id: <20230130195303.138941-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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" Modify the dequeue_xmitframes_to_sleeping_queue function to take a list_head pointer instead of a __queue pointer. This is an intermediate step towards changing struct tx_servq's sta_pending from __queue to list_head. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 4e49f1d49eb5..3117db41d749 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1788,16 +1788,15 @@ int xmitframe_enqueue_for_sleeping_sta(struct adapt= er *padapter, struct xmit_fra return ret; } =20 -static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter,= struct sta_info *psta, struct __queue *pframequeue) +static void dequeue_xmitframes_to_sleeping_queue(struct adapter *padapter,= struct sta_info *psta, struct list_head *phead) { - struct list_head *plist, *phead; + struct list_head *plist; u8 ac_index; struct tx_servq *ptxservq; struct pkt_attrib *pattrib; struct xmit_frame *pxmitframe; struct hw_xmit *phwxmits =3D padapter->xmitpriv.hwxmits; =20 - phead =3D get_list_head(pframequeue); plist =3D phead->next; =20 while (phead !=3D plist) { @@ -1834,21 +1833,21 @@ void stop_sta_xmit(struct adapter *padapter, struct= sta_info *psta) =20 pstapriv->sta_dz_bitmap |=3D BIT(psta->aid); =20 - dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vo_q.= sta_pending); + dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstax= mitpriv->vo_q.sta_pending)); list_del_init(&pstaxmitpriv->vo_q.tx_pending); =20 - dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vi_q.= sta_pending); + dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstax= mitpriv->vi_q.sta_pending)); list_del_init(&pstaxmitpriv->vi_q.tx_pending); =20 - dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->be_q.= sta_pending); + dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstax= mitpriv->be_q.sta_pending)); list_del_init(&pstaxmitpriv->be_q.tx_pending); =20 - dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->bk_q.= sta_pending); + dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstax= mitpriv->bk_q.sta_pending)); list_del_init(&pstaxmitpriv->bk_q.tx_pending); =20 /* for BC/MC Frames */ pstaxmitpriv =3D &psta_bmc->sta_xmitpriv; - dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, &pstaxmitpriv->b= e_q.sta_pending); + dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, get_list_head(&p= staxmitpriv->be_q.sta_pending)); list_del_init(&pstaxmitpriv->be_q.tx_pending); =20 spin_unlock_bh(&pxmitpriv->lock); --=20 2.30.2 From nobody Sat Sep 13 20:26:27 2025 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 5969EC636D3 for ; Mon, 30 Jan 2023 19:53:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238202AbjA3Txh (ORCPT ); Mon, 30 Jan 2023 14:53:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237710AbjA3Tx1 (ORCPT ); Mon, 30 Jan 2023 14:53:27 -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 F116246D45 for ; Mon, 30 Jan 2023 11:53:24 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDO-0007S2-Jq; Mon, 30 Jan 2023 20:53:18 +0100 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/9] staging: r8188eu: change another function param from __queue to list_head Date: Mon, 30 Jan 2023 20:52:57 +0100 Message-Id: <20230130195303.138941-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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" Modify the rtw_free_xmitframe_queue function to take a list_head pointer instead of a __queue pointer. This is an intermediate step towards changing struct tx_servq's sta_pending from __queue to list_head. Now that the function takes a list instead of a queue, we should also rename it to rtw_free_xmitframe_list. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 10 +++++----- drivers/staging/r8188eu/core/rtw_xmit.c | 9 ++++----- drivers/staging/r8188eu/include/rtw_xmit.h | 3 +-- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r= 8188eu/core/rtw_sta_mgt.c index b4aee8623099..49a92725c5ed 100644 --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c @@ -260,22 +260,22 @@ void rtw_free_stainfo(struct adapter *padapter, struc= t sta_info *psta) =20 spin_lock_bh(&pxmitpriv->lock); =20 - rtw_free_xmitframe_queue(pxmitpriv, &psta->sleep_q); + rtw_free_xmitframe_list(pxmitpriv, get_list_head(&psta->sleep_q)); psta->sleepq_len =3D 0; =20 - rtw_free_xmitframe_queue(pxmitpriv, &pstaxmitpriv->vo_q.sta_pending); + rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->vo_q.sta_= pending)); =20 list_del_init(&pstaxmitpriv->vo_q.tx_pending); =20 - rtw_free_xmitframe_queue(pxmitpriv, &pstaxmitpriv->vi_q.sta_pending); + rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->vi_q.sta_= pending)); =20 list_del_init(&pstaxmitpriv->vi_q.tx_pending); =20 - rtw_free_xmitframe_queue(pxmitpriv, &pstaxmitpriv->bk_q.sta_pending); + rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->bk_q.sta_= pending)); =20 list_del_init(&pstaxmitpriv->bk_q.tx_pending); =20 - rtw_free_xmitframe_queue(pxmitpriv, &pstaxmitpriv->be_q.sta_pending); + rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->be_q.sta_= pending)); =20 list_del_init(&pstaxmitpriv->be_q.tx_pending); =20 diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 3117db41d749..d272166a99ec 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1325,15 +1325,14 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv,= struct xmit_frame *pxmitfram return _SUCCESS; } =20 -void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, struct __queue = *pframequeue) +void rtw_free_xmitframe_list(struct xmit_priv *pxmitpriv, struct list_head= *xframe_list) { - struct list_head *plist, *phead; + struct list_head *plist; struct xmit_frame *pxmitframe; =20 - phead =3D get_list_head(pframequeue); - plist =3D phead->next; + plist =3D xframe_list->next; =20 - while (phead !=3D plist) { + while (xframe_list !=3D plist) { pxmitframe =3D container_of(plist, struct xmit_frame, list); =20 plist =3D plist->next; diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index d8808e68f778..8557b311e809 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -309,8 +309,7 @@ s32 rtw_put_snap(u8 *data, u16 h_proto); struct xmit_frame *rtw_alloc_xmitframe(struct xmit_priv *pxmitpriv); s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv, struct xmit_frame *pxmitframe); -void rtw_free_xmitframe_queue(struct xmit_priv *pxmitpriv, - struct __queue *pframequeue); +void rtw_free_xmitframe_list(struct xmit_priv *pxmitpriv, struct list_head= *xframe_list); struct tx_servq *rtw_get_sta_pending(struct adapter *padapter, struct sta_info *psta, int up, u8 *ac); struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, --=20 2.30.2 From nobody Sat Sep 13 20:26:27 2025 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 439DCC54EAA for ; Mon, 30 Jan 2023 19:53:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238053AbjA3Txj (ORCPT ); Mon, 30 Jan 2023 14:53:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237681AbjA3Tx1 (ORCPT ); Mon, 30 Jan 2023 14:53:27 -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 F05FA46739 for ; Mon, 30 Jan 2023 11:53:24 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDP-0007S2-82; Mon, 30 Jan 2023 20:53:19 +0100 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/9] staging: r8188eu: make sta_pending a list_head Date: Mon, 30 Jan 2023 20:52:58 +0100 Message-Id: <20230130195303.138941-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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" We can now change sta_pending in struct tx_servq from __queue to list_head. The driver defines __queue as list_head + spinlock, the spinlock is not used for sta_pending. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_sta_mgt.c | 8 ++++---- drivers/staging/r8188eu/core/rtw_xmit.c | 16 ++++++++-------- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 4 ++-- drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_sta_mgt.c b/drivers/staging/r= 8188eu/core/rtw_sta_mgt.c index 49a92725c5ed..a9c29b2bf230 100644 --- a/drivers/staging/r8188eu/core/rtw_sta_mgt.c +++ b/drivers/staging/r8188eu/core/rtw_sta_mgt.c @@ -263,19 +263,19 @@ void rtw_free_stainfo(struct adapter *padapter, struc= t sta_info *psta) rtw_free_xmitframe_list(pxmitpriv, get_list_head(&psta->sleep_q)); psta->sleepq_len =3D 0; =20 - rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->vo_q.sta_= pending)); + rtw_free_xmitframe_list(pxmitpriv, &pstaxmitpriv->vo_q.sta_pending); =20 list_del_init(&pstaxmitpriv->vo_q.tx_pending); =20 - rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->vi_q.sta_= pending)); + rtw_free_xmitframe_list(pxmitpriv, &pstaxmitpriv->vi_q.sta_pending); =20 list_del_init(&pstaxmitpriv->vi_q.tx_pending); =20 - rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->bk_q.sta_= pending)); + rtw_free_xmitframe_list(pxmitpriv, &pstaxmitpriv->bk_q.sta_pending); =20 list_del_init(&pstaxmitpriv->bk_q.tx_pending); =20 - rtw_free_xmitframe_list(pxmitpriv, get_list_head(&pstaxmitpriv->be_q.sta_= pending)); + rtw_free_xmitframe_list(pxmitpriv, &pstaxmitpriv->be_q.sta_pending); =20 list_del_init(&pstaxmitpriv->be_q.tx_pending); =20 diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index d272166a99ec..24cf11e7b4bc 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -17,7 +17,7 @@ static u8 RFC1042_OUI[P80211_OUI_LEN] =3D { 0x00, 0x00, 0= x00 }; static void _init_txservq(struct tx_servq *ptxservq) { INIT_LIST_HEAD(&ptxservq->tx_pending); - rtw_init_queue(&ptxservq->sta_pending); + INIT_LIST_HEAD(&ptxservq->sta_pending); ptxservq->qcnt =3D 0; } =20 @@ -1361,7 +1361,7 @@ struct xmit_frame *rtw_dequeue_xframe(struct xmit_pri= v *pxmitpriv, struct hw_xmi for (i =3D 0; i < HWXMIT_ENTRY; i++) { phwxmit =3D phwxmit_i + inx[i]; list_for_each_entry_safe(ptxservq, tmp_txservq, phwxmit->sta_list, tx_pe= nding) { - xframe_list =3D get_list_head(&ptxservq->sta_pending); + xframe_list =3D &ptxservq->sta_pending; if (list_empty(xframe_list)) continue; =20 @@ -1444,7 +1444,7 @@ s32 rtw_xmit_classifier(struct adapter *padapter, str= uct xmit_frame *pxmitframe) if (list_empty(&ptxservq->tx_pending)) list_add_tail(&ptxservq->tx_pending, phwxmits[ac_index].sta_list); =20 - list_add_tail(&pxmitframe->list, get_list_head(&ptxservq->sta_pending)); + list_add_tail(&pxmitframe->list, &ptxservq->sta_pending); ptxservq->qcnt++; phwxmits[ac_index].accnt++; exit: @@ -1832,21 +1832,21 @@ void stop_sta_xmit(struct adapter *padapter, struct= sta_info *psta) =20 pstapriv->sta_dz_bitmap |=3D BIT(psta->aid); =20 - dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstax= mitpriv->vo_q.sta_pending)); + dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vo_q.= sta_pending); list_del_init(&pstaxmitpriv->vo_q.tx_pending); =20 - dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstax= mitpriv->vi_q.sta_pending)); + dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->vi_q.= sta_pending); list_del_init(&pstaxmitpriv->vi_q.tx_pending); =20 - dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstax= mitpriv->be_q.sta_pending)); + dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->be_q.= sta_pending); list_del_init(&pstaxmitpriv->be_q.tx_pending); =20 - dequeue_xmitframes_to_sleeping_queue(padapter, psta, get_list_head(&pstax= mitpriv->bk_q.sta_pending)); + dequeue_xmitframes_to_sleeping_queue(padapter, psta, &pstaxmitpriv->bk_q.= sta_pending); list_del_init(&pstaxmitpriv->bk_q.tx_pending); =20 /* for BC/MC Frames */ pstaxmitpriv =3D &psta_bmc->sta_xmitpriv; - dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, get_list_head(&p= staxmitpriv->be_q.sta_pending)); + dequeue_xmitframes_to_sleeping_queue(padapter, psta_bmc, &pstaxmitpriv->b= e_q.sta_pending); list_del_init(&pstaxmitpriv->be_q.tx_pending); =20 spin_unlock_bh(&pxmitpriv->lock); diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging= /r8188eu/hal/rtl8188eu_xmit.c index 18557738dbad..5aa33fc4041d 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -461,7 +461,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt) } spin_lock_bh(&pxmitpriv->lock); =20 - xmitframe_phead =3D get_list_head(&ptxservq->sta_pending); + xmitframe_phead =3D &ptxservq->sta_pending; xmitframe_plist =3D xmitframe_phead->next; =20 while (xmitframe_phead !=3D xmitframe_plist) { @@ -512,7 +512,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt) } } /* end while (aggregate same priority and same DA(AP or STA) frames) */ =20 - if (list_empty(&ptxservq->sta_pending.queue)) + if (list_empty(&ptxservq->sta_pending)) list_del_init(&ptxservq->tx_pending); =20 spin_unlock_bh(&pxmitpriv->lock); diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 8557b311e809..dfdc1c57d5d4 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -221,7 +221,7 @@ struct xmit_frame { =20 struct tx_servq { struct list_head tx_pending; - struct __queue sta_pending; + struct list_head sta_pending; int qcnt; }; =20 --=20 2.30.2 From nobody Sat Sep 13 20:26:27 2025 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 5083FC636D3 for ; Mon, 30 Jan 2023 19:53:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238130AbjA3Txl (ORCPT ); Mon, 30 Jan 2023 14:53:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237556AbjA3Tx1 (ORCPT ); Mon, 30 Jan 2023 14:53:27 -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 101F54ED3 for ; Mon, 30 Jan 2023 11:53:25 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDP-0007S2-VE; Mon, 30 Jan 2023 20:53:20 +0100 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 5/9] staging: r8188eu: use kernel helper to iterate over a list Date: Mon, 30 Jan 2023 20:52:59 +0100 Message-Id: <20230130195303.138941-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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" rtw_free_xmitframe_list iterates over the list of xmit_frames and frees each entry. We can use list_for_each_entry_safe instead of coding this manually. We need the _safe version as the current pxmitframe will be removed from the list by rtw_free_xmitframe. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 24cf11e7b4bc..c2b1e6f1d358 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1327,18 +1327,10 @@ s32 rtw_free_xmitframe(struct xmit_priv *pxmitpriv,= struct xmit_frame *pxmitfram =20 void rtw_free_xmitframe_list(struct xmit_priv *pxmitpriv, struct list_head= *xframe_list) { - struct list_head *plist; - struct xmit_frame *pxmitframe; - - plist =3D xframe_list->next; - - while (xframe_list !=3D plist) { - pxmitframe =3D container_of(plist, struct xmit_frame, list); - - plist =3D plist->next; + struct xmit_frame *pxmitframe, *tmp_xmitframe; =20 + list_for_each_entry_safe(pxmitframe, tmp_xmitframe, xframe_list, list) rtw_free_xmitframe(pxmitpriv, pxmitframe); - } } =20 struct xmit_frame *rtw_dequeue_xframe(struct xmit_priv *pxmitpriv, struct = hw_xmit *phwxmit_i) --=20 2.30.2 From nobody Sat Sep 13 20:26:27 2025 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 79175C54EAA for ; Mon, 30 Jan 2023 19:53:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238137AbjA3Txw (ORCPT ); Mon, 30 Jan 2023 14:53:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237818AbjA3Txa (ORCPT ); Mon, 30 Jan 2023 14:53:30 -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 DC4A53F283 for ; Mon, 30 Jan 2023 11:53:28 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDQ-0007S2-Lc; Mon, 30 Jan 2023 20:53:20 +0100 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 6/9] staging: r8188eu: legacy_dz is initialised but never used Date: Mon, 30 Jan 2023 20:53:00 +0100 Message-Id: <20230130195303.138941-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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" legacy_dz in struct sta_xmit_priv is initialised but not used. It can be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 1 - drivers/staging/r8188eu/include/rtw_xmit.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index c2b1e6f1d358..797e24b852b1 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -29,7 +29,6 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_x= mitpriv) _init_txservq(&psta_xmitpriv->bk_q); _init_txservq(&psta_xmitpriv->vi_q); _init_txservq(&psta_xmitpriv->vo_q); - INIT_LIST_HEAD(&psta_xmitpriv->legacy_dz); INIT_LIST_HEAD(&psta_xmitpriv->apsd); } =20 diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index dfdc1c57d5d4..8566e731514c 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -232,7 +232,6 @@ struct sta_xmit_priv { struct tx_servq bk_q; /* priority =3D=3D 1,2 */ struct tx_servq vi_q; /* priority =3D=3D 4,5 */ struct tx_servq vo_q; /* priority =3D=3D 6,7 */ - struct list_head legacy_dz; struct list_head apsd; u16 txseq_tid[16]; }; --=20 2.30.2 From nobody Sat Sep 13 20:26:27 2025 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 9E3ABC54EAA for ; Mon, 30 Jan 2023 19:53:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238135AbjA3Txp (ORCPT ); Mon, 30 Jan 2023 14:53:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236427AbjA3Tx3 (ORCPT ); Mon, 30 Jan 2023 14:53:29 -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 86D05E040 for ; Mon, 30 Jan 2023 11:53:26 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDR-0007S2-Bn; Mon, 30 Jan 2023 20:53:21 +0100 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 7/9] staging: r8188eu: apsd is initialised but never used Date: Mon, 30 Jan 2023 20:53:01 +0100 Message-Id: <20230130195303.138941-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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" apsd in struct sta_xmit_priv is initialised but not used. It can be removed. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/core/rtw_xmit.c | 1 - drivers/staging/r8188eu/include/rtw_xmit.h | 1 - 2 files changed, 2 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 797e24b852b1..91f92ec5ef69 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -29,7 +29,6 @@ void _rtw_init_sta_xmit_priv(struct sta_xmit_priv *psta_x= mitpriv) _init_txservq(&psta_xmitpriv->bk_q); _init_txservq(&psta_xmitpriv->vi_q); _init_txservq(&psta_xmitpriv->vo_q); - INIT_LIST_HEAD(&psta_xmitpriv->apsd); } =20 static int rtw_xmit_resource_alloc(struct adapter *padapter, struct xmit_b= uf *pxmitbuf, diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 8566e731514c..4c508ab4c870 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -232,7 +232,6 @@ struct sta_xmit_priv { struct tx_servq bk_q; /* priority =3D=3D 1,2 */ struct tx_servq vi_q; /* priority =3D=3D 4,5 */ struct tx_servq vo_q; /* priority =3D=3D 6,7 */ - struct list_head apsd; u16 txseq_tid[16]; }; =20 --=20 2.30.2 From nobody Sat Sep 13 20:26:27 2025 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 0628FC54EAA for ; Mon, 30 Jan 2023 19:53:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237866AbjA3Txt (ORCPT ); Mon, 30 Jan 2023 14:53:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42410 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237666AbjA3Tx3 (ORCPT ); Mon, 30 Jan 2023 14:53:29 -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 59C474671D for ; Mon, 30 Jan 2023 11:53:27 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDS-0007S2-27; Mon, 30 Jan 2023 20:53:22 +0100 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 8/9] staging: r8188eu: option in struct sta_xmit_priv is not used Date: Mon, 30 Jan 2023 20:53:02 +0100 Message-Id: <20230130195303.138941-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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 option component in struct sta_xmit_priv is not used, remove it. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/include/rtw_xmit.h | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 4c508ab4c870..b332c2a86dbb 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -227,7 +227,6 @@ struct tx_servq { =20 struct sta_xmit_priv { spinlock_t lock; - int option; struct tx_servq be_q; /* priority =3D=3D 0,3 */ struct tx_servq bk_q; /* priority =3D=3D 1,2 */ struct tx_servq vi_q; /* priority =3D=3D 4,5 */ --=20 2.30.2 From nobody Sat Sep 13 20:26:27 2025 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 182B1C54EAA for ; Mon, 30 Jan 2023 19:53:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238315AbjA3Txz (ORCPT ); Mon, 30 Jan 2023 14:53:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237949AbjA3Txb (ORCPT ); Mon, 30 Jan 2023 14:53:31 -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 93F04CDC2 for ; Mon, 30 Jan 2023 11:53:29 -0800 (PST) Received: from dslb-188-097-040-029.188.097.pools.vodafone-ip.de ([188.97.40.29] 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 1pMaDS-0007S2-Q6; Mon, 30 Jan 2023 20:53:22 +0100 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 9/9] staging: r8188eu: replace switch-case with if Date: Mon, 30 Jan 2023 20:53:03 +0100 Message-Id: <20230130195303.138941-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230130195303.138941-1-martin@kaiser.cx> References: <20230130195303.138941-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 a switch-case in rtw_write_port with an if statement and make the code a bit shorter. Signed-off-by: Martin Kaiser --- drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/stagi= ng/r8188eu/os_dep/usb_ops_linux.c index c9ee1173a1d6..48c96f731ce1 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -121,14 +121,8 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr,= u32 cnt, u8 *wmem) status =3D usb_submit_urb(purb, GFP_ATOMIC); if (status) { rtw_sctx_done_err(&pxmitbuf->sctx, RTW_SCTX_DONE_WRITE_PORT_ERR); - - switch (status) { - case -ENODEV: + if (status =3D=3D -ENODEV) padapter->bDriverStopped =3D true; - break; - default: - break; - } goto exit; } =20 --=20 2.30.2