From patchwork Wed Jul 12 23:25:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119417 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1481787vqm; Wed, 12 Jul 2023 16:37:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlGPAkmjqvv3XRN7DyQEziJ6tIfBAs/Rb0WUpaQvNuyKabYDPxFh3WiXywPQpnb+iltfVlcN X-Received: by 2002:a05:6358:7f18:b0:134:ece4:1e74 with SMTP id p24-20020a0563587f1800b00134ece41e74mr176543rwn.21.1689205021600; Wed, 12 Jul 2023 16:37:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205021; cv=none; d=google.com; s=arc-20160816; b=GjCcpffJgRdREhgMzmbGr+C/15E9IQDxMjnV78YI1rGT5UXNkkCWa2e4OCRZKjtD0v 7Ztb6qqlhZHTx740Q62mHk2L8bWw8zbZ2pm295PdcNbmOqJSTNTnM7ZULgkJ1QziLOJr GewJj66iO/JjVvyzoiHKck5pLWN6z0RdePWnpSbXmX50UV2ngc6+rOp8wio1P4KnOGUQ oWhzgIuUCrYpsgVnClLuSbhegluhkR5p2A6QRH46bj1d1T6w4o0K2b0qWNfkDCO2+Uyw p92gwBhg1At2RcseSZGp6J18IYWq1f1cnxYB4ifYMFnSq25gD9N2m4/RvYzWoQNE0fsH hREg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=kArvMPkvjbFTA2qIcyOEKwn/zn8/RK16V09EnExQ5/o=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=bBXsGM5RQN3NWekgRdcHuaACrqOQhUy2Gh3uj7hFCEl9AHCueclIdMb1fq3H3YQj0A dUTaunw8CL4z7g6AI8IXzntbi+IU0PQBCQCFnwIYt1ml8KwHdragjxMkNC0SKREoxBOD kUI5FcuEp5itOGsE3633YRCWnAZJBDIKudVVjfojhvigAXQfJt2vDtDalmFmzxUP3p2I 2PVsBY/CO2KA/qJHhLXxa/+5TVpRsbHRl4a2Jkg7nW90Mu8h+m3ct9+SzZdR4U7gScSA Y+6iSIrRx8aUKgqzqZhFPn7ravqqUXHxk7V+3mpHmSi1upXzJSoI2xsOnRnLflG5Cdrx uzhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=qd6tgivF; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=XMry9kdN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id f25-20020a635119000000b0055b57fc53a6si4132241pgb.540.2023.07.12.16.36.47; Wed, 12 Jul 2023 16:37:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=qd6tgivF; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=XMry9kdN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232130AbjGLXYV (ORCPT + 99 others); Wed, 12 Jul 2023 19:24:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39338 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231915AbjGLXYT (ORCPT ); Wed, 12 Jul 2023 19:24:19 -0400 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0ABD61BCC for ; Wed, 12 Jul 2023 16:24:18 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 95C1831668; Wed, 12 Jul 2023 19:24:15 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= VsvEWW4jTm3uKwgrvTm8WFT3f/A2AMNxLHc+Lpn7mOQ=; b=qd6tgivF5rP13bM5 ANXMpWA0RMVaAV1VbdTP/ip+zHOYQc2nzRYC7t9VX966SuaWvyawiYjHs5kV9GlD WzJvxgkzlflzVI2XruqWlIffQzNsJ19p8OUGKuLGRFjyeUSPE9vi4ImOUe4Y+ERY Lx8OKf4UJ5Raa403VcI8s6eqpqs= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 8DD9531667; Wed, 12 Jul 2023 19:24:15 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=VsvEWW4jTm3uKwgrvTm8WFT3f/A2AMNxLHc+Lpn7mOQ=; b=XMry9kdNujmQjNhOnZlJJKo2S6kQgGyV51mvVoMG2k47NFVwWY7qAgyoM7+ZBc0MuHmjtmeEsKc9ZSfYqZnikCcj2FyGPvRVl6JUNhVMmyxKWQHx7IcvG7qIoVG05fbnMFlxlxnilDmTVqteGF4tqBpY3twme/nDOwH85GIQDgE= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id C0CC831666; Wed, 12 Jul 2023 19:24:11 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:25:01 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/12] Staging: rtl8192e: Rename function ActivateBAEntry Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 35685424-210B-11EE-8E03-C2DA088D43B2-45285927!pb-smtp20.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771259844664787431 X-GMAIL-MSGID: 1771259844664787431 Rename function ActivateBAEntry to activate_ba_entry in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index acc19514bca6..965ffa8b78c2 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -10,7 +10,7 @@ #include "rtllib.h" #include "rtl819x_BA.h" -static void ActivateBAEntry(struct ba_record *pBA, u16 Time) +static void activate_ba_entry(struct ba_record *pBA, u16 Time) { pBA->b_valid = true; if (Time != 0) @@ -282,7 +282,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) else pBA->ba_param_set.field.buffer_size = 32; - ActivateBAEntry(pBA, 0); + activate_ba_entry(pBA, 0); rtllib_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS); return 0; @@ -379,7 +379,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) pAdmittedBA->ba_start_seq_ctrl = pPendingBA->ba_start_seq_ctrl; pAdmittedBA->ba_param_set = *pBaParamSet; DeActivateBAEntry(ieee, pAdmittedBA); - ActivateBAEntry(pAdmittedBA, *pBaTimeoutVal); + activate_ba_entry(pAdmittedBA, *pBaTimeoutVal); } else { pTS->bAddBaReqDelayed = true; pTS->bDisable_AddBa = true; @@ -479,7 +479,7 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS, pBA->ba_timeout_value = 0; pBA->ba_start_seq_ctrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096; - ActivateBAEntry(pBA, BA_SETUP_TIMEOUT); + activate_ba_entry(pBA, BA_SETUP_TIMEOUT); rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA); } From patchwork Wed Jul 12 23:26:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119427 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1483054vqm; Wed, 12 Jul 2023 16:40:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlGNpmSjfWt2IC7IUwnV6EJNxwHiGNaFmAK+6dqrhxkJ1IVQfZMpDSi1vLtLUrErmDjuFQe6 X-Received: by 2002:a05:6a00:1a0b:b0:67e:5edd:e6e7 with SMTP id g11-20020a056a001a0b00b0067e5edde6e7mr121547pfv.9.1689205219263; Wed, 12 Jul 2023 16:40:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205219; cv=none; d=google.com; s=arc-20160816; b=BqsWsKa5E4qH7KsdjmgT7QDiRvwGu5E/fvGxwxzprypvCUrUXQBXIEMIJJx3Ac7Y9P 2cHVktR6oxgX32Zboljdkl/59+D1fKjtiMJ0MOOFeAjt2VeYPebH7xZG2+wVdDiQJw4s 8Sj6ldwMw/Gi5VKtos6bGIMg7UAhcKLoMPIag9oAtgNfTuYqIVchpO7+tn0lF7bBuiEp GAx/gWl3mfREN9n2lz3/DJO3TCN96fZrOCQvF08z1xYiyjD06gwOCezgd//SBDoW2aKH 4p41NtdSGT1hcL+3TNnlbSQ7Z8jPaBzFQJKKCN3iu6JTMWObsP8FwB6+c7447W9LSWLh yYAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=vMdf8h6T+Zrvo5XhMSu89XRXbQ0/OctF2zUrbNTAbrU=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=uS4/ik+4cjzYbxxqqxsCkI0PYH+boqb85t6ZeeEemCEll8hxWnKGuo/Uwg2nUa+nOW XXB1X/3QQkW3+Hskr6A4qjxgG5g/h8jbbzj5Ujfq1gu8ud4MiiDAaN8KjcI7vgtE/OoF ue13jGabsJXwRx7dOg1v3ugS9BnnQglt2asoQGuJRV2NGDH6AZU8H1/LJVMZJ9i5+CYT VcMCn8WXKAfvDOmMiri032ph0uXzVNmai5eMAIEM7ShZHmK+feSFOEwyt/IBDgZKAiU/ wSUHywgnEg4c0wvrrY8b0MH31JJaWKI+H8SZSY+U+BYe/xLJptIM4jX/yjbKGZ6iSoWf DGcQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b="ri/YwD49"; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=WAw5rzVr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v135-20020a63618d000000b0055c7bb15293si812048pgb.403.2023.07.12.16.40.06; Wed, 12 Jul 2023 16:40:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b="ri/YwD49"; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=WAw5rzVr; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232271AbjGLXZq (ORCPT + 99 others); Wed, 12 Jul 2023 19:25:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231452AbjGLXZo (ORCPT ); Wed, 12 Jul 2023 19:25:44 -0400 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4177173F for ; Wed, 12 Jul 2023 16:25:43 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 73C6331677; Wed, 12 Jul 2023 19:25:43 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= 6tLJhkajTVNl2k/IZqZuVGCkXb7m36AOWdtJm0fAHXU=; b=ri/YwD49sLFWshst t+Jjxices8CJppTQ3FsugfZY2PJ/eu8tBSRYQbKcwcNkCEu6/W9APnHmsOry9AUH XRZHSP2nF6sYo9SqRxc6EYFLVLzKCNFqgvJ6Q1rC0vCllCbaMBnu8YQC4QZ5iHxa LdUzwKoNWXcOH626a8Ul8N9D7VQ= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 6C02D31676; Wed, 12 Jul 2023 19:25:43 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=6tLJhkajTVNl2k/IZqZuVGCkXb7m36AOWdtJm0fAHXU=; b=WAw5rzVrqr7yoKzsWFkPsxMFIHOmSjd1y3IyeKapWXc42eQfjD0Rxim+UuOPjLeJMLXNvO+dLRRkeYN1GyENE5YiSqv0GaASH+YbSQy7Hm1q2weJ6CNt3EYNfjNXFLUS5uP5XVUJF7ZQu68FMk4TbM0vpJ0HUSC4y+l+KN2L+OM= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id C7DBF31675; Wed, 12 Jul 2023 19:25:37 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:26:27 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/12] Staging: rtl8192e: Rename function DeActivateBAEntry Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 68AB361C-210B-11EE-9C15-C2DA088D43B2-45285927!pb-smtp20.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771260051530887981 X-GMAIL-MSGID: 1771260051530887981 Rename function DeActivateBAEntry to deactivate_ba_entry in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 965ffa8b78c2..50362bbbc8dd 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -17,7 +17,7 @@ static void activate_ba_entry(struct ba_record *pBA, u16 Time) mod_timer(&pBA->timer, jiffies + msecs_to_jiffies(Time)); } -static void DeActivateBAEntry(struct rtllib_device *ieee, struct ba_record *pBA) +static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *pBA) { pBA->b_valid = false; del_timer_sync(&pBA->timer); @@ -30,12 +30,12 @@ static u8 TxTsDeleteBA(struct rtllib_device *ieee, struct tx_ts_record *pTxTs) u8 bSendDELBA = false; if (pPendingBa->b_valid) { - DeActivateBAEntry(ieee, pPendingBa); + deactivate_ba_entry(ieee, pPendingBa); bSendDELBA = true; } if (pAdmittedBa->b_valid) { - DeActivateBAEntry(ieee, pAdmittedBa); + deactivate_ba_entry(ieee, pAdmittedBa); bSendDELBA = true; } return bSendDELBA; @@ -47,7 +47,7 @@ static u8 RxTsDeleteBA(struct rtllib_device *ieee, struct rx_ts_record *pRxTs) u8 bSendDELBA = false; if (pBa->b_valid) { - DeActivateBAEntry(ieee, pBa); + deactivate_ba_entry(ieee, pBa); bSendDELBA = true; } @@ -270,7 +270,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) rtllib_FlushRxTsPendingPkts(ieee, pTS); - DeActivateBAEntry(ieee, pBA); + deactivate_ba_entry(ieee, pBA); pBA->dialog_token = *pDialogToken; pBA->ba_param_set = *pBaParamSet; pBA->ba_timeout_value = *pBaTimeoutVal; @@ -363,13 +363,13 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) netdev_dbg(ieee->dev, "%s(): Recv ADDBA Rsp. BA is admitted! Status code:%X\n", __func__, *pStatusCode); - DeActivateBAEntry(ieee, pPendingBA); + deactivate_ba_entry(ieee, pPendingBA); } if (*pStatusCode == ADDBA_STATUS_SUCCESS) { if (pBaParamSet->field.ba_policy == BA_POLICY_DELAYED) { pTS->bAddBaReqDelayed = true; - DeActivateBAEntry(ieee, pAdmittedBA); + deactivate_ba_entry(ieee, pAdmittedBA); ReasonCode = DELBA_REASON_END_BA; goto OnADDBARsp_Reject; } @@ -378,7 +378,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) pAdmittedBA->ba_timeout_value = *pBaTimeoutVal; pAdmittedBA->ba_start_seq_ctrl = pPendingBA->ba_start_seq_ctrl; pAdmittedBA->ba_param_set = *pBaParamSet; - DeActivateBAEntry(ieee, pAdmittedBA); + deactivate_ba_entry(ieee, pAdmittedBA); activate_ba_entry(pAdmittedBA, *pBaTimeoutVal); } else { pTS->bAddBaReqDelayed = true; @@ -469,7 +469,7 @@ void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS, if (pBA->b_valid && !bOverwritePending) return; - DeActivateBAEntry(ieee, pBA); + deactivate_ba_entry(ieee, pBA); pBA->dialog_token++; pBA->ba_param_set.field.amsdu_support = 0; From patchwork Wed Jul 12 23:27:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1479744vqm; Wed, 12 Jul 2023 16:32:09 -0700 (PDT) X-Google-Smtp-Source: APBJJlGDZn+CHH0e7uV6rxVb6Hr0JLgGHTrwKuyuVDduLdrWSaMAMzK5crlyxfaE3s6K2tYwuCqY X-Received: by 2002:a17:906:228d:b0:98d:9655:3fac with SMTP id p13-20020a170906228d00b0098d96553facmr20817292eja.71.1689204729155; Wed, 12 Jul 2023 16:32:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689204729; cv=none; d=google.com; s=arc-20160816; b=oRJd/3Cjw8Pypm9HddwsBe/CJnfU45ACxLx3QPG5TWxlu3nz/P/toHnDHv0YZhrUIl q/ZqDNnhZKJcTwu137lDGiPTaECsINdBkfxQSOp2KvhO3u31y9sEOh19rziQhpffVBsB zrTvO0MvXP2YNmlaPRllFfh/Jz6JPND1qVQJgPithXdFzwbY455qsYxWOqR323QSawNL JxqEUTqbi1YFscq3CRXOHKfJu//022KfeuXIh6q3XSIUA25V6hTjEwVl2yd4ZtZ+W6Dq M0mxbT4kXrwn3E9+fJZnG0qzsjOyGECTSO1NFXXLLLJKWUUpyet6iQbLlIOmPle0UE7h 7ODg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=PBdWvSMa89iU98Q7vjd25zt2qaXEa/uqfG7fQHRMd4Y=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=in4N+Ui065uIXapHoXUMAncYNaY4Pez+JduJtaTuAZDcOFghrqewLAVDZ6hCud2lI1 tH8uVmOHB3dxwLJ1PDSp6lk9nkJT0c2L0PfWSo5fLvgLHLVQJQhsGQBWa4tuqPq/x8J3 o/AsaARhfE1vrCfpPlQTj64eABqlipsDhWeRmtswCbFaxRuZwP9PrBS7Ye2CuG8LLf/1 uzOuWsSeDJ9uwTItpBL0EctrWULRmWkXdOKiMYR/Y7HIa7g1WvLFhzBw90Pc/fz2aEZ2 MH/5+XAOuNgGGWDgRA0M0Xh9LPldCMpSLJLIidHaHwQpeGKzeRxBOb6+E28xUHgVJkQ+ HKqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=LarbNlUa; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=Arf9u0F8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lf25-20020a170907175900b00991ec5525f7si5431988ejc.50.2023.07.12.16.31.45; Wed, 12 Jul 2023 16:32:09 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=LarbNlUa; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=Arf9u0F8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232380AbjGLX0p (ORCPT + 99 others); Wed, 12 Jul 2023 19:26:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229570AbjGLX0n (ORCPT ); Wed, 12 Jul 2023 19:26:43 -0400 Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 206161BD5 for ; Wed, 12 Jul 2023 16:26:42 -0700 (PDT) Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 80B26360BA; Wed, 12 Jul 2023 19:26:41 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= tRo1T0O8Jm/q/6nDZsghbfTn0IEKHnogc2dvBlJANZg=; b=LarbNlUap4TJpaB3 0dj/bfrdwgKF2bzcBsY+OJh9hAkp1kGOA9a8z0l6ltbac90ktQtiNIq3V3ysu3Mp GWTgPSPlu+D6WYdLKESfeprnNYd3gY9MZ18npUHitZE1u/Q66GglTeYKC3W9KMEv NApxlet+FnCQY5f2xfgSgjjYFBM= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 7845A360B9; Wed, 12 Jul 2023 19:26:41 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=tRo1T0O8Jm/q/6nDZsghbfTn0IEKHnogc2dvBlJANZg=; b=Arf9u0F8ZEdUqj9p3Jy28zlxHYZcVVV68tzoQOGwIvdePy/Tm1WIZqsUKDcbcQQNk9XcHBe9YqAeoi2wHHg3zMw5SegeZQB355WLOwqrwE+N6Qzjrm9GpdMk4B32HKW4ZioJuLOb33rBsVHcxrqW7la1YPFKPcmN7yjTtcaSjvY= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id AEC8E360B8; Wed, 12 Jul 2023 19:26:37 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:27:26 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/12] Staging: rtl8192e: Rename function TxTsDeleteBA Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 8C5A61C8-210B-11EE-B070-B31D44D1D7AA-45285927!pb-smtp21.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771259538154635841 X-GMAIL-MSGID: 1771259538154635841 Rename function TxTsDeleteBA to tx_ts_delete_ba in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 50362bbbc8dd..6538343ea44d 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -23,7 +23,7 @@ static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *pB del_timer_sync(&pBA->timer); } -static u8 TxTsDeleteBA(struct rtllib_device *ieee, struct tx_ts_record *pTxTs) +static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *pTxTs) { struct ba_record *pAdmittedBa = &pTxTs->TxAdmittedBARecord; struct ba_record *pPendingBa = &pTxTs->TxPendingBARecord; @@ -456,7 +456,7 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) pTxTs->bAddBaReqInProgress = false; pTxTs->bAddBaReqDelayed = false; del_timer_sync(&pTxTs->TsAddBaTimer); - TxTsDeleteBA(ieee, pTxTs); + tx_ts_delete_ba(ieee, pTxTs); } return 0; } @@ -492,7 +492,7 @@ void TsInitDelBA(struct rtllib_device *ieee, struct tx_ts_record *pTxTs = (struct tx_ts_record *)pTsCommonInfo; - if (TxTsDeleteBA(ieee, pTxTs)) + if (tx_ts_delete_ba(ieee, pTxTs)) rtllib_send_DELBA(ieee, pTsCommonInfo->Addr, (pTxTs->TxAdmittedBARecord.b_valid) ? (&pTxTs->TxAdmittedBARecord) : @@ -524,7 +524,7 @@ void TxBaInactTimeout(struct timer_list *t) TxAdmittedBARecord.timer); struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, TxTsRecord[pTxTs->num]); - TxTsDeleteBA(ieee, pTxTs); + tx_ts_delete_ba(ieee, pTxTs); rtllib_send_DELBA(ieee, pTxTs->TsCommonInfo.Addr, &pTxTs->TxAdmittedBARecord, TX_DIR, DELBA_REASON_TIMEOUT); From patchwork Wed Jul 12 23:28:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119426 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1482946vqm; Wed, 12 Jul 2023 16:39:59 -0700 (PDT) X-Google-Smtp-Source: APBJJlEHm0tdXzbEH+ohAsv89HsoJg/0pzSY3yh3mSjSbPhB+k4f2dxmn+JN/kB+xv/ft605r8Sd X-Received: by 2002:a05:6358:291e:b0:134:c279:c825 with SMTP id y30-20020a056358291e00b00134c279c825mr378761rwb.12.1689205199647; Wed, 12 Jul 2023 16:39:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205199; cv=none; d=google.com; s=arc-20160816; b=ib2fFNYahWI6tkGxEG+NrD1qyVVJDgKKo74hyF8kqXAyO374z0t3CWUmpqn9YFqWc9 ntjjJfV1R+ipilFbySqOvxtFkJPeYCHzaiNKCMqFbE6nMSAWVmj+5eHHpbl633KhIeIH /WGYGUpz+01k5z02AhcESXqK0aeRWxUnMY4NqvlDiQ8c2LbmWipniiILNdJTX/HSDsYx KYdaXGgiKWzNLX+MJ3J7ctxJrXU6bobiEAbo+Tarl/Dw/tGZ3maUmMK6SbfYyQ8uAdVh EvHDihMnPoeR/SYDRpiMRdjHQa/UzAEemTW0MDM/HQT9TZuTcBfi8wq5rz0cX72nGOPl y34A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=Ec7NqNYvha1GI6rgb+1wgv1kxrlRl+GlRazmWB7Cdkw=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=wvNbHQu8vKHEcnE+6mUB6otvSY+SQ9XXdKgIWbhZCKdlImXf/wcLCo16oYPdF6hr53 HPvb+g8H/1tb5P5vceJykjDeGtbZyToqoofARSptmAAPHKRZO/qx6iADbg3z+lSohqCR y9kKb5D3ntIYAMClh9gagR3ljmv0f1NBCc5hvkIcNc1D3MkYO0OPLkP6Z9QxwvU9BjjH e6aHbTQ8NApm3HJI2x0k2YrCPQPU11hN7Efv0M+yHPqcCYMSzA5IPTg2N+3Vs/qkXTNo bB5E2nhJodFwj4nHJD7bE7AGazzUphrgsCoBm6qor5GDpaR8kqbjDy0OjQ+vgrc/UT59 GilA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=wPXHzVDa; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=i7ACQJJH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id v135-20020a63618d000000b0055c7bb15293si812048pgb.403.2023.07.12.16.39.46; Wed, 12 Jul 2023 16:39:59 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=wPXHzVDa; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=i7ACQJJH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232971AbjGLX2D (ORCPT + 99 others); Wed, 12 Jul 2023 19:28:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41124 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232530AbjGLX2B (ORCPT ); Wed, 12 Jul 2023 19:28:01 -0400 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 02955E5C for ; Wed, 12 Jul 2023 16:28:00 -0700 (PDT) Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 481DA1A32BB; Wed, 12 Jul 2023 19:27:59 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= m6menqUncA4a2eg0m4MFOVZboBdtfZm1e6YBGnLHfFA=; b=wPXHzVDa8p8qyZoL xKUW2WXd5OK1vO2OJsZ/xOZ/ba/rDVi+JbSAdmjYPTfWbqOwmL5F6LN2ergXbJxH HdHgrQUMtWvAt4DHI84JC0+BzPvLwUMi6i3xdKw7MwDX4sJhDoag2WWKrypPNRKo pg1c+AKjW5KveZV2Lcf2q6qEIsc= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 4034B1A32BA; Wed, 12 Jul 2023 19:27:59 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=m6menqUncA4a2eg0m4MFOVZboBdtfZm1e6YBGnLHfFA=; b=i7ACQJJHqnAlO4UUPIOn6uVwKthfqSUHk7SiuX82nqoBhPJvB1EOzKlKFnFVU/EXCxbVM4U+a86JBmSR7iN3XXQVGOrFAjzgjc03LTiXx9asL/57k7VIOwputk/xDjs3uMQQACpxXtAeyN5F7LTqWn5QpZpN57GDb+DWOIjS464= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 0820A1A32B9; Wed, 12 Jul 2023 19:27:57 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:28:42 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/12] Staging: rtl8192e: Rename function TsInitAddBA Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: BC80BDC0-210B-11EE-B801-307A8E0A682E-45285927!pb-smtp2.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771260031453175981 X-GMAIL-MSGID: 1771260031453175981 Rename function TsInitAddBA to ts_init_add_ba in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 6538343ea44d..2e37f1e949ec 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -461,7 +461,7 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) return 0; } -void TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS, +void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS, u8 Policy, u8 bOverwritePending) { struct ba_record *pBA = &pTS->TxPendingBARecord; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index c61fdf73c572..7841d9ce1a7f 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -96,7 +96,7 @@ static void TsAddBaProcess(struct timer_list *t) struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, TxTsRecord[num]); - TsInitAddBA(ieee, pTxTs, BA_POLICY_IMMEDIATE, false); + ts_init_add_ba(ieee, pTxTs, BA_POLICY_IMMEDIATE, false); netdev_dbg(ieee->dev, "%s(): ADDBA Req is started\n", __func__); } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index e3ce4431d460..de0dd48d0646 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2008,7 +2008,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 TsInitAddBA(struct rtllib_device *ieee, struct tx_ts_record *pTS, +void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS, u8 Policy, u8 bOverwritePending); void TsInitDelBA(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, From patchwork Wed Jul 12 23:30:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119418 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1482018vqm; Wed, 12 Jul 2023 16:37:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlGLu9Hs2ZzgR4tg4iBKpc6cMJe24t+tHtpEo2+7+2w0p8fVP4eSZf1jSReO9rvnFXG6TiAd X-Received: by 2002:a05:6808:130e:b0:3a4:2460:2b9a with SMTP id y14-20020a056808130e00b003a424602b9amr5200687oiv.34.1689205053453; Wed, 12 Jul 2023 16:37:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205053; cv=none; d=google.com; s=arc-20160816; b=ar69ey4jbSkTXNnY5qIpGmmN2g+Vu9T+IhhpCAZAEghKBPwkc+ny4vMZD61UVa2ZAz Msztr79LyyHDru6Lwy1/OiemYgnUGdnGraXdxfHl1V8pAjg2yK+bRWdbMb2YDjhHvBI1 wBnL4IKsWsOy7a4y0Qbssa8RmvX7KRISr36089ek1fU3lw/FmlguII6eXfurdDha5FB3 GFIHQn15l2o1Acd0bApcCFD4Y2wg7u9Ml1KabAuIG6baw8aAfa3azzQ48WnXxN/PRsZz OpYSy49sUNPpoXSuuVCPwCa62pSh7NCOdo8QI+cvXmk9OKu6XK+xr+Hf0FiSGR+joxdf RvhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=lhtfwGoPiukpUUeHga2+ihOq/Tp3768GAui4sO0DGQc=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=E9OLLo9gTGtUYVUo9m4fif9rGCF13seryh7pPTBEUWmY3spxU7wrahkFOgQwZL+JGT gcFqMRGOPMEztzQ/Pn7BsalypK4879GUf+DIw/PBPXnrnz14XlHaXFjPk4tIwZ9IsjVP 9MJBVM+xg+5LkbTzdfMGU0p8dEWL8JqwF0vCyCn+c91iD1ljaExMfRcWmYUMZPEVWmy/ fMqwK3oqv3nt0scSDEoNtmh0krtk6fkIIAb9t9RG8kFKYW9Osi0n3/5DhNuhMUtRLJnS Cx3Hwr5Fv0wt93ilktx+1LOAX33C0PZj9jRDKbcpBNv9sFbNWFNB3ml8LgUSLle/fcMP 58gg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=gCaDoqy6; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=f+8rkmd+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q4-20020a056a00084400b006669351f328si4150947pfk.388.2023.07.12.16.37.20; Wed, 12 Jul 2023 16:37:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=gCaDoqy6; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=f+8rkmd+; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232550AbjGLX3p (ORCPT + 99 others); Wed, 12 Jul 2023 19:29:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42676 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231144AbjGLX3m (ORCPT ); Wed, 12 Jul 2023 19:29:42 -0400 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 516E3170E for ; Wed, 12 Jul 2023 16:29:41 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 083C2316E1; Wed, 12 Jul 2023 19:29:41 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= HY1Rm7fpxTqb2jYNDCWoqzPm4QE4JHw4AH7Vp0SsMFQ=; b=gCaDoqy6clatyG5E YHd44Pj2BfijQ1+lgocSFvqOYl8Q7Et7SaGIQmvqMKNgVMhv8jtrMuz3EQjaVONw ievLFghoNx1UjT+/S13NwTvG+R+3Wqhs+odVbCcLbT5CTKtR1zkr9X65alyJg66+ l5fq3TGxktkS1ZCu7sYnCq/SejA= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 00AFA316E0; Wed, 12 Jul 2023 19:29:41 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=HY1Rm7fpxTqb2jYNDCWoqzPm4QE4JHw4AH7Vp0SsMFQ=; b=f+8rkmd+/D3p2P7h4JqFuDoAu1acbp0Ohy0/SWOkiWU8ZmnFdrNEQGVNDdJoag49PBtefnwmKmkFxIKc/R0K675VrwGVK+m/ODqYb2Lhp93ss05J1/FIguGQLMKf+yCvVhSlLde2gSSy8pn7E5ZMKT+y8xtVsrM9EWS1uqpn9M0= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id 5ADD0316DF; Wed, 12 Jul 2023 19:29:35 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:30:26 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/12] Staging: rtl8192e: Rename function TsInitDelBA Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: F63CD6A2-210B-11EE-ADE0-C2DA088D43B2-45285927!pb-smtp20.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771259877918091879 X-GMAIL-MSGID: 1771259877918091879 Rename function TsInitDelBA to ts_init_del_ba in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 2e37f1e949ec..9a32528fe314 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -484,7 +484,7 @@ void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS, rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA); } -void TsInitDelBA(struct rtllib_device *ieee, +void ts_init_del_ba(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect) { diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 7841d9ce1a7f..8005f7462aca 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -396,7 +396,7 @@ static void RemoveTsEntry(struct rtllib_device *ieee, { del_timer_sync(&pTs->SetupTimer); del_timer_sync(&pTs->InactTimer); - TsInitDelBA(ieee, pTs, TxRxSelect); + ts_init_del_ba(ieee, pTs, TxRxSelect); if (TxRxSelect == RX_DIR) { struct rx_reorder_entry *pRxReorderEntry; diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index de0dd48d0646..42a9b1dafc27 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2010,7 +2010,7 @@ 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 ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS, u8 Policy, u8 bOverwritePending); -void TsInitDelBA(struct rtllib_device *ieee, +void ts_init_del_ba(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect); void BaSetupTimeOut(struct timer_list *t); From patchwork Wed Jul 12 23:32:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119419 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1482125vqm; Wed, 12 Jul 2023 16:37:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlGODqsEucHOmXasOxbUAStBw0UnWGeMKXP0/HlaKalDLeu1hV0+AkXRqQjiSmIo0JsI2Uxa X-Received: by 2002:a17:90b:11c5:b0:264:a78:65cc with SMTP id gv5-20020a17090b11c500b002640a7865ccmr19626716pjb.45.1689205068462; Wed, 12 Jul 2023 16:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205068; cv=none; d=google.com; s=arc-20160816; b=MN0gXwpqTSlfHuhU1oV0Vl5ccxbOC3jm1tkid5U8wfes3PufxnPFeHVIKjr0IYF36g kVoxKOGk7PLCJdAP77CyPZJtsfo9ptfWnzZBI5Oh4eEZDkrHxeeavdicXtk/s0NrWNhR gMLwp81lO4yVvE64osjJUjEzEAlkrLzh0izVIaUAZBSV3msghYeQHsuVKEpqNmlhSrDQ 1Jh6m8Hl+kETNpVScTDKkK5T/I6n8ExUm2xP1oYIof1isTPfl0Gz/rbZ7uMtbyvYZ7iV mAhrwVL8t9JVu5/ZKgzhKuC3Iau9AIZ8OKkkwkuPPFjaHtvKWt/0c+09s9+xdbQMSLAE fk3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=8llntzcPbL7wDnMcLHVoF2xS8Ca2/ZnVuUUzH340JNY=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=Qn663BERgXxrOhBy104X0WdRSXnMAgpIrKLcS4PGVMvMPF83OTuI+F5etwEj6CjWKc pTRnH4KemiLUS1is4OpVZRtgZV3peabIjtmFEAC4f2JIajEVR5fE+pehNQXQv8W63EUT iGO6WWfwwzb2BfFUaeewc403Tj/3oiFkBLpJsEhx2+B42p8cq3rRlmC17joAwRd3kXew mHNawO1Rtl3bQ12V2h3p1YYPb1sHXYXi0cTDeOmh4zriPfkH3VindIt7nlny5fpSa5+s fu5IW5CQstM66nBwNdGdNfJF8YhU1ZR4cTh5o3GgKTXR4DaY0P2U3HGfRzK2wEMVzqUR bGmQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=NKdO66g7; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="I3/I1QqL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id kk7-20020a17090b4a0700b0026301f58ac4si4435892pjb.82.2023.07.12.16.37.35; Wed, 12 Jul 2023 16:37:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=NKdO66g7; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="I3/I1QqL"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232329AbjGLXbY (ORCPT + 99 others); Wed, 12 Jul 2023 19:31:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43514 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231144AbjGLXbW (ORCPT ); Wed, 12 Jul 2023 19:31:22 -0400 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18E13170E for ; Wed, 12 Jul 2023 16:31:21 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id B5318316F8; Wed, 12 Jul 2023 19:31:20 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= UlFpPcgJd6eBvs+tqsV0S7X52SvpA8keQhN2yc5Ia8w=; b=NKdO66g7tP2VL+/e aMt9uoaj7JMjutFNnc+6Cgvag4Lt5Lthe9feJewml0fqlEk2xnsMNd66bZkrib13 yUwcfpiCtN9uT5xZjQR1j3M2fzNdslnT/ARHB2My/i2vRllew+9At2Qe0od4tsSR x4bKvRAynqQONIsMaAc89cDP7kg= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id 9B634316F7; Wed, 12 Jul 2023 19:31:20 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=UlFpPcgJd6eBvs+tqsV0S7X52SvpA8keQhN2yc5Ia8w=; b=I3/I1QqLWo2lRrG8ByTBPWvnCws1u8EKRGh5ryscbBODd9sPlywwL3EnI2npQZjZUWfU1Of+Xf1BYY9VenK9dXceUXgigmAJ3HgWilmyk2pTqUO2znlGhz4d74crnEjnVAbOx4o7SDaF3r9m8NOQ1QusJMNwQH75u0E6+JzgDOk= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp20.pobox.com (Postfix) with ESMTPSA id B73F6316F6; Wed, 12 Jul 2023 19:31:16 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:32:06 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/12] Staging: rtl8192e: Rename function BaSetupTimeOut Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 32AB55DC-210C-11EE-BF2D-C2DA088D43B2-45285927!pb-smtp20.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771259893866111642 X-GMAIL-MSGID: 1771259893866111642 Rename function BaSetupTimeOut to ba_setup_time_out in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 9a32528fe314..941b3f47710e 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -508,7 +508,7 @@ void ts_init_del_ba(struct rtllib_device *ieee, } } -void BaSetupTimeOut(struct timer_list *t) +void ba_setup_time_out(struct timer_list *t) { struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TxPendingBARecord.timer); diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 8005f7462aca..087082cdcee6 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -150,7 +150,7 @@ void TSInitialize(struct rtllib_device *ieee) timer_setup(&pTxTS->TsAddBaTimer, TsAddBaProcess, 0); - timer_setup(&pTxTS->TxPendingBARecord.timer, BaSetupTimeOut, + timer_setup(&pTxTS->TxPendingBARecord.timer, ba_setup_time_out, 0); timer_setup(&pTxTS->TxAdmittedBARecord.timer, TxBaInactTimeout, 0); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 42a9b1dafc27..face43ee8a2b 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2013,7 +2013,7 @@ void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS, void ts_init_del_ba(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect); -void BaSetupTimeOut(struct timer_list *t); +void ba_setup_time_out(struct timer_list *t); void TxBaInactTimeout(struct timer_list *t); void RxBaInactTimeout(struct timer_list *t); void ResetBaEntry(struct ba_record *pBA); From patchwork Wed Jul 12 23:33:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119430 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1483167vqm; Wed, 12 Jul 2023 16:40:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlFND79Dj8K2Muh50jV9iGRuokXg/uCzjxKCLzcdeEHPuGtyzcyWwM2hLIIghdGE/wmkBu4e X-Received: by 2002:a17:90a:fc88:b0:263:27f5:d447 with SMTP id ci8-20020a17090afc8800b0026327f5d447mr21018185pjb.9.1689205241807; Wed, 12 Jul 2023 16:40:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205241; cv=none; d=google.com; s=arc-20160816; b=jkly0rtZhVqK+4hFWhHGO1qmit7t+uQMV4HWfapVbxGN941Ur8WKVPzAtPfyX9srGN dSNH/39y6vx5FT3SEV2zdrDNkNhqC0xC3wYR0iq0bkjSaTS0FXdE1L6vo7CxNSqBKkvl ZXWxRJOV9uvi7BxiSpHoYFcikoqDvIXYEZ0oBuoUh1od/7h1dMfJbsPvKYDwn8HMERQK uz7Mi5htjeM1DaGlkjCjIYKFpWgEE58wRKyvwXO6Sx6i8NW0DjsWUUQf+lYwFhURYTTQ I9lyuUTOxxYhmx6uv2i8Ie/yebRPPPuIPxu38hy02y/pgsRQEnAMi4mag768jfWpqip+ pRFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=xEykn5O3AcwqQdEBmBVqHz7EZgUxWI0RQoPVGI+bjwc=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=zx2vrCrMTVlUf8sQKiuv8kbvoUpIZslrw30Ze50CHBbiCKxxykVcpi7Loiq4gBhJ8x y0+Ct+ciqfDKI8nT5fkwGkIzXN/fe8vhpyseyLrRmgYCtEYOc91BcsXQAgZuFHUXjoFX AI2fyduoYF3fqGnBSCdGvt8WKeSxE4jL6Bcn+e/pm7PAk4oUhZP/JmiHlNYe24sCrotg hpsyFWNto5D/3o37WsxEYclMPgYaoN2r3lIplyoaX7YY+DD553bBZOIt+L0i3XKuAGdL a1SPXaVqc1HmFD3hGDCani/2UNxojloSVOFdcln6RlT/g/fj/OTOSFqydWDEzgfxmvSV taLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=rzQLk+IE; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=F1Pvuo7e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id fr14-20020a17090ae2ce00b00262f8c7ed18si11591546pjb.94.2023.07.12.16.40.29; Wed, 12 Jul 2023 16:40:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=rzQLk+IE; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=F1Pvuo7e; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232923AbjGLXcV (ORCPT + 99 others); Wed, 12 Jul 2023 19:32:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231144AbjGLXcS (ORCPT ); Wed, 12 Jul 2023 19:32:18 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D6E2E5C for ; Wed, 12 Jul 2023 16:32:17 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 956501B7F9B; Wed, 12 Jul 2023 19:32:16 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= k4Rg3JScZZGbHu0KzWz4UIDzTNedP5Uso0IXHkeikgY=; b=rzQLk+IE6dlRwBIB 4SxDwD4+/KTQv0l1NyfKKZgH4WB4dA4gGMQiuHO61P21N2WwcG/BZdLVN7/fnR+I xruLA2JSwdRIjhTy2MQjFCAp1N//Q7aud/zQFnoepA2T73+CPG3nd5DQoESeH3v5 Hxs3TmwJiCwiLXddpK3yYz5PEXc= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 8CE551B7F9A; Wed, 12 Jul 2023 19:32:16 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=k4Rg3JScZZGbHu0KzWz4UIDzTNedP5Uso0IXHkeikgY=; b=F1Pvuo7eX1uoGsTIifdmrhDJsNmlrvRkT0+/etQ5QKInCq5t0h/mGKA/ylbZRd2bXjIkI5vNRuvn6pnpfg+B7Bm5K4rNz6s8vaD/9tAwyz0n3ttUXwB/6FAt4bgKBEpV8iVZb4GJq+FCLZa9LcMKFVta1zKm79Nnkt8SjwmT/cE= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 4A2F31B7F99; Wed, 12 Jul 2023 19:32:15 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:33:06 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/12] Staging: rtl8192e: Rename function TxBaInactTimeout Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 55DF614C-210C-11EE-8F96-C65BE52EC81B-45285927!pb-smtp1.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771260075681772200 X-GMAIL-MSGID: 1771260075681772200 Rename function TxBaInactTimeout to tx_ba_inact_timeout in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 941b3f47710e..675f3ba15a7a 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -518,7 +518,7 @@ void ba_setup_time_out(struct timer_list *t) pTxTs->TxPendingBARecord.b_valid = false; } -void TxBaInactTimeout(struct timer_list *t) +void tx_ba_inact_timeout(struct timer_list *t) { struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TxAdmittedBARecord.timer); diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 087082cdcee6..7f0340dd764d 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -153,7 +153,7 @@ void TSInitialize(struct rtllib_device *ieee) timer_setup(&pTxTS->TxPendingBARecord.timer, ba_setup_time_out, 0); timer_setup(&pTxTS->TxAdmittedBARecord.timer, - TxBaInactTimeout, 0); + tx_ba_inact_timeout, 0); ResetTxTsEntry(pTxTS); list_add_tail(&pTxTS->TsCommonInfo.List, diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index face43ee8a2b..4f55dcf42bc7 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2014,7 +2014,7 @@ void ts_init_del_ba(struct rtllib_device *ieee, struct ts_common_info *pTsCommonInfo, enum tr_select TxRxSelect); void ba_setup_time_out(struct timer_list *t); -void TxBaInactTimeout(struct timer_list *t); +void tx_ba_inact_timeout(struct timer_list *t); void RxBaInactTimeout(struct timer_list *t); void ResetBaEntry(struct ba_record *pBA); bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, u8 *Addr, From patchwork Wed Jul 12 23:34:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119425 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1482705vqm; Wed, 12 Jul 2023 16:39:22 -0700 (PDT) X-Google-Smtp-Source: APBJJlEDxGLNvo9+SwDV1fr6wPipVWQWB0sUMZUmoe48uY/Y6Mb52M+udCP1zSgGR99L0rSy28xS X-Received: by 2002:a05:6a20:385:b0:127:3fea:500a with SMTP id 5-20020a056a20038500b001273fea500amr15585834pzt.27.1689205162344; Wed, 12 Jul 2023 16:39:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205162; cv=none; d=google.com; s=arc-20160816; b=qDNQREUCC2XIF0C1TD9a/267IfrQrpeozX3r73yUyjHDtpBiRRp8YMo9dswh5dxJnY Xa9OUMSjGFymJSK2WMlb84Lyp7UBRL7KXXkujMgJTy/Q3lMKMHH3uDp7h+92iXZtdHDR LTwxersfA0+aoWka5CjD7n1h5nJltdI+WgAPh6UQ/jph/GFKCukErys1gH5/a1w6HoDT QR5ZKUWnYRW8oSo2M4S+ypui8fXQLF3s7REGJoB1m5SnhFisM4hTSD0U+K/2LHc1tMVM twSRN/47ZCK4tdpjIANjTOYS+D2MJjrNCztslsGhV7HHCXbJhMPPVB67CMJzLX7IBbue 2vIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=34RDg/ng7fIuzsA0wA60AZKMzrx6NhvHvX8i8k9sx/U=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=Jnt1pAR81ZTxr40NT5k0oro4yVabXiIkwFC16Juip6WMSe1mQehoEwM1hg66DiuVtx 2IT01ZAJN4nzi4X/CMk9Stg0Kqr+itG3HG11ajyvQ4aOGaOWyqMa+sYQcyawpyTwJXPC USd312jmDYGH5BA14rl0o+7lNKOOvfdw4qitA3yQAjr9qmwfs9SEoTQqCHg3bVmeITET aaDpP0sPOjftFm8ee++KXOfjsEeFpZ7hwrMiLf1pNIY530wtcJ3sqQtHGk9/htuYwn2V cPgvrQfsJ8IXlV3jDaHkrCsRXuJ6dMsdIQUIUuRkBwP7LA6vXF1Lwi2iTj3SMTkINzkT +oMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=e45fQ23v; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="u/b+kiBT"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bs185-20020a6328c2000000b00553b02a9a17si4052060pgb.256.2023.07.12.16.39.09; Wed, 12 Jul 2023 16:39:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=e45fQ23v; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="u/b+kiBT"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232636AbjGLXdl (ORCPT + 99 others); Wed, 12 Jul 2023 19:33:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44442 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231144AbjGLXdj (ORCPT ); Wed, 12 Jul 2023 19:33:39 -0400 Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39BF4199D for ; Wed, 12 Jul 2023 16:33:38 -0700 (PDT) Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id C4EDF36141; Wed, 12 Jul 2023 19:33:37 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= XSX9XuFD4IHn1MFKn1hvAMyDaF1YWpN+lkLClOmoas8=; b=e45fQ23vAxvlvScP RbaKjt9HOpp9JGtR2mOgMJrtabJsyfEzjlz9aVOajjtN0XRisIEA1ZmprTVQbxl/ /uyLkqH0l+dLhVrQ3JXAMIpdxexNena7kapd27JOciO2L+xcAEh59sGm27fCUGai VAVem59Xw9GDZRIFgg7+NYpBSXg= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id BD65336140; Wed, 12 Jul 2023 19:33:37 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=XSX9XuFD4IHn1MFKn1hvAMyDaF1YWpN+lkLClOmoas8=; b=u/b+kiBT3Frs54p/7YAeBqPVQtsBdkdAJ09Iu7shOwoGV47tTpSm60iNW+7Q9f7NpYTLoNm4ULZDlihFUY2HQPmcPy+RBbhnq857AmEoMgx05i1MDv2+nk6Z4ti/KHwcSqml+GmVnG91yWuzy6vtu8UaQESw0EpcB2SwzLpmQzY= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id 724FC3613F; Wed, 12 Jul 2023 19:33:33 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:34:23 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/12] Staging: rtl8192e: Rename function RxBaInactTimeout Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 8426E5DE-210C-11EE-88EE-B31D44D1D7AA-45285927!pb-smtp21.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771259992195079025 X-GMAIL-MSGID: 1771259992195079025 Rename function RxBaInactTimeout to rx_ba_inact_timeout in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 675f3ba15a7a..6b5da38353ee 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -530,7 +530,7 @@ void tx_ba_inact_timeout(struct timer_list *t) DELBA_REASON_TIMEOUT); } -void RxBaInactTimeout(struct timer_list *t) +void rx_ba_inact_timeout(struct timer_list *t) { struct rx_ts_record *pRxTs = from_timer(pRxTs, t, rx_admitted_ba_record.timer); diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 7f0340dd764d..2f7d5324edb9 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -175,7 +175,7 @@ void TSInitialize(struct rtllib_device *ieee) 0); timer_setup(&pRxTS->rx_admitted_ba_record.timer, - RxBaInactTimeout, 0); + rx_ba_inact_timeout, 0); timer_setup(&pRxTS->rx_pkt_pending_timer, RxPktPendingTimeout, 0); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 4f55dcf42bc7..0f84ee1d418e 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2015,7 +2015,7 @@ void ts_init_del_ba(struct rtllib_device *ieee, enum tr_select TxRxSelect); void ba_setup_time_out(struct timer_list *t); void tx_ba_inact_timeout(struct timer_list *t); -void RxBaInactTimeout(struct timer_list *t); +void rx_ba_inact_timeout(struct timer_list *t); void ResetBaEntry(struct ba_record *pBA); bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, u8 *Addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs); From patchwork Wed Jul 12 23:35:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119431 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1483504vqm; Wed, 12 Jul 2023 16:41:36 -0700 (PDT) X-Google-Smtp-Source: APBJJlEIa84Q2/3zsKeSPXvtUzr9xoa+TX5sTPgtpNYiQi7QJJLyuTdmvU8dRgEBYCe3R4kR1XmY X-Received: by 2002:a17:902:ba87:b0:1b7:f98d:5567 with SMTP id k7-20020a170902ba8700b001b7f98d5567mr29422pls.68.1689205296547; Wed, 12 Jul 2023 16:41:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689205296; cv=none; d=google.com; s=arc-20160816; b=hfGUs9C4iCVromdh9urB9a5DhhJC0QBzarXunp7qDae5yRTQAoVJsvwADk6vgolHzZ Wyh+eQ3t7KNYZ+c64eLmjNWsEctmL9e+eTRVtOyaww+BsOLhrO2lhAmAkv30yZmUewwc anyVWFwJIxDXVphXMfW9bOpQQDrAhgAlZa2iA6zXwQByYA6HaFmJgdM44Lrep4pWhWrU 64ZNax/Cj5NdB1Ry/CnIoYcYRqpUdeBIkGPgbsCudEgSTr1sy//VZy4kDG3t+1dTJ3zn 2sUOVl65yVW2Lu4yvtpgNxzIZbOCX0cHl5CPhcPzLyvEGJVyH++dN5tfaK9JFXAE6nWm jbLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=0UXrOrJ+MeZheZiCLDr7ipBPAxptnBEPGfqNcxKeUWU=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=x5VowmysDceyJv66fYLNojlfuMw/XmXSIssaSz9ccnRHSJv4CLaMdPn+bHGOGCaJqB 2AcTVakxZdpSBh37Slg7HjsJUSoPNRs101oCl557z4/R/7GbW4aswgbUapsNRXOACp8i N3K+pIXFML1yADSRwp5Wh+sKB9X2oUc3DCXt2A3WLgfGxYL6Hf15ZM1KAqlAUZuQbpPe 4uM+sHFxMUvEbJNv7ZkEYbc/ktUV5d3ji0U5lTdgr9WZSU+ypDtmx//c4lj9Q1aZZi15 BEopnjC5B3zT1Ey6PQBq+ZFzlpilovQRxRQGmGn7PFU0VTX0mxpU0WNg++XABdDXZKfD iNag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=xx0Z4lip; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="UiTBPwR/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jw19-20020a170903279300b001b0450241d1si3939196plb.283.2023.07.12.16.41.20; Wed, 12 Jul 2023 16:41:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=xx0Z4lip; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="UiTBPwR/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233146AbjGLXe3 (ORCPT + 99 others); Wed, 12 Jul 2023 19:34:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45068 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233092AbjGLXe1 (ORCPT ); Wed, 12 Jul 2023 19:34:27 -0400 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FE431BF2 for ; Wed, 12 Jul 2023 16:34:24 -0700 (PDT) Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 866D51A34E1; Wed, 12 Jul 2023 19:34:23 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= Aqiqad5r3+BuF106GVlTjb3d7vKYLXmApbjAv2GjMvQ=; b=xx0Z4lipTuEdFg06 M3ekhqBJT/2B7QR9J/MMhXeO22Oy40VQvIAtKyNiN3d+PyWvUkhQoRrbBriV58En Bmrfon/U2m5uHYbWIufYafSse2DV+ubCJCpXMCKCA8i1dZvNIhN+cHz7CqFjxpVe XHvNul5icjZF2i0grsWdZWZG2Cw= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id 7E9D91A34E0; Wed, 12 Jul 2023 19:34:23 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=Aqiqad5r3+BuF106GVlTjb3d7vKYLXmApbjAv2GjMvQ=; b=UiTBPwR/Y6jnedaZ8aL4EkRBsNJoVEl73B8p/1dTFOOGT5P+YDs9483xZ2W0XkHKgGEeJHqPGs7VcwyxxtxHME4cWaUb98T6BkxdGgIna0Webse+gA49KPONAJjcjwFHIDB1VmONy3iQLIZJ1+D0RlqZrWa2pdjmhs7tjs+Mrso= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id DC4F91A34DF; Wed, 12 Jul 2023 19:34:21 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:35:13 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/12] Staging: rtl8192e: Rename variable pBA Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: A152D0BE-210C-11EE-9AE8-307A8E0A682E-45285927!pb-smtp2.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771260132914761775 X-GMAIL-MSGID: 1771260132914761775 Rename variable pBA to pba in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 106 +++++++++++----------- drivers/staging/rtl8192e/rtllib.h | 2 +- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 6b5da38353ee..43ee1bd4a6ed 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -10,17 +10,17 @@ #include "rtllib.h" #include "rtl819x_BA.h" -static void activate_ba_entry(struct ba_record *pBA, u16 Time) +static void activate_ba_entry(struct ba_record *pba, u16 Time) { - pBA->b_valid = true; + pba->b_valid = true; if (Time != 0) - mod_timer(&pBA->timer, jiffies + msecs_to_jiffies(Time)); + mod_timer(&pba->timer, jiffies + msecs_to_jiffies(Time)); } -static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *pBA) +static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *pba) { - pBA->b_valid = false; - del_timer_sync(&pBA->timer); + pba->b_valid = false; + del_timer_sync(&pba->timer); } static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *pTxTs) @@ -43,28 +43,28 @@ static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *pTxTs static u8 RxTsDeleteBA(struct rtllib_device *ieee, struct rx_ts_record *pRxTs) { - struct ba_record *pBa = &pRxTs->rx_admitted_ba_record; + struct ba_record *pba = &pRxTs->rx_admitted_ba_record; u8 bSendDELBA = false; - if (pBa->b_valid) { - deactivate_ba_entry(ieee, pBa); + if (pba->b_valid) { + deactivate_ba_entry(ieee, pba); bSendDELBA = true; } return bSendDELBA; } -void ResetBaEntry(struct ba_record *pBA) +void ResetBaEntry(struct ba_record *pba) { - pBA->b_valid = false; - pBA->ba_param_set.short_data = 0; - pBA->ba_timeout_value = 0; - pBA->dialog_token = 0; - pBA->ba_start_seq_ctrl.short_data = 0; + pba->b_valid = false; + pba->ba_param_set.short_data = 0; + pba->ba_timeout_value = 0; + pba->dialog_token = 0; + pba->ba_start_seq_ctrl.short_data = 0; } static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, - struct ba_record *pBA, + struct ba_record *pba, u16 StatusCode, u8 type) { struct sk_buff *skb = NULL; @@ -75,8 +75,8 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, netdev_dbg(ieee->dev, "%s(): frame(%d) sentd to: %pM, ieee->dev:%p\n", __func__, type, Dst, ieee->dev); - if (!pBA) { - netdev_warn(ieee->dev, "pBA is NULL\n"); + if (!pba) { + netdev_warn(ieee->dev, "pba is NULL\n"); return NULL; } skb = dev_alloc_skb(len + sizeof(struct rtllib_hdr_3addr)); @@ -98,21 +98,21 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, tag = skb_put(skb, 9); *tag++ = ACT_CAT_BA; *tag++ = type; - *tag++ = pBA->dialog_token; + *tag++ = pba->dialog_token; if (type == ACT_ADDBARSP) { put_unaligned_le16(StatusCode, tag); tag += 2; } - put_unaligned_le16(pBA->ba_param_set.short_data, tag); + put_unaligned_le16(pba->ba_param_set.short_data, tag); tag += 2; - put_unaligned_le16(pBA->ba_timeout_value, tag); + put_unaligned_le16(pba->ba_timeout_value, tag); tag += 2; if (type == ACT_ADDBAREQ) { - memcpy(tag, (u8 *)&pBA->ba_start_seq_ctrl, 2); + memcpy(tag, (u8 *)&pba->ba_start_seq_ctrl, 2); tag += 2; } @@ -124,7 +124,7 @@ static struct sk_buff *rtllib_ADDBA(struct rtllib_device *ieee, u8 *Dst, } static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, - struct ba_record *pBA, + struct ba_record *pba, enum tr_select TxRxSelect, u16 ReasonCode) { union delba_param_set DelbaParamSet; @@ -140,7 +140,7 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, memset(&DelbaParamSet, 0, 2); DelbaParamSet.field.initiator = (TxRxSelect == TX_DIR) ? 1 : 0; - DelbaParamSet.field.tid = pBA->ba_param_set.field.tid; + DelbaParamSet.field.tid = pba->ba_param_set.field.tid; skb = dev_alloc_skb(len + sizeof(struct rtllib_hdr_3addr)); if (!skb) @@ -174,11 +174,11 @@ static struct sk_buff *rtllib_DELBA(struct rtllib_device *ieee, u8 *dst, } static void rtllib_send_ADDBAReq(struct rtllib_device *ieee, u8 *dst, - struct ba_record *pBA) + struct ba_record *pba) { struct sk_buff *skb; - skb = rtllib_ADDBA(ieee, dst, pBA, 0, ACT_ADDBAREQ); + skb = rtllib_ADDBA(ieee, dst, pba, 0, ACT_ADDBAREQ); if (skb) softmac_mgmt_xmit(skb, ieee); @@ -187,11 +187,11 @@ static void rtllib_send_ADDBAReq(struct rtllib_device *ieee, u8 *dst, } static void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst, - struct ba_record *pBA, u16 StatusCode) + struct ba_record *pba, u16 StatusCode) { struct sk_buff *skb; - skb = rtllib_ADDBA(ieee, dst, pBA, StatusCode, ACT_ADDBARSP); + skb = rtllib_ADDBA(ieee, dst, pba, StatusCode, ACT_ADDBARSP); if (skb) softmac_mgmt_xmit(skb, ieee); else @@ -199,12 +199,12 @@ static void rtllib_send_ADDBARsp(struct rtllib_device *ieee, u8 *dst, } static void rtllib_send_DELBA(struct rtllib_device *ieee, u8 *dst, - struct ba_record *pBA, enum tr_select TxRxSelect, + struct ba_record *pba, enum tr_select TxRxSelect, u16 ReasonCode) { struct sk_buff *skb; - skb = rtllib_DELBA(ieee, dst, pBA, TxRxSelect, ReasonCode); + skb = rtllib_DELBA(ieee, dst, pba, TxRxSelect, ReasonCode); if (skb) softmac_mgmt_xmit(skb, ieee); else @@ -216,7 +216,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) struct rtllib_hdr_3addr *req = NULL; u16 rc = 0; u8 *dst = NULL, *pDialogToken = NULL, *tag = NULL; - struct ba_record *pBA = NULL; + struct ba_record *pba = NULL; union ba_param_set *pBaParamSet = NULL; u16 *pBaTimeoutVal = NULL; union sequence_control *pBaStartSeqCtrl = NULL; @@ -259,7 +259,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) netdev_warn(ieee->dev, "%s(): can't get TS\n", __func__); goto OnADDBAReq_Fail; } - pBA = &pTS->rx_admitted_ba_record; + pba = &pTS->rx_admitted_ba_record; if (pBaParamSet->field.ba_policy == BA_POLICY_DELAYED) { rc = ADDBA_STATUS_INVALID_PARAM; @@ -270,20 +270,20 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb) rtllib_FlushRxTsPendingPkts(ieee, pTS); - deactivate_ba_entry(ieee, pBA); - pBA->dialog_token = *pDialogToken; - pBA->ba_param_set = *pBaParamSet; - pBA->ba_timeout_value = *pBaTimeoutVal; - pBA->ba_start_seq_ctrl = *pBaStartSeqCtrl; + deactivate_ba_entry(ieee, pba); + pba->dialog_token = *pDialogToken; + pba->ba_param_set = *pBaParamSet; + pba->ba_timeout_value = *pBaTimeoutVal; + pba->ba_start_seq_ctrl = *pBaStartSeqCtrl; if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev) || (ieee->ht_info->iot_action & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT)) - pBA->ba_param_set.field.buffer_size = 1; + pba->ba_param_set.field.buffer_size = 1; else - pBA->ba_param_set.field.buffer_size = 32; + pba->ba_param_set.field.buffer_size = 32; - activate_ba_entry(pBA, 0); - rtllib_send_ADDBARsp(ieee, dst, pBA, ADDBA_STATUS_SUCCESS); + activate_ba_entry(pba, 0); + rtllib_send_ADDBARsp(ieee, dst, pba, ADDBA_STATUS_SUCCESS); return 0; @@ -464,24 +464,24 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) void ts_init_add_ba(struct rtllib_device *ieee, struct tx_ts_record *pTS, u8 Policy, u8 bOverwritePending) { - struct ba_record *pBA = &pTS->TxPendingBARecord; + struct ba_record *pba = &pTS->TxPendingBARecord; - if (pBA->b_valid && !bOverwritePending) + if (pba->b_valid && !bOverwritePending) return; - deactivate_ba_entry(ieee, pBA); + deactivate_ba_entry(ieee, pba); - pBA->dialog_token++; - pBA->ba_param_set.field.amsdu_support = 0; - pBA->ba_param_set.field.ba_policy = Policy; - pBA->ba_param_set.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID; - pBA->ba_param_set.field.buffer_size = 32; - pBA->ba_timeout_value = 0; - pBA->ba_start_seq_ctrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096; + pba->dialog_token++; + pba->ba_param_set.field.amsdu_support = 0; + pba->ba_param_set.field.ba_policy = Policy; + pba->ba_param_set.field.tid = pTS->TsCommonInfo.TSpec.f.TSInfo.field.ucTSID; + pba->ba_param_set.field.buffer_size = 32; + pba->ba_timeout_value = 0; + pba->ba_start_seq_ctrl.field.seq_num = (pTS->TxCurSeq + 3) % 4096; - activate_ba_entry(pBA, BA_SETUP_TIMEOUT); + activate_ba_entry(pba, BA_SETUP_TIMEOUT); - rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pBA); + rtllib_send_ADDBAReq(ieee, pTS->TsCommonInfo.Addr, pba); } void ts_init_del_ba(struct rtllib_device *ieee, diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index 0f84ee1d418e..8f0e9dbe5b7a 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2016,7 +2016,7 @@ void ts_init_del_ba(struct rtllib_device *ieee, void ba_setup_time_out(struct timer_list *t); void tx_ba_inact_timeout(struct timer_list *t); void rx_ba_inact_timeout(struct timer_list *t); -void ResetBaEntry(struct ba_record *pBA); +void ResetBaEntry(struct ba_record *pba); bool GetTs(struct rtllib_device *ieee, struct ts_common_info **ppTS, u8 *Addr, u8 TID, enum tr_select TxRxSelect, bool bAddNewTs); void TSInitialize(struct rtllib_device *ieee); From patchwork Wed Jul 12 23:36:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119436 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1488715vqm; Wed, 12 Jul 2023 16:55:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlFdny29k8mKg9F/iwuFk5Dud30+G1vrtnT+90C648hweBEqwuHO37cl96g8v3vI9dsKhLJT X-Received: by 2002:a05:6402:1856:b0:51d:9110:4b11 with SMTP id v22-20020a056402185600b0051d91104b11mr284966edy.12.1689206103431; Wed, 12 Jul 2023 16:55:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689206103; cv=none; d=google.com; s=arc-20160816; b=mCxX2QxsTExfYYrX8qry0SshJFiPRT5ZPN19IaixYj8ybajl83toO/Y57Fhsl1HgFO ErKQwDcHVTtdImJJmvq1vSYm4iVKeRAAvJe8UzcNH1hc8wSBj5jAZlXwyOf4uIY4PwX7 N/pgw3qlZ64DiAV46UyYSS11cUCfrvxfBUAW5EALDNWm/bGMBfmthWPDGfOLxSoqYhTo MIUk/ICHtTqaSiOtqMI3IQaOlbZxD2k0612m4XrtmC2x0Dd0HEobzJ/BBVSwXuELrhmv 4BYnL8oi7NoOMsZJ4WBObPJVQQ0NjZx8V/VjoXeb4uc36juE5ywJiZG9n3kV7Jgalgck LsCQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=4MK78fRAQqqikifOsPYVFjF1oV+TlaJYqJjXe0LO3Hs=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=S+JDYMZJaPjqtBdC89Lv68ujcpn8lehLHarf0xX9U58dry+UmzYkFQGoLETUB5Vhd+ Jtk4ekJbZ8hw3RP1HLg/ARjxejNANShfFsL+Qc0yoqwVHK1TP/5k072TvAhnESFo1VDK qSbV12d/OJYlSS5uRAj9wfPbEUp9VaUYyC6+5p7DtAHiAFEFner6TZrmQ5Pxp0/8BQjZ GK/W5Se7vVrYZV07q51/3DFxS1au+YI7w8JWuerShA1zk1Uf/DxQzYlEFr7He2ibT/uk lv4rFw6GmHelpYlfz8tb9JOF83AX0TcYUperk54sWx96DcNWtx/VcBJ9snuqPftgoIWx /AeA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=HqEecp+A; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=NjtaQKjo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w4-20020aa7dcc4000000b0051e168ec86csi6618115edu.310.2023.07.12.16.54.39; Wed, 12 Jul 2023 16:55:03 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=HqEecp+A; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=NjtaQKjo; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233128AbjGLXff (ORCPT + 99 others); Wed, 12 Jul 2023 19:35:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45450 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232420AbjGLXfe (ORCPT ); Wed, 12 Jul 2023 19:35:34 -0400 Received: from pb-smtp2.pobox.com (pb-smtp2.pobox.com [64.147.108.71]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47AE5E5C for ; Wed, 12 Jul 2023 16:35:33 -0700 (PDT) Received: from pb-smtp2.pobox.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id A967D1A34FE; Wed, 12 Jul 2023 19:35:32 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= BIJS2wJRKpfoY/HYZJ/ljaNe/xebfvh3PWRsDZ37tq8=; b=HqEecp+AJvcZVaed q5fz6C/Y3nNz2SQSdRbyT1xlZMxIbwR+whbqQs4QGGbnr6SB4KU8aBWnwGtOPJ01 ZfAs4xd/v68DtYx+tEGd4Xr36WLycuK/NnKmYsmtOGqD67TZhrCkkwsX/oZhcnFB MejtORmfvHEPaM2Xx5pZln2MBWI= Received: from pb-smtp2.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp2.pobox.com (Postfix) with ESMTP id A20BF1A34FC; Wed, 12 Jul 2023 19:35:32 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=BIJS2wJRKpfoY/HYZJ/ljaNe/xebfvh3PWRsDZ37tq8=; b=NjtaQKjo1DFwLKzzk+2Xlq78C39aYOS5rqQKgxsJRGIZI2q1Q7UF3JBrItUfzKDRtP9eOSQubeYrwBgEnyDbPUkeCnA6YprpQbLZlMdL7PZWEDsHsPj7dUdgyUtuzFUCO/lY//mx2c5dYZlYGOGl/MM27Qj3PaEvradSkgtjjcs= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp2.pobox.com (Postfix) with ESMTPSA id 34E131A34FB; Wed, 12 Jul 2023 19:35:31 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:36:21 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/12] Staging: rtl8192e: Rename variable Time Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: CACA6B1E-210C-11EE-ABCF-307A8E0A682E-45285927!pb-smtp2.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771260979016951572 X-GMAIL-MSGID: 1771260979016951572 Rename variable Time to time, in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 43ee1bd4a6ed..f64534d14104 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -10,11 +10,11 @@ #include "rtllib.h" #include "rtl819x_BA.h" -static void activate_ba_entry(struct ba_record *pba, u16 Time) +static void activate_ba_entry(struct ba_record *pba, u16 time) { pba->b_valid = true; - if (Time != 0) - mod_timer(&pba->timer, jiffies + msecs_to_jiffies(Time)); + if (time != 0) + mod_timer(&pba->timer, jiffies + msecs_to_jiffies(time)); } static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *pba) From patchwork Wed Jul 12 23:37:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119442 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1490204vqm; Wed, 12 Jul 2023 16:59:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlGn8jCHFGuv2X4nZPx7r+8uYfUosDlkueOR/MnHWodQSOfvDUb1j0W1HRHyWsomm4jduQYp X-Received: by 2002:a17:906:6c87:b0:957:2e48:5657 with SMTP id s7-20020a1709066c8700b009572e485657mr18201295ejr.68.1689206373588; Wed, 12 Jul 2023 16:59:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689206373; cv=none; d=google.com; s=arc-20160816; b=EBGqpGsMR3p6kT4PpD6P/KMjUn9Gzd2ViHsWZ7Yq0w5gwiim/tUBIFXPXLbdi/B4Mc 33kiakjozOnnLIwmyLfmKKjlj6xDBBoWVT2aQhLHhNDyJnbEuuhQXANFPP2EXglJyk4D jxpu9wm8Qir/l5EJIDQBbl0mo4RywVf7LwGZr+TX+D+Yzy82B+h207NMK4FNJdoP9PwQ K48EEEwhQG4NsEV/wttId+Jp0FNLsAiZ+EXmospCD3O6kCpzrGmFGmHqIGugxeNNQCw/ v9qRNPsZ5PuL0i820reqMc6512UuZK5A253c1Zda3dMVIlDbyATfyYH+9zsalKHkk3eC DDfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=R8WCtK85Rwg7SF9+zgWKbZOqfZeOujRWjNaKVBsFz3c=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=DiGObNiocClrwTfC9wrq4hVKc67vjHSt108lcTbDAo1sfGzcFPcl9m46cf1+CBymKm C0u6wVVARDW4n10be7XASjturiazYAoliKyQzViYx3vX9ZZsBugQmUOwGSd9CKvTiBxj XnzVSDzr6tJvn5yDvZ61Sd2AvgAUrVe8h65uphW9RgYop26k/UpGgeyzrfG+ssuLCbgZ QtpCwwOOf5Y4nq+CAnALZibEXJ9rzlu7xs4jF45ZNrG+iBdQlNyEswMRHJUtZreBC9AR dPAA+oeK0BncQbg7wVnCO/GPm2Sxm7WDZeoQ+HpVvMIBgmurR+geNDklRvtNOXdFpPsz YsSQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=TANULkCT; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=dDcoDKjO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id c7-20020a17090654c700b00992acfe04b8si6369365ejp.150.2023.07.12.16.59.09; Wed, 12 Jul 2023 16:59:33 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=TANULkCT; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=dDcoDKjO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232443AbjGLXgy (ORCPT + 99 others); Wed, 12 Jul 2023 19:36:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46090 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231237AbjGLXgw (ORCPT ); Wed, 12 Jul 2023 19:36:52 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B33D419B4 for ; Wed, 12 Jul 2023 16:36:50 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id F314F188139; Wed, 12 Jul 2023 19:36:49 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= COUTYsUyLILoRs96NQ5wzPfXSdx/NJTsrx9FChTnJ7A=; b=TANULkCTr7F9EJrf tSuwxVJyXZTmysrAnqH2BFBPUbpCQLiFhLc1Lxm4aaWshBptHbfxPFsEsnk/BnXt DVSE0kWzuiA5o72QHOCm+d17/LyQnXRfe9QVcbgCu1P2ohdGQqARjzU8CEuhCM2L PCWxbpzyBGr5hu6klB1ezySlk1k= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id EC939188138; Wed, 12 Jul 2023 19:36:49 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=COUTYsUyLILoRs96NQ5wzPfXSdx/NJTsrx9FChTnJ7A=; b=dDcoDKjOTTKFhFv86Sn6YFpDmhVqRFy0qo0vPivxeHzvBnci3rAm7oWRdJqFBgGA/6EXeL+KjoQ0oJQLPQ+yZzso9qHT5Kzy0dgNE5VQWzOBcQE06PEGH6F1MJGoJ+Ti4SNV/DNdYp6LcEeAFRrPwUBSBQbTuV9vxeVczQylLnc= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 73669188136; Wed, 12 Jul 2023 19:36:48 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:37:31 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 11/12] Staging: rtl8192e: Rename variable pTxTs Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: F8AB6F56-210C-11EE-9782-C65BE52EC81B-45285927!pb-smtp1.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771261262659358855 X-GMAIL-MSGID: 1771261262659358855 Rename variable pTxTs to ptx_ts in order to fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 54 +++++++++++------------ drivers/staging/rtl8192e/rtl819x_TSProc.c | 8 ++-- drivers/staging/rtl8192e/rtllib_tx.c | 18 ++++---- 3 files changed, 40 insertions(+), 40 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index f64534d14104..bb9705222bc7 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -23,10 +23,10 @@ static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *pb del_timer_sync(&pba->timer); } -static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *pTxTs) +static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *ptx_ts) { - struct ba_record *pAdmittedBa = &pTxTs->TxAdmittedBARecord; - struct ba_record *pPendingBa = &pTxTs->TxPendingBARecord; + struct ba_record *padmitted_ba = &ptx_ts->TxAdmittedBARecord; + struct ba_record *pPendingBa = &ptx_ts->TxPendingBARecord; u8 bSendDELBA = false; if (pPendingBa->b_valid) { @@ -34,8 +34,8 @@ static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *pTxTs bSendDELBA = true; } - if (pAdmittedBa->b_valid) { - deactivate_ba_entry(ieee, pAdmittedBa); + if (padmitted_ba->b_valid) { + deactivate_ba_entry(ieee, padmitted_ba); bSendDELBA = true; } return bSendDELBA; @@ -443,20 +443,20 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) RxTsDeleteBA(ieee, pRxTs); } else { - struct tx_ts_record *pTxTs; + struct tx_ts_record *ptx_ts; - if (!GetTs(ieee, (struct ts_common_info **)&pTxTs, dst, + if (!GetTs(ieee, (struct ts_common_info **)&ptx_ts, dst, (u8)pDelBaParamSet->field.tid, TX_DIR, false)) { netdev_warn(ieee->dev, "%s(): can't get TS for TXTS\n", __func__); return -1; } - pTxTs->bUsingBa = false; - pTxTs->bAddBaReqInProgress = false; - pTxTs->bAddBaReqDelayed = false; - del_timer_sync(&pTxTs->TsAddBaTimer); - tx_ts_delete_ba(ieee, pTxTs); + ptx_ts->bUsingBa = false; + ptx_ts->bAddBaReqInProgress = false; + ptx_ts->bAddBaReqDelayed = false; + del_timer_sync(&ptx_ts->TsAddBaTimer); + tx_ts_delete_ba(ieee, ptx_ts); } return 0; } @@ -489,14 +489,14 @@ void ts_init_del_ba(struct rtllib_device *ieee, enum tr_select TxRxSelect) { if (TxRxSelect == TX_DIR) { - struct tx_ts_record *pTxTs = + struct tx_ts_record *ptx_ts = (struct tx_ts_record *)pTsCommonInfo; - if (tx_ts_delete_ba(ieee, pTxTs)) + if (tx_ts_delete_ba(ieee, ptx_ts)) rtllib_send_DELBA(ieee, pTsCommonInfo->Addr, - (pTxTs->TxAdmittedBARecord.b_valid) ? - (&pTxTs->TxAdmittedBARecord) : - (&pTxTs->TxPendingBARecord), + (ptx_ts->TxAdmittedBARecord.b_valid) ? + (&ptx_ts->TxAdmittedBARecord) : + (&ptx_ts->TxPendingBARecord), TxRxSelect, DELBA_REASON_END_BA); } else if (TxRxSelect == RX_DIR) { struct rx_ts_record *pRxTs = @@ -510,23 +510,23 @@ void ts_init_del_ba(struct rtllib_device *ieee, void ba_setup_time_out(struct timer_list *t) { - struct tx_ts_record *pTxTs = from_timer(pTxTs, t, + struct tx_ts_record *ptx_ts = from_timer(ptx_ts, t, TxPendingBARecord.timer); - pTxTs->bAddBaReqInProgress = false; - pTxTs->bAddBaReqDelayed = true; - pTxTs->TxPendingBARecord.b_valid = false; + ptx_ts->bAddBaReqInProgress = false; + ptx_ts->bAddBaReqDelayed = true; + ptx_ts->TxPendingBARecord.b_valid = false; } void tx_ba_inact_timeout(struct timer_list *t) { - struct tx_ts_record *pTxTs = from_timer(pTxTs, t, + struct tx_ts_record *ptx_ts = from_timer(ptx_ts, t, TxAdmittedBARecord.timer); - struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, - TxTsRecord[pTxTs->num]); - tx_ts_delete_ba(ieee, pTxTs); - rtllib_send_DELBA(ieee, pTxTs->TsCommonInfo.Addr, - &pTxTs->TxAdmittedBARecord, TX_DIR, + struct rtllib_device *ieee = container_of(ptx_ts, struct rtllib_device, + TxTsRecord[ptx_ts->num]); + tx_ts_delete_ba(ieee, ptx_ts); + rtllib_send_DELBA(ieee, ptx_ts->TsCommonInfo.Addr, + &ptx_ts->TxAdmittedBARecord, TX_DIR, DELBA_REASON_TIMEOUT); } diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 2f7d5324edb9..35c4083542fc 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -91,12 +91,12 @@ static void RxPktPendingTimeout(struct timer_list *t) static void TsAddBaProcess(struct timer_list *t) { - struct tx_ts_record *pTxTs = from_timer(pTxTs, t, TsAddBaTimer); - u8 num = pTxTs->num; - struct rtllib_device *ieee = container_of(pTxTs, struct rtllib_device, + struct tx_ts_record *ptx_ts = from_timer(ptx_ts, t, TsAddBaTimer); + u8 num = ptx_ts->num; + struct rtllib_device *ieee = container_of(ptx_ts, struct rtllib_device, TxTsRecord[num]); - ts_init_add_ba(ieee, pTxTs, BA_POLICY_IMMEDIATE, false); + ts_init_add_ba(ieee, ptx_ts, BA_POLICY_IMMEDIATE, false); netdev_dbg(ieee->dev, "%s(): ADDBA Req is started\n", __func__); } diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index ec038ef806c3..e43a9b26e01a 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -267,7 +267,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, struct cb_desc *tcb_desc) { struct rt_hi_throughput *ht_info = ieee->ht_info; - struct tx_ts_record *pTxTs = NULL; + struct tx_ts_record *ptx_ts = NULL; struct rtllib_hdr_1addr *hdr = (struct rtllib_hdr_1addr *)skb->data; if (rtllib_act_scanning(ieee, false)) @@ -289,25 +289,25 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) return; if (ht_info->bCurrentAMPDUEnable) { - if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1, + if (!GetTs(ieee, (struct ts_common_info **)(&ptx_ts), hdr->addr1, skb->priority, TX_DIR, true)) { netdev_info(ieee->dev, "%s: can't get TS\n", __func__); return; } - if (!pTxTs->TxAdmittedBARecord.b_valid) { + if (!ptx_ts->TxAdmittedBARecord.b_valid) { if (ieee->wpa_ie_len && (ieee->pairwise_key_type == KEY_TYPE_NA)) { ; } else if (tcb_desc->bdhcp == 1) { ; - } else if (!pTxTs->bDisable_AddBa) { - TsStartAddBaProcess(ieee, pTxTs); + } else if (!ptx_ts->bDisable_AddBa) { + TsStartAddBaProcess(ieee, ptx_ts); } goto FORCED_AGG_SETTING; - } else if (!pTxTs->bUsingBa) { - if (SN_LESS(pTxTs->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num, - (pTxTs->TxCurSeq + 1) % 4096)) - pTxTs->bUsingBa = true; + } else if (!ptx_ts->bUsingBa) { + if (SN_LESS(ptx_ts->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num, + (ptx_ts->TxCurSeq + 1) % 4096)) + ptx_ts->bUsingBa = true; else goto FORCED_AGG_SETTING; } From patchwork Wed Jul 12 23:38:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 119437 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp1488994vqm; Wed, 12 Jul 2023 16:55:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlE7bvTI7C29mW44EViTuKuckjuNPJqQXPKmqrx1SuXZw0aV/M/JL1WFzpyFx1SQAEpLHEze X-Received: by 2002:a17:906:a085:b0:992:6d73:568e with SMTP id q5-20020a170906a08500b009926d73568emr16791937ejy.68.1689206153567; Wed, 12 Jul 2023 16:55:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689206153; cv=none; d=google.com; s=arc-20160816; b=1Aj3ab/ThupndeqbqgEKppX93+H35DPLJr6zxzJKrfU5tBH5ld/TtrLc83/kYnN7oK NZxF2nQqg9UwZCRckrvFOY1sd9kmXU2mnngTFHyQ7Ibj4QBUzxU9V1g80iJnqWIuGnpa 45pVHviHf+nzQBHltZyKHMNvsWALfz94QNT2IE4rDZY1pFb1LwbPpTwn68VlQZCqsaOV wjAbBjaEC57mEhtVAg1Vm+FYXPL2yJnvxtYP7Wptr/8mNiQmyCnth91XioWuNvRcHIZf ds1hGPAbgylpeHIMjFTL71OCuD/N7K9dhrzg8qen39gtxy3H7QxFNbisute1OLAGSUQ/ IQ/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature:dkim-signature; bh=98wRqwu5uG4juutG0f2KayJeFrUbatsg9fm4xLvjhOI=; fh=3jvUQscqe8rwMJMYm8BR5N83dgzqgjDCTpIcxqpBKxM=; b=wl4mDTVhxj+YLefb2vNPrveIQe6EDwhLuxT2J+EQgpU0nkbF+0Zc5n/dEKlariDcBg gTIk7WdRR3+fPEhiG0zuEiA3oYNIcvQnc1ZRaGfnt2d53UiRLhXWuVXf4mlMoDlUuOT0 Otjr2csTbFCD+9y2Y0uRgmkLycQ/M/db2lBSP75HC3YkYw8zSkEEXHFVzZFpPi+EL6Rg lenvGhdSVz74xqa6Ira0gC2YkQc5kqhEjg0r0mOY2ojOGxmVGF7Fr6QudHB4ORIELhoE TQp+W6rZIy8Jwr1u5oc3ociUy9SrDpPfB/RkA2e+8hScXZOdIRS3/dsNI3DhiqsTkXkU 18Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=jnFTyCtD; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=IiRhfhae; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id p24-20020a1709060e9800b00992acf279afsi5339781ejf.928.2023.07.12.16.55.29; Wed, 12 Jul 2023 16:55:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=jnFTyCtD; dkim=temperror (no key for signature) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=IiRhfhae; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233055AbjGLXiC (ORCPT + 99 others); Wed, 12 Jul 2023 19:38:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233269AbjGLXhs (ORCPT ); Wed, 12 Jul 2023 19:37:48 -0400 Received: from pb-smtp21.pobox.com (pb-smtp21.pobox.com [173.228.157.53]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 46F702123 for ; Wed, 12 Jul 2023 16:37:44 -0700 (PDT) Received: from pb-smtp21.pobox.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id A438B36163; Wed, 12 Jul 2023 19:37:43 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=date:from :to:cc:subject:message-id:mime-version:content-type; s=sasl; bh= y9SL3xoxRsp2eOwbXnDO+kFjxFaDKvJEYhk5RH7SnRk=; b=jnFTyCtDyBWvoRN0 weOazzAA/yd0G2jaeQ0Zoai/WMMfP0RWV82Y+DPwqbO2Yd3jFy/sHG1Bu+s5Q/I6 hBN8xp0xdd9MeSDoX9/CUPBSn7BjJoK9QKe9fQaHTX66x1Mqxz2HuV/MrKnzU3YV AbXSUveQWJEUMfk/ZcIszzcyjPY= Received: from pb-smtp21.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp21.pobox.com (Postfix) with ESMTP id 9CC3336162; Wed, 12 Jul 2023 19:37:43 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=date:from:to:cc:subject:message-id:mime-version:content-type; s=2019-09.pbsmtp; bh=y9SL3xoxRsp2eOwbXnDO+kFjxFaDKvJEYhk5RH7SnRk=; b=IiRhfhaeE8ky5Ib2UjEPBENg0mMPKhpabqwqM1MhXPiUXLfHKW/zFHspMM+0KtYd4AmnWAhgQj8/uGFPEYnB0n3cMCELr8oiXLwLz/IAiGtoZHzc1zozAvpp7YVumKhbWKF3TxCwojML10ZyKpkjhx8Z5K/s8DYcUqybJf02OoE= Received: from basil (unknown [76.146.178.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pb-smtp21.pobox.com (Postfix) with ESMTPSA id CD6E73615F; Wed, 12 Jul 2023 19:37:39 -0400 (EDT) (envelope-from tdavies@darkphysics.net) Date: Wed, 12 Jul 2023 16:38:28 -0700 From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: tdavies@darkphysics.net, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 12/12] Staging: rtl8192e: Rename variable TxAdmittedBARecord Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Pobox-Relay-ID: 1706167C-210D-11EE-966E-B31D44D1D7AA-45285927!pb-smtp21.pobox.com X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771261031807565848 X-GMAIL-MSGID: 1771261031807565848 Rename variable TxAdmittedBARecord to tx_admitted_ba_record in order to fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_BAProc.c | 12 ++++++------ drivers/staging/rtl8192e/rtl819x_TS.h | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib_tx.c | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index bb9705222bc7..a58df1d94585 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -25,7 +25,7 @@ static void deactivate_ba_entry(struct rtllib_device *ieee, struct ba_record *pb static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *ptx_ts) { - struct ba_record *padmitted_ba = &ptx_ts->TxAdmittedBARecord; + struct ba_record *padmitted_ba = &ptx_ts->tx_admitted_ba_record; struct ba_record *pPendingBa = &ptx_ts->TxPendingBARecord; u8 bSendDELBA = false; @@ -346,7 +346,7 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, struct sk_buff *skb) pTS->bAddBaReqInProgress = false; pPendingBA = &pTS->TxPendingBARecord; - pAdmittedBA = &pTS->TxAdmittedBARecord; + pAdmittedBA = &pTS->tx_admitted_ba_record; if (pAdmittedBA->b_valid) { netdev_dbg(ieee->dev, "%s(): ADDBA response already admitted\n", @@ -494,8 +494,8 @@ void ts_init_del_ba(struct rtllib_device *ieee, if (tx_ts_delete_ba(ieee, ptx_ts)) rtllib_send_DELBA(ieee, pTsCommonInfo->Addr, - (ptx_ts->TxAdmittedBARecord.b_valid) ? - (&ptx_ts->TxAdmittedBARecord) : + (ptx_ts->tx_admitted_ba_record.b_valid) ? + (&ptx_ts->tx_admitted_ba_record) : (&ptx_ts->TxPendingBARecord), TxRxSelect, DELBA_REASON_END_BA); } else if (TxRxSelect == RX_DIR) { @@ -521,12 +521,12 @@ void ba_setup_time_out(struct timer_list *t) void tx_ba_inact_timeout(struct timer_list *t) { struct tx_ts_record *ptx_ts = from_timer(ptx_ts, t, - TxAdmittedBARecord.timer); + tx_admitted_ba_record.timer); struct rtllib_device *ieee = container_of(ptx_ts, struct rtllib_device, TxTsRecord[ptx_ts->num]); tx_ts_delete_ba(ieee, ptx_ts); rtllib_send_DELBA(ieee, ptx_ts->TsCommonInfo.Addr, - &ptx_ts->TxAdmittedBARecord, TX_DIR, + &ptx_ts->tx_admitted_ba_record, TX_DIR, DELBA_REASON_TIMEOUT); } diff --git a/drivers/staging/rtl8192e/rtl819x_TS.h b/drivers/staging/rtl8192e/rtl819x_TS.h index 37760d0bc35d..653ca479a00c 100644 --- a/drivers/staging/rtl8192e/rtl819x_TS.h +++ b/drivers/staging/rtl8192e/rtl819x_TS.h @@ -32,7 +32,7 @@ struct tx_ts_record { struct ts_common_info TsCommonInfo; u16 TxCurSeq; struct ba_record TxPendingBARecord; - struct ba_record TxAdmittedBARecord; + struct ba_record tx_admitted_ba_record; u8 bAddBaReqInProgress; u8 bAddBaReqDelayed; u8 bUsingBa; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 35c4083542fc..696cc0905546 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -117,7 +117,7 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) pTS->bAddBaReqDelayed = false; pTS->bUsingBa = false; pTS->bDisable_AddBa = false; - ResetBaEntry(&pTS->TxAdmittedBARecord); + ResetBaEntry(&pTS->tx_admitted_ba_record); ResetBaEntry(&pTS->TxPendingBARecord); } @@ -152,7 +152,7 @@ void TSInitialize(struct rtllib_device *ieee) timer_setup(&pTxTS->TxPendingBARecord.timer, ba_setup_time_out, 0); - timer_setup(&pTxTS->TxAdmittedBARecord.timer, + timer_setup(&pTxTS->tx_admitted_ba_record.timer, tx_ba_inact_timeout, 0); ResetTxTsEntry(pTxTS); diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index e43a9b26e01a..dad176b1a211 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -294,7 +294,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, netdev_info(ieee->dev, "%s: can't get TS\n", __func__); return; } - if (!ptx_ts->TxAdmittedBARecord.b_valid) { + if (!ptx_ts->tx_admitted_ba_record.b_valid) { if (ieee->wpa_ie_len && (ieee->pairwise_key_type == KEY_TYPE_NA)) { ; @@ -305,7 +305,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_device *ieee, } goto FORCED_AGG_SETTING; } else if (!ptx_ts->bUsingBa) { - if (SN_LESS(ptx_ts->TxAdmittedBARecord.ba_start_seq_ctrl.field.seq_num, + if (SN_LESS(ptx_ts->tx_admitted_ba_record.ba_start_seq_ctrl.field.seq_num, (ptx_ts->TxCurSeq + 1) % 4096)) ptx_ts->bUsingBa = true; else