From nobody Sat Sep 13 00:03:07 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 --- 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