From nobody Thu Jan 1 14:08:33 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 44E8FC001E0 for ; Mon, 23 Oct 2023 06:40:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233575AbjJWGkc (ORCPT ); Mon, 23 Oct 2023 02:40:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233543AbjJWGkU (ORCPT ); Mon, 23 Oct 2023 02:40:20 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 26661188 for ; Sun, 22 Oct 2023 23:40:14 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id 4fb4d7f45d1cf-53db2f8d193so1002836a12.0 for ; Sun, 22 Oct 2023 23:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698043212; x=1698648012; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=IAg5aOPrhHSpwz3YYSAWUDYY5nI8Lv/rAsYemdyOjfQ=; b=UXOEE0osF+G34szgQTgtuBaE8O78EjTmt9AKxvpwDYJ3jxnwCTaWEZw4losQoQHXc5 5tn9S+dR3Ly0E1bVbqnqvoZMRsoT60LrXfHgI+RG+VAHOelsIMrLSwKewmTRg60HwmTs /0Ml1gzOB6Tp785ynxAobt/jpbsqWdX97TsDSCtpLbJ8ZT68/S6oHAbsGLF8iRGqj5py u10J7HK2wOCpYBv0kQMeLwVetgF7Zk8cFOwtK+TEHsHQnqiRYOmivq7Y6LJG7VcJBfH8 92N3YJ7TaGqnJM0dOhENw0wpPt7oZnf5SA6dfGW87HXJuV18HgSOWRhroWdvbxTblmhz TRVw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698043212; x=1698648012; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=IAg5aOPrhHSpwz3YYSAWUDYY5nI8Lv/rAsYemdyOjfQ=; b=Vg16wyiNlOGloFo4Fz9BvDgQMCsuLfHtQBtrILYIcU1oJfeDkkQAtD97LH7hINJcHo nHfY96JgsScg2yapt4JwQ5J5w+fZsW2LCdqcrApo82NrmuhfFAqW1TQJqlAxdfdia15T KiGURlkHWFgJaAafF3NvrBqrZEMkC8+YqDzAvA4VErpp2eT+waHU0OFKgphHs9+AkxnH r7yNCcYKaOSVu7C91G66DNRPbyHQST3etuW4agaaKUv/wdCNyB3lTvFVxhxHkVENaExE dy4pGicB2Xz/qn60zanDPR1qYA1h/PgdFlb0FSRKk20b36hRkv9PrFBRgBcziA5HyvX3 VKZw== X-Gm-Message-State: AOJu0Yz3kKWwvapyvbeM2fPximNC11fIv2DwldgYH2sFI0KvaIQH+uNA +Enqhi4wunjhaPI57n4l3FU= X-Google-Smtp-Source: AGHT+IFHOEYzDi5J8//nYm81RM+jNIwzQ45UxSrIvCWXnqmy6JN1axrcPrq+KLj+1Y3gt+WyYtr6lw== X-Received: by 2002:a05:6402:e8b:b0:540:488:dfd8 with SMTP id h11-20020a0564020e8b00b005400488dfd8mr4258103eda.4.1698043212567; Sun, 22 Oct 2023 23:40:12 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p579356c7.dip0.t-ipconnect.de. [87.147.86.199]) by smtp.gmail.com with ESMTPSA id dm28-20020a05640222dc00b0053def18ee8bsm5766997edb.20.2023.10.22.23.40.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Oct 2023 23:40:12 -0700 (PDT) Date: Mon, 23 Oct 2023 08:40:10 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] staging: rtl8192e: Replace union tspec_body including embedded struct Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace union tspec_body including embedded struct with embedded union as it has only one element. This will increase readability of the code. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_Qos.h | 6 ------ drivers/staging/rtl8192e/rtl819x_TS.h | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 14 +++++++------- 4 files changed, 9 insertions(+), 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rt= l8192e/rtl819x_BAProc.c index 93b566482149..f01fb7131c7e 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -474,7 +474,7 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee, = struct tx_ts_record *ts, ba->dialog_token++; ba->ba_param_set.field.amsdu_support =3D 0; ba->ba_param_set.field.ba_policy =3D policy; - ba->ba_param_set.field.tid =3D ts->TsCommonInfo.TSpec.f.ts_info.field.ucT= SID; + ba->ba_param_set.field.tid =3D ts->TsCommonInfo.TSpec.field.ucTSID; ba->ba_param_set.field.buffer_size =3D 32; ba->ba_timeout_value =3D 0; ba->ba_start_seq_ctrl.field.seq_num =3D (ts->TxCurSeq + 3) % 4096; diff --git a/drivers/staging/rtl8192e/rtl819x_Qos.h b/drivers/staging/rtl81= 92e/rtl819x_Qos.h index ac321952f7b3..73fdf6aaed67 100644 --- a/drivers/staging/rtl8192e/rtl819x_Qos.h +++ b/drivers/staging/rtl8192e/rtl819x_Qos.h @@ -14,12 +14,6 @@ union qos_tsinfo { } field; }; =20 -union tspec_body { - struct { - union qos_tsinfo ts_info; - } f; -}; - struct octet_string { u8 *Octet; u16 Length; diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl819= 2e/rtl819x_TS.h index a9770592a8c9..ed77763bb1fc 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -20,7 +20,7 @@ enum tr_select { struct ts_common_info { struct list_head List; u8 addr[ETH_ALEN]; - union tspec_body TSpec; + union qos_tsinfo TSpec; union qos_tclas TClass[TCLAS_NUM]; u8 TClasProc; u8 TClasNum; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 879e169539c8..969418031f5f 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -94,7 +94,7 @@ static void TsAddBaProcess(struct timer_list *t) static void ResetTsCommonInfo(struct ts_common_info *pTsCommonInfo) { eth_zero_addr(pTsCommonInfo->addr); - memset(&pTsCommonInfo->TSpec, 0, sizeof(union tspec_body)); + memset(&pTsCommonInfo->TSpec, 0, sizeof(union qos_tsinfo)); memset(&pTsCommonInfo->TClass, 0, sizeof(union qos_tclas) * TCLAS_NUM); pTsCommonInfo->TClasProc =3D 0; pTsCommonInfo->TClasNum =3D 0; @@ -201,8 +201,8 @@ static struct ts_common_info *SearchAdmitTRStream(struc= t rtllib_device *ieee, continue; list_for_each_entry(pRet, psearch_list, List) { if (memcmp(pRet->addr, addr, 6) =3D=3D 0 && - pRet->TSpec.f.ts_info.field.ucTSID =3D=3D TID && - pRet->TSpec.f.ts_info.field.ucDirection =3D=3D dir) + pRet->TSpec.field.ucTSID =3D=3D TID && + pRet->TSpec.field.ucDirection =3D=3D dir) break; } if (&pRet->List !=3D psearch_list) @@ -215,7 +215,7 @@ static struct ts_common_info *SearchAdmitTRStream(struc= t rtllib_device *ieee, } =20 static void MakeTSEntry(struct ts_common_info *pTsCommonInfo, u8 *addr, - union tspec_body *pTSPEC, union qos_tclas *pTCLAS, + union qos_tsinfo *pTSPEC, union qos_tclas *pTCLAS, u8 TCLAS_Num, u8 TCLAS_Proc) { u8 count; @@ -227,7 +227,7 @@ static void MakeTSEntry(struct ts_common_info *pTsCommo= nInfo, u8 *addr, =20 if (pTSPEC) memcpy((u8 *)(&(pTsCommonInfo->TSpec)), (u8 *)pTSPEC, - sizeof(union tspec_body)); + sizeof(union qos_tsinfo)); =20 for (count =3D 0; count < TCLAS_Num; count++) memcpy((u8 *)(&(pTsCommonInfo->TClass[count])), @@ -241,8 +241,8 @@ bool rtllib_get_ts(struct rtllib_device *ieee, struct t= s_common_info **ppTS, u8 *addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs) { u8 UP =3D 0; - union tspec_body TSpec; - union qos_tsinfo *ts_info =3D &TSpec.f.ts_info; + union qos_tsinfo TSpec; + union qos_tsinfo *ts_info =3D &TSpec; struct list_head *pUnusedList; struct list_head *pAddmitList; enum direction_value Dir; --=20 2.42.0