From nobody Fri Jan 2 06:54:05 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 260F7CDB465 for ; Sat, 14 Oct 2023 04:40:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232891AbjJNEkK (ORCPT ); Sat, 14 Oct 2023 00:40:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43394 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232750AbjJNEkB (ORCPT ); Sat, 14 Oct 2023 00:40:01 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9766AC9 for ; Fri, 13 Oct 2023 21:39:59 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6b1ef786b7fso1289350b3a.3 for ; Fri, 13 Oct 2023 21:39:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darkphysics.net; s=google; t=1697258399; x=1697863199; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZCtkeW/AAlax77ncRvuWSk8ePDTDANoORemX0QeR1v4=; b=XiCIkw43YRLBmaQjbDAZGXsgoXGCxtg8knVheZfQ70SSTnWcHiZ76ztKt4+PAV/Fhe dS2vCTnlENNQI+ygKVnHmJ3Tt7vzjqHYx8g2CQnVvHRabxoSG1dBaMrxUx4xihQouPV0 OjukRWp+tLFqfa+XzyeCOVPzCvmIKZl846GJof8sbkPHpfCxtG7+Y1pb5so6RbKKO0wS drkIrBXW4ccx6JnCLB1DUkRfUh6PWn/ZjLRgT0kUQtocROvbsbWNQVSVOF/20NsBQqLA AeHtHav9OElU6KU6XfeOxJTybC88RIlOpvgqGs47cs2XD0ULSpBbp5lNCf5J7VKBBg1y AX7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697258399; x=1697863199; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZCtkeW/AAlax77ncRvuWSk8ePDTDANoORemX0QeR1v4=; b=LpP+c201RXhjnNuuv/zfTIIc2+8srBr1FnYU4H4Il6m4MrG3bgzGe1UtsyuLoYU+Sh eNGstKEXeCvRVoFbafeohk7XAGXcl68ngaylFb2rQRPnyN+YvlG2Ib7Y5iN+IqhsUEdc sAOuE8lrWmdYvt74yZvyoR47uZznv4IYBTAwVRVtLAAiiKV+MY39u/RuUvMPpCoOfHXN lNr0qPCr/6dHTTvtbCL9mZ8bBB48locnSnX0MrfysgV9FsTs3B70LEt6uFi9O3G+P/Gz TpZHFGCLkWF9Pny+zdx+rmgmvBFoJNmlkGhyF1VV4iVUSnPQXJ7xgYakFXccFtzVhVB4 3ABA== X-Gm-Message-State: AOJu0YyC77CjovOaAi4hMCz0vYNyd7Egt/CXHyp+UWmDmGaFA/Kb+Kwh VQ37TFWq1zD8uo+M/FmXtXNYmA== X-Google-Smtp-Source: AGHT+IHphIW8b8+6BhdaZDdR1ab6dBaJSJcnQh25oz7obhOf7iV0S07peSv/f8hN4VXgQScYwHfB4g== X-Received: by 2002:a05:6a00:391b:b0:690:3793:17e5 with SMTP id fh27-20020a056a00391b00b00690379317e5mr35048571pfb.4.1697258398993; Fri, 13 Oct 2023 21:39:58 -0700 (PDT) Received: from basil.darkphysics (c-76-146-178-2.hsd1.wa.comcast.net. [76.146.178.2]) by smtp.gmail.com with ESMTPSA id y6-20020aa78046000000b006934350c3absm14271926pfm.109.2023.10.13.21.39.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 13 Oct 2023 21:39:58 -0700 (PDT) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH 4/4] Staging: rtl8192e: Rename variable pTS Date: Fri, 13 Oct 2023 21:44:35 -0700 Message-ID: <20231014044435.11947-5-tdavies@darkphysics.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231014044435.11947-1-tdavies@darkphysics.net> References: <20231014044435.11947-1-tdavies@darkphysics.net> 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" Rename variable pTS to ts to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 26 +++---- drivers/staging/rtl8192e/rtl819x_TSProc.c | 94 +++++++++++------------ drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_tx.c | 8 +- 4 files changed, 65 insertions(+), 65 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rt= l8192e/rtl819x_BAProc.c index 34fc400035c8..93b566482149 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -304,7 +304,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, stru= ct sk_buff *skb) { struct ieee80211_hdr_3addr *rsp =3D NULL; struct ba_record *pending_ba, *pAdmittedBA; - struct tx_ts_record *pTS =3D NULL; + struct tx_ts_record *ts =3D NULL; u8 *dst =3D NULL, *pDialogToken =3D NULL, *tag =3D NULL; u16 *status_code =3D NULL, *pBaTimeoutVal =3D NULL; union ba_param_set *pBaParamSet =3D NULL; @@ -337,16 +337,16 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, st= ruct sk_buff *skb) goto OnADDBARsp_Reject; } =20 - if (!rtllib_get_ts(ieee, (struct ts_common_info **)&pTS, dst, + if (!rtllib_get_ts(ieee, (struct ts_common_info **)&ts, dst, (u8)(pBaParamSet->field.tid), TX_DIR, false)) { netdev_warn(ieee->dev, "%s(): can't get TS\n", __func__); reason_code =3D DELBA_REASON_UNKNOWN_BA; goto OnADDBARsp_Reject; } =20 - pTS->bAddBaReqInProgress =3D false; - pending_ba =3D &pTS->TxPendingBARecord; - pAdmittedBA =3D &pTS->TxAdmittedBARecord; + ts->bAddBaReqInProgress =3D false; + pending_ba =3D &ts->TxPendingBARecord; + pAdmittedBA =3D &ts->TxAdmittedBARecord; =20 if (pAdmittedBA->b_valid) { netdev_dbg(ieee->dev, "%s(): ADDBA response already admitted\n", @@ -368,7 +368,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, stru= ct sk_buff *skb) =20 if (*status_code =3D=3D ADDBA_STATUS_SUCCESS) { if (pBaParamSet->field.ba_policy =3D=3D BA_POLICY_DELAYED) { - pTS->bAddBaReqDelayed =3D true; + ts->bAddBaReqDelayed =3D true; deactivate_ba_entry(ieee, pAdmittedBA); reason_code =3D DELBA_REASON_END_BA; goto OnADDBARsp_Reject; @@ -381,8 +381,8 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, stru= ct sk_buff *skb) deactivate_ba_entry(ieee, pAdmittedBA); activate_ba_entry(pAdmittedBA, *pBaTimeoutVal); } else { - pTS->bAddBaReqDelayed =3D true; - pTS->bDisable_AddBa =3D true; + ts->bAddBaReqDelayed =3D true; + ts->bDisable_AddBa =3D true; reason_code =3D DELBA_REASON_END_BA; goto OnADDBARsp_Reject; } @@ -461,10 +461,10 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struc= t sk_buff *skb) return 0; } =20 -void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record= *pTS, +void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record= *ts, u8 policy, u8 bOverwritePending) { - struct ba_record *ba =3D &pTS->TxPendingBARecord; + struct ba_record *ba =3D &ts->TxPendingBARecord; =20 if (ba->b_valid && !bOverwritePending) return; @@ -474,14 +474,14 @@ void rtllib_ts_init_add_ba(struct rtllib_device *ieee= , struct tx_ts_record *pTS, 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 pTS->TsCommonInfo.TSpec.f.ts_info.field.uc= TSID; + ba->ba_param_set.field.tid =3D ts->TsCommonInfo.TSpec.f.ts_info.field.ucT= SID; ba->ba_param_set.field.buffer_size =3D 32; ba->ba_timeout_value =3D 0; - ba->ba_start_seq_ctrl.field.seq_num =3D (pTS->TxCurSeq + 3) % 4096; + ba->ba_start_seq_ctrl.field.seq_num =3D (ts->TxCurSeq + 3) % 4096; =20 activate_ba_entry(ba, BA_SETUP_TIMEOUT); =20 - rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.addr, ba); + rtllib_send_ADDBAReq(ieee, ts->TsCommonInfo.addr, ba); } =20 void rtllib_ts_init_del_ba(struct rtllib_device *ieee, diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 16d5164e860d..95e735c078e4 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -100,16 +100,16 @@ static void ResetTsCommonInfo(struct ts_common_info *= pTsCommonInfo) pTsCommonInfo->TClasNum =3D 0; } =20 -static void ResetTxTsEntry(struct tx_ts_record *pTS) +static void ResetTxTsEntry(struct tx_ts_record *ts) { - ResetTsCommonInfo(&pTS->TsCommonInfo); - pTS->TxCurSeq =3D 0; - pTS->bAddBaReqInProgress =3D false; - pTS->bAddBaReqDelayed =3D false; - pTS->bUsingBa =3D false; - pTS->bDisable_AddBa =3D false; - rtllib_reset_ba_entry(&pTS->TxAdmittedBARecord); - rtllib_reset_ba_entry(&pTS->TxPendingBARecord); + ResetTsCommonInfo(&ts->TsCommonInfo); + ts->TxCurSeq =3D 0; + ts->bAddBaReqInProgress =3D false; + ts->bAddBaReqDelayed =3D false; + ts->bUsingBa =3D false; + ts->bDisable_AddBa =3D false; + rtllib_reset_ba_entry(&ts->TxAdmittedBARecord); + rtllib_reset_ba_entry(&ts->TxPendingBARecord); } =20 static void ResetRxTsEntry(struct rx_ts_record *ts) @@ -382,41 +382,41 @@ static void RemoveTsEntry(struct rtllib_device *ieee, =20 void RemovePeerTS(struct rtllib_device *ieee, u8 *addr) { - struct ts_common_info *pTS, *pTmpTS; + struct ts_common_info *ts, *pTmpTS; =20 netdev_info(ieee->dev, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s, %pM\n", __f= unc__, addr); =20 - list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) { - if (memcmp(pTS->addr, addr, 6) =3D=3D 0) { - RemoveTsEntry(ieee, pTS, TX_DIR); - list_del_init(&pTS->List); - list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List); + list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) { + if (memcmp(ts->addr, addr, 6) =3D=3D 0) { + RemoveTsEntry(ieee, ts, TX_DIR); + list_del_init(&ts->List); + list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List); } } =20 - list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, List) { - if (memcmp(pTS->addr, addr, 6) =3D=3D 0) { + list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) { + if (memcmp(ts->addr, addr, 6) =3D=3D 0) { netdev_info(ieee->dev, "=3D=3D=3D=3D>remove Tx_TS_admin_list\n"); - RemoveTsEntry(ieee, pTS, TX_DIR); - list_del_init(&pTS->List); - list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List); + RemoveTsEntry(ieee, ts, TX_DIR); + list_del_init(&ts->List); + list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List); } } =20 - list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, List) { - if (memcmp(pTS->addr, addr, 6) =3D=3D 0) { - RemoveTsEntry(ieee, pTS, RX_DIR); - list_del_init(&pTS->List); - list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List); + list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) { + if (memcmp(ts->addr, addr, 6) =3D=3D 0) { + RemoveTsEntry(ieee, ts, RX_DIR); + list_del_init(&ts->List); + list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List); } } =20 - list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, List) { - if (memcmp(pTS->addr, addr, 6) =3D=3D 0) { - RemoveTsEntry(ieee, pTS, RX_DIR); - list_del_init(&pTS->List); - list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List); + list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) { + if (memcmp(ts->addr, addr, 6) =3D=3D 0) { + RemoveTsEntry(ieee, ts, RX_DIR); + list_del_init(&ts->List); + list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List); } } } @@ -424,30 +424,30 @@ EXPORT_SYMBOL(RemovePeerTS); =20 void RemoveAllTS(struct rtllib_device *ieee) { - struct ts_common_info *pTS, *pTmpTS; + struct ts_common_info *ts, *pTmpTS; =20 - list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Pending_List, List) { - RemoveTsEntry(ieee, pTS, TX_DIR); - list_del_init(&pTS->List); - list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List); + list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Pending_List, List) { + RemoveTsEntry(ieee, ts, TX_DIR); + list_del_init(&ts->List); + list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List); } =20 - list_for_each_entry_safe(pTS, pTmpTS, &ieee->Tx_TS_Admit_List, List) { - RemoveTsEntry(ieee, pTS, TX_DIR); - list_del_init(&pTS->List); - list_add_tail(&pTS->List, &ieee->Tx_TS_Unused_List); + list_for_each_entry_safe(ts, pTmpTS, &ieee->Tx_TS_Admit_List, List) { + RemoveTsEntry(ieee, ts, TX_DIR); + list_del_init(&ts->List); + list_add_tail(&ts->List, &ieee->Tx_TS_Unused_List); } =20 - list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Pending_List, List) { - RemoveTsEntry(ieee, pTS, RX_DIR); - list_del_init(&pTS->List); - list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List); + list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Pending_List, List) { + RemoveTsEntry(ieee, ts, RX_DIR); + list_del_init(&ts->List); + list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List); } =20 - list_for_each_entry_safe(pTS, pTmpTS, &ieee->Rx_TS_Admit_List, List) { - RemoveTsEntry(ieee, pTS, RX_DIR); - list_del_init(&pTS->List); - list_add_tail(&pTS->List, &ieee->Rx_TS_Unused_List); + list_for_each_entry_safe(ts, pTmpTS, &ieee->Rx_TS_Admit_List, List) { + RemoveTsEntry(ieee, ts, RX_DIR); + list_del_init(&ts->List); + list_add_tail(&ts->List, &ieee->Rx_TS_Unused_List); } } =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index b12a39ecdd9d..64a846af8679 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1788,7 +1788,7 @@ u16 TxCountToDataRate(struct rtllib_device *ieee, u8= nDataRate); int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb); int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb); int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb); -void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record= *pTS, +void rtllib_ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record= *ts, u8 policy, u8 bOverwritePending); void rtllib_ts_init_del_ba(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 8d8ce22c5f09..9bf679438ad1 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -495,13 +495,13 @@ static u16 rtllib_query_seqnum(struct rtllib_device *= ieee, struct sk_buff *skb, if (is_multicast_ether_addr(dst)) return 0; if (IsQoSDataFrame(skb->data)) { - struct tx_ts_record *pTS =3D NULL; + struct tx_ts_record *ts =3D NULL; =20 - if (!rtllib_get_ts(ieee, (struct ts_common_info **)(&pTS), dst, + if (!rtllib_get_ts(ieee, (struct ts_common_info **)(&ts), dst, skb->priority, TX_DIR, true)) return 0; - seqnum =3D pTS->TxCurSeq; - pTS->TxCurSeq =3D (pTS->TxCurSeq + 1) % 4096; + seqnum =3D ts->TxCurSeq; + ts->TxCurSeq =3D (ts->TxCurSeq + 1) % 4096; return seqnum; } return 0; --=20 2.39.2