From nobody Fri Sep 12 20:07:43 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 1F1D6C636CC for ; Tue, 7 Feb 2023 19:23:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230450AbjBGTXi (ORCPT ); Tue, 7 Feb 2023 14:23:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60300 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230216AbjBGTXe (ORCPT ); Tue, 7 Feb 2023 14:23:34 -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 0E03722DC7 for ; Tue, 7 Feb 2023 11:23:34 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTYt-0002XK-3T; Tue, 07 Feb 2023 20:23:27 +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/7] staging: r8188eu: merge do_queue_select into its only caller Date: Tue, 7 Feb 2023 20:23:13 +0100 Message-Id: <20230207192319.294203-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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" Merge do_queue_select into its only caller. It's only a simple assignment. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 18941320e70e..4d6210d89533 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1609,15 +1609,6 @@ u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe) return addr; } =20 -static void do_queue_select(struct adapter *padapter, struct pkt_attrib *p= attrib) -{ - u8 qsel; - - qsel =3D pattrib->priority; - - pattrib->qsel =3D qsel; -} - /* * The main transmit(tx) entry * @@ -1656,7 +1647,7 @@ s32 rtw_xmit(struct adapter *padapter, struct sk_buff= **ppkt) =20 rtw_led_control(padapter, LED_CTL_TX); =20 - do_queue_select(padapter, &pxmitframe->attrib); + pxmitframe->attrib.qsel =3D pxmitframe->attrib.priority; =20 spin_lock_bh(&pxmitpriv->lock); if (xmitframe_enqueue_for_sleeping_sta(padapter, pxmitframe)) { --=20 2.30.2 From nobody Fri Sep 12 20:07:43 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 C2A34C636D3 for ; Tue, 7 Feb 2023 19:23:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231690AbjBGTXg (ORCPT ); Tue, 7 Feb 2023 14:23:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60298 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231518AbjBGTXe (ORCPT ); Tue, 7 Feb 2023 14:23:34 -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 2029D37547 for ; Tue, 7 Feb 2023 11:23:34 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTYu-0002XK-MJ; Tue, 07 Feb 2023 20:23:29 +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/7] staging: r8188eu: simplify rtw_alloc_xmitframe Date: Tue, 7 Feb 2023 20:23:14 +0100 Message-Id: <20230207192319.294203-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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" Make the rtw_alloc_xmitframe function a bit simpler. The container_of() call never returns NULL. The if (pxframe) check is false only if pfree_xmit_queue is empty. Handle this special case explicitly and save one level of indentation. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 40 +++++++++++-------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 4d6210d89533..6ec342b726f9 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1256,38 +1256,32 @@ struct xmit_frame *rtw_alloc_xmitframe(struct xmit_= priv *pxmitpriv)/* _queue *pf =20 spin_lock_bh(&pfree_xmit_queue->lock); =20 - if (list_empty(&pfree_xmit_queue->queue)) { - pxframe =3D NULL; - } else { - phead =3D get_list_head(pfree_xmit_queue); - - plist =3D phead->next; + if (list_empty(&pfree_xmit_queue->queue)) + goto out; =20 - pxframe =3D container_of(plist, struct xmit_frame, list); - - list_del_init(&pxframe->list); - } + phead =3D get_list_head(pfree_xmit_queue); + plist =3D phead->next; + pxframe =3D container_of(plist, struct xmit_frame, list); + list_del_init(&pxframe->list); =20 - if (pxframe) { /* default value setting */ - pxmitpriv->free_xmitframe_cnt--; + pxmitpriv->free_xmitframe_cnt--; =20 - pxframe->buf_addr =3D NULL; - pxframe->pxmitbuf =3D NULL; + pxframe->buf_addr =3D NULL; + pxframe->pxmitbuf =3D NULL; =20 - memset(&pxframe->attrib, 0, sizeof(struct pkt_attrib)); - /* pxframe->attrib.psta =3D NULL; */ + memset(&pxframe->attrib, 0, sizeof(struct pkt_attrib)); + /* pxframe->attrib.psta =3D NULL; */ =20 - pxframe->frame_tag =3D DATA_FRAMETAG; + pxframe->frame_tag =3D DATA_FRAMETAG; =20 - pxframe->pkt =3D NULL; - pxframe->pkt_offset =3D 1;/* default use pkt_offset to fill tx desc */ + pxframe->pkt =3D NULL; + pxframe->pkt_offset =3D 1;/* default use pkt_offset to fill tx desc */ =20 - pxframe->agg_num =3D 1; - pxframe->ack_report =3D 0; - } + pxframe->agg_num =3D 1; + pxframe->ack_report =3D 0; =20 +out: spin_unlock_bh(&pfree_xmit_queue->lock); - return pxframe; } =20 --=20 2.30.2 From nobody Fri Sep 12 20:07:43 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 BF96CC636CC for ; Tue, 7 Feb 2023 19:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232007AbjBGTXn (ORCPT ); Tue, 7 Feb 2023 14:23:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230216AbjBGTXj (ORCPT ); Tue, 7 Feb 2023 14:23:39 -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 C66803A599 for ; Tue, 7 Feb 2023 11:23:38 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTYy-0002XK-Pd; Tue, 07 Feb 2023 20:23:32 +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/7] staging: r8188eu: remove unused frametag defines Date: Tue, 7 Feb 2023 20:23:15 +0100 Message-Id: <20230207192319.294203-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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 frametag defines which are not used in the r8188eu driver. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/include/rtw_xmit.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index b332c2a86dbb..0c999ae6a1f1 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -152,14 +152,7 @@ struct pkt_attrib { =20 #define NULL_FRAMETAG (0x0) #define DATA_FRAMETAG 0x01 -#define L2_FRAMETAG 0x02 #define MGNT_FRAMETAG 0x03 -#define AMSDU_FRAMETAG 0x04 - -#define EII_FRAMETAG 0x05 -#define IEEE8023_FRAMETAG 0x06 - -#define MP_FRAMETAG 0x07 =20 #define TXAGG_FRAMETAG 0x08 =20 --=20 2.30.2 From nobody Fri Sep 12 20:07:43 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 C722FC636D4 for ; Tue, 7 Feb 2023 19:23:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232068AbjBGTXp (ORCPT ); Tue, 7 Feb 2023 14:23:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231927AbjBGTXl (ORCPT ); Tue, 7 Feb 2023 14:23:41 -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 1BA543B0C6 for ; Tue, 7 Feb 2023 11:23:41 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTZ0-0002XK-Vz; Tue, 07 Feb 2023 20:23:35 +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/7] staging: r8188eu: xmit_buf's ff_hwaddr is not used Date: Tue, 7 Feb 2023 20:23:16 +0100 Message-Id: <20230207192319.294203-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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" ff_hwaddr in struct xmit_buf is not used. Remove it. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- 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 0c999ae6a1f1..9a001fbf45a0 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -193,7 +193,6 @@ struct xmit_buf { u32 alloc_sz; u32 len; struct submit_ctx *sctx; - u32 ff_hwaddr; struct urb *pxmit_urb; int last[8]; }; --=20 2.30.2 From nobody Fri Sep 12 20:07:43 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 9D386C636D3 for ; Tue, 7 Feb 2023 19:23:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232321AbjBGTXw (ORCPT ); Tue, 7 Feb 2023 14:23:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231405AbjBGTXs (ORCPT ); Tue, 7 Feb 2023 14:23:48 -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 EEF4039CDA for ; Tue, 7 Feb 2023 11:23:42 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTZ3-0002XK-08; Tue, 07 Feb 2023 20:23:37 +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/7] staging: r8188eu: simplify xmit_buf flags Date: Tue, 7 Feb 2023 20:23:17 +0100 Message-Id: <20230207192319.294203-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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_write_port stores a queue index in pxmitbuf->flags before submitting an urb. The urb completion function reads the flags. All it needs is the info if the high queue was used or not. We can replace the flags with a boolean high_queue variable. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 2 +- drivers/staging/r8188eu/include/rtw_xmit.h | 2 +- .../staging/r8188eu/os_dep/usb_ops_linux.c | 25 ++----------------- 3 files changed, 4 insertions(+), 25 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index 6ec342b726f9..df88b3e29e77 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -148,7 +148,7 @@ int _rtw_init_xmit_priv(struct xmit_priv *pxmitpriv, st= ruct adapter *padapter) goto free_xmitbuf; } =20 - pxmitbuf->flags =3D XMIT_VO_QUEUE; + pxmitbuf->high_queue =3D false; =20 list_add_tail(&pxmitbuf->list, &pxmitpriv->free_xmitbuf_queue.queue); pxmitbuf++; diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index 9a001fbf45a0..feeac85aedb0 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -189,7 +189,7 @@ struct xmit_buf { u8 *pbuf; void *priv_data; u16 ext_tag; /* 0: Normal xmitbuf, 1: extension xmitbuf. */ - u16 flags; + bool high_queue; u32 alloc_sz; u32 len; struct submit_ctx *sctx; diff --git a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c b/drivers/stagi= ng/r8188eu/os_dep/usb_ops_linux.c index 48c96f731ce1..ca09f7ed7e4d 100644 --- a/drivers/staging/r8188eu/os_dep/usb_ops_linux.c +++ b/drivers/staging/r8188eu/os_dep/usb_ops_linux.c @@ -39,7 +39,7 @@ static void usb_write_port_complete(struct urb *purb) struct adapter *padapter =3D pxmitbuf->padapter; struct xmit_priv *pxmitpriv =3D &padapter->xmitpriv; =20 - if (pxmitbuf->flags =3D=3D HIGH_QUEUE_INX) + if (pxmitbuf->high_queue) rtw_chk_hi_queue_cmd(padapter); =20 switch (purb->status) { @@ -83,28 +83,7 @@ u32 rtw_write_port(struct adapter *padapter, u32 addr, u= 32 cnt, u8 *wmem) } =20 spin_lock_irqsave(&pxmitpriv->lock, irqL); - - switch (addr) { - case VO_QUEUE_INX: - pxmitbuf->flags =3D VO_QUEUE_INX; - break; - case VI_QUEUE_INX: - pxmitbuf->flags =3D VI_QUEUE_INX; - break; - case BE_QUEUE_INX: - pxmitbuf->flags =3D BE_QUEUE_INX; - break; - case BK_QUEUE_INX: - pxmitbuf->flags =3D BK_QUEUE_INX; - break; - case HIGH_QUEUE_INX: - pxmitbuf->flags =3D HIGH_QUEUE_INX; - break; - default: - pxmitbuf->flags =3D MGT_QUEUE_INX; - break; - } - + pxmitbuf->high_queue =3D (addr =3D=3D HIGH_QUEUE_INX); spin_unlock_irqrestore(&pxmitpriv->lock, irqL); =20 purb =3D pxmitbuf->pxmit_urb; --=20 2.30.2 From nobody Fri Sep 12 20:07:43 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 27E70C636D3 for ; Tue, 7 Feb 2023 19:24:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231827AbjBGTYC (ORCPT ); Tue, 7 Feb 2023 14:24:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32904 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231953AbjBGTXv (ORCPT ); Tue, 7 Feb 2023 14:23:51 -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 1EC633B658 for ; Tue, 7 Feb 2023 11:23:45 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTZ5-0002XK-Oc; Tue, 07 Feb 2023 20:23:39 +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/7] staging: r8188eu: simplify rtw_get_ff_hwaddr Date: Tue, 7 Feb 2023 20:23:18 +0100 Message-Id: <20230207192319.294203-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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" On both occassions where rtw_get_ff_hwaddr is called, the result is used as addr parameter for rtw_write_port. rtw_write_port only needs the info if the high queue was used or not. Simplify rtw_get_ff_hwaddr accordingly and remove the now unused queue defines. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_xmit.c | 32 +--------------------- drivers/staging/r8188eu/include/rtw_xmit.h | 7 ----- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_xmit.c b/drivers/staging/r818= 8eu/core/rtw_xmit.c index df88b3e29e77..d0761ac2e695 100644 --- a/drivers/staging/r8188eu/core/rtw_xmit.c +++ b/drivers/staging/r8188eu/core/rtw_xmit.c @@ -1568,39 +1568,9 @@ static int rtw_br_client_tx(struct adapter *padapter= , struct sk_buff **pskb) =20 u32 rtw_get_ff_hwaddr(struct xmit_frame *pxmitframe) { - u32 addr; struct pkt_attrib *pattrib =3D &pxmitframe->attrib; =20 - switch (pattrib->qsel) { - case 0: - case 3: - addr =3D BE_QUEUE_INX; - break; - case 1: - case 2: - addr =3D BK_QUEUE_INX; - break; - case 4: - case 5: - addr =3D VI_QUEUE_INX; - break; - case 6: - case 7: - addr =3D VO_QUEUE_INX; - break; - case 0x10: - addr =3D BCN_QUEUE_INX; - break; - case 0x11:/* BC/MC in PS (HIQ) */ - addr =3D HIGH_QUEUE_INX; - break; - case 0x12: - default: - addr =3D MGT_QUEUE_INX; - break; - } - - return addr; + return pattrib->qsel =3D=3D 0x11 ? HIGH_QUEUE_INX : 0; } =20 /* diff --git a/drivers/staging/r8188eu/include/rtw_xmit.h b/drivers/staging/r= 8188eu/include/rtw_xmit.h index feeac85aedb0..e4e5af198eee 100644 --- a/drivers/staging/r8188eu/include/rtw_xmit.h +++ b/drivers/staging/r8188eu/include/rtw_xmit.h @@ -26,14 +26,7 @@ #define XMIT_BE_QUEUE (2) #define XMIT_BK_QUEUE (3) =20 -#define VO_QUEUE_INX 0 -#define VI_QUEUE_INX 1 -#define BE_QUEUE_INX 2 -#define BK_QUEUE_INX 3 -#define BCN_QUEUE_INX 4 -#define MGT_QUEUE_INX 5 #define HIGH_QUEUE_INX 6 -#define TXCMD_QUEUE_INX 7 =20 #define HW_QUEUE_ENTRY 8 =20 --=20 2.30.2 From nobody Fri Sep 12 20:07:43 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 3478CC636D3 for ; Tue, 7 Feb 2023 19:24:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230204AbjBGTYG (ORCPT ); Tue, 7 Feb 2023 14:24:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232127AbjBGTX6 (ORCPT ); Tue, 7 Feb 2023 14:23:58 -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 9DA8538E97 for ; Tue, 7 Feb 2023 11:23:48 -0800 (PST) Received: from dslb-178-004-202-208.178.004.pools.vodafone-ip.de ([178.4.202.208] 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 1pPTZ7-0002XK-Dy; Tue, 07 Feb 2023 20:23:41 +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/7] staging: r8188eu: bagg_pkt parameter is not used Date: Tue, 7 Feb 2023 20:23:19 +0100 Message-Id: <20230207192319.294203-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230207192319.294203-1-martin@kaiser.cx> References: <20230207192319.294203-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 bagg_pkt parameter in function update_txdesc is not used, it can be removed. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c b/drivers/staging= /r8188eu/hal/rtl8188eu_xmit.c index 5aa33fc4041d..3ffab4953a5c 100644 --- a/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c +++ b/drivers/staging/r8188eu/hal/rtl8188eu_xmit.c @@ -137,7 +137,7 @@ static void fill_txdesc_phy(struct pkt_attrib *pattrib,= __le32 *pdw) } } =20 -static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz, = u8 bagg_pkt) +static s32 update_txdesc(struct xmit_frame *pxmitframe, u8 *pmem, s32 sz) { uint qsel; u8 data_rate, pwr_status, offset; @@ -319,7 +319,7 @@ static s32 rtw_dump_xframe(struct adapter *adapt, struc= t xmit_frame *pxmitframe) sz =3D pattrib->last_txcmdsz; } =20 - pull =3D update_txdesc(pxmitframe, mem_addr, sz, false); + pull =3D update_txdesc(pxmitframe, mem_addr, sz); =20 if (pull) { mem_addr +=3D PACKET_OFFSET_SZ; /* pull txdesc head */ @@ -489,7 +489,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt) rtw_xmit_complete(adapt, pxmitframe); =20 /* (len - TXDESC_SIZE) =3D=3D pxmitframe->attrib.last_txcmdsz */ - update_txdesc(pxmitframe, pxmitframe->buf_addr, pxmitframe->attrib.last_= txcmdsz, true); + update_txdesc(pxmitframe, pxmitframe->buf_addr, pxmitframe->attrib.last_= txcmdsz); =20 /* don't need xmitframe any more */ rtw_free_xmitframe(pxmitpriv, pxmitframe); @@ -529,7 +529,7 @@ bool rtl8188eu_xmitframe_complete(struct adapter *adapt) pfirstframe->pkt_offset--; } =20 - update_txdesc(pfirstframe, pfirstframe->buf_addr, pfirstframe->attrib.las= t_txcmdsz, true); + update_txdesc(pfirstframe, pfirstframe->buf_addr, pfirstframe->attrib.las= t_txcmdsz); =20 /* 3 4. write xmit buffer to USB FIFO */ ff_hwaddr =3D rtw_get_ff_hwaddr(pfirstframe); --=20 2.30.2