From patchwork Fri Jul 28 06:19: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: 127368 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp252444vqg; Fri, 28 Jul 2023 00:15:54 -0700 (PDT) X-Google-Smtp-Source: APBJJlGv7zvh0oki1GOO8FzdLZXD+LYvAjKy6yVmO3j7GM/1fsSfTX4SY8yYExuzqn0Q2yoWVtu4 X-Received: by 2002:a05:6a21:47c6:b0:12b:fe14:907e with SMTP id as6-20020a056a2147c600b0012bfe14907emr1045325pzc.20.1690528553789; Fri, 28 Jul 2023 00:15:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690528553; cv=none; d=google.com; s=arc-20160816; b=D0hgMsL4JIiGt9U5YFh47kyDLGkMmPKctoO/VTCgXaZuOTBG2MyaZP7k3Awy01zjTS wubZzo8yV9Cz/pge0+IUDIX9oeTgXD/v4pkpRkxPr6cYxzxK1u4reNA/yyHfcF9uUXtg 1lYVGuAn4oDZ7Dw37ESeRlgIeMWX8tQfYilN03sKTQB3tSKf3BXJd0zkX9jt0K4nSLEo VdsSr/FtY+Qs08SVSTFuhd4W5iGA3nz3vO1HIeBQyVLRKaI6cIoK+pISXZtGdO0rD9wH M4afJrZESPsPqyfi5VDdR6W2SwIZu0wQc57P2cyW2tsvYxgbab5Wvd6komCYvgGxVKgN D1iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=WvQZZRcKrY9s9Lxyt2h80HK3bt+pUGZkezks5DeVgB4=; fh=I5RbcQPTSTvrwt0yqig+bV2C3roPED/NlXe1P2BfE7E=; b=aAKX1JI4R+7nI6A+3FZtvd11dsHyzUfaXevE5LucyPBa0sB/tP58tr+/EAZmKeNcLg pEiAO05g+ofWCk0LXx2zydHIqu0xuu32HgfyOjDot12U1nNU88N6+4uCTWCGZ8KqlsX7 tGpkMRN8xrYoa8vYHaZ3SouFEnCUuQpgZLr2CgNSXGDgQ8/Jasjl2jDd6UCa+CHen4a3 cdXsqy41L1/t/y/1A8VTvwGoOIasulJ5Si7tOy+n/r3ggxtZvf/Moxfe3ak6trL0E7ke 9hlNkR8NpIlqyJCd2NBSow77zJPR0vtw3kNJxCRWF41IvXGKBQ6BUww8laCbyWia+lBZ xACw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=nqJ7r5iG; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=kzBcCHGK; 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 l66-20020a633e45000000b005428f25f67bsi2541334pga.784.2023.07.28.00.15.40; Fri, 28 Jul 2023 00:15: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=nqJ7r5iG; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=kzBcCHGK; 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 S233488AbjG1GTO (ORCPT + 99 others); Fri, 28 Jul 2023 02:19:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233497AbjG1GTK (ORCPT ); Fri, 28 Jul 2023 02:19:10 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E543B3ABD for ; Thu, 27 Jul 2023 23:18:41 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id C7D0B1A8D0D; Fri, 28 Jul 2023 02:18:10 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=6DozYcWGpai+70tN92/WhExeB h8ebB3Bn6oBjVQK1T4=; b=nqJ7r5iGgh1f+ScCotRcI2AYfEH1lDOqAtOR5bvr8 RcFtuVIOd8HhG7hC8GvvOXO2sNK382xruF9HzxuIcwQkx+nLj7LMg3Uv8+bn2P/4 L/8MFdm23+eHd3UZewOCHYz5exSWwoytsWivmSXyjsr8QEyok5+TSylm+tqheJbw 4g= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id C0FD21A8D0C; Fri, 28 Jul 2023 02:18:10 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=2019-09.pbsmtp; bh=gLP+8ekI4uyWYNGCTV5ZuJN04h5oF4Jz1y/73M9N2t4=; b=kzBcCHGK4YMq9dSe3LQ5S2KLPvfpB4WIqKnv5MC+iUlXwoVky5Rb5pwQzF63OCDFrA4zlDCQdCh4FAlpji5qhWpsig3h6ZQwMvHQ0Z9bgChr4r87eqTTd6mMU+TI7sfQSmJI8T3Og+hge18l8C0qegqWY0q9o16sNTC/41TGi3Y= Received: from basil.darkphysics (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 273111A8D08; Fri, 28 Jul 2023 02:18:08 -0400 (EDT) (envelope-from tdavies@darkphysics.net) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH v4 1/5] Staging: rtl8192e: Rename function ActivateBAEntry Date: Thu, 27 Jul 2023 23:19:26 -0700 Message-ID: <20230728061930.624540-2-tdavies@darkphysics.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728061930.624540-1-tdavies@darkphysics.net> References: <20230728061930.624540-1-tdavies@darkphysics.net> MIME-Version: 1.0 X-Pobox-Relay-ID: 8624FAD4-2D0E-11EE-90E5-C65BE52EC81B-45285927!pb-smtp1.pobox.com X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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: 1772647668559890171 X-GMAIL-MSGID: 1772647668559890171 Rename function ActivateBAEntry to activate_ba_entry in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- v4: Resending. git send-email failed to send patch #5. v3: Changed patch #5, Rename global function ResetBaEntry to rtllib_reset_ba_entry v2: Sent to mailing list via git send-email, patches are the same. 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 Fri Jul 28 06:19: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: 127366 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp252110vqg; Fri, 28 Jul 2023 00:15:03 -0700 (PDT) X-Google-Smtp-Source: APBJJlEoqheCvgITObk3S6FoXNOMWqD1+VVyH5RxAguaBOpOCWXV73y0z1JqGkw37+5QtE4HJRm4 X-Received: by 2002:a17:907:2cd5:b0:99b:d440:bf0c with SMTP id hg21-20020a1709072cd500b0099bd440bf0cmr1092593ejc.57.1690528503377; Fri, 28 Jul 2023 00:15:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690528503; cv=none; d=google.com; s=arc-20160816; b=iY9/TcgcGKECS/xenxMxynx3BmNlQ9aauQF9ojKlmFjfNdKTz8UETkaGNCRuiWCCLZ BjAf27iKOT6ZyTzIQa2tP9ObMnX7H0fCOqKYnUd2ic7BMisZPyrpXT2nrJdGzGySiL2k Ned9Hx8l1/hMmNDKcpX75ma6UVaoRjGDE+BVQo/P0qIs01poRKAynGOuoQlUi38ny4nf QJW7TnxD3bNAO3FstX7kQfRrq+61pvO4Rhwlk/h287gVz9SQPEE6nmeezaK4lwVAWb1m 1WmYOm9pw67XpABBgntnemj2AzvOA0Me7Ku+aIMZd1x/LGAcTw69U3xbZYP6Pzlt4GnH d+RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=PjE1aMhnHx2bVNCWbPHu6R6szoWfPfCEn/5RnI00mWg=; fh=I5RbcQPTSTvrwt0yqig+bV2C3roPED/NlXe1P2BfE7E=; b=m1+BEsDHdAlYjdCkukmPHOxlub6Of/YKNm4xVq9Ugc9+Kuj6A2+mgTTUS4dyw8Nxu9 w3MSGDiSRg3iP+wrhDS5JF9ovIV7KdumHkZtxI1EFQTNPa34iZrZiArT3YxxM4bChSXR Vbsi1Xdqt9+bDctPRXXpezydE350sfY+kaOJ5jrk+sS6tWmPP6mzIp2bOpj1stwBzbCT Oy7rCItjl3twDwAKjN8GYATpE7wUzSzGKRMPi0C7h9+BkB5Dp6X0kDHiXWKqWBXesJC8 skpwbNU73CJkBbTLJYnCvUo99yE7JM5sYME4bMrQ0w1Iy6I20S3hLsbXRVVFqaIkH0QU l9SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=cDRh8wIn; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=bse0qP6W; 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 by23-20020a170906a2d700b00993325b159csi2307880ejb.659.2023.07.28.00.14.39; Fri, 28 Jul 2023 00:15: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=cDRh8wIn; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=bse0qP6W; 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 S229949AbjG1GTW (ORCPT + 99 others); Fri, 28 Jul 2023 02:19:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233524AbjG1GTT (ORCPT ); Fri, 28 Jul 2023 02:19:19 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A0958421C for ; Thu, 27 Jul 2023 23:18:47 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id EBBAC1A8D10; Fri, 28 Jul 2023 02:18:12 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=JOkJwPjwlZO67IiYuY88Dz2P3 NwcX7o5HkWjwCQM+bw=; b=cDRh8wInbXbxsPkNT2+mgYztC8Hc6RyO7EaLmMzMp NEbAjtOMetf4kdDxmwlKN/C2yKVtqo004EHslgkwewkn9oYBe2Wcc7CA0OY1VMcQ OVY22E4yVCjq3awjw+nNVdGvbL5grRATiY6APKhrjwU4rBon5Acrh7FWvzai1jpB vU= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id E5AB11A8D0F; Fri, 28 Jul 2023 02:18:12 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=2019-09.pbsmtp; bh=XUtp31xPUR4KlS3n6K/4849ubr4dJYL/+GyX7zOXVr0=; b=bse0qP6WjvU6EmRKjIFolqBTaMUIqlEjhVzlknpWGO6h11zUSXkHcvXvMdiRcSL+01oPeVbn0zibU+jZ7/wDe8+DMLgSqKcGzVJocDfxQ5bWmWiPig0jUCWd9XCHfDyVFyZnJV9+gxHl6HR5Spxqen3hqmpw2dOfAJTrOGHstAc= Received: from basil.darkphysics (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 B72811A8D0B; Fri, 28 Jul 2023 02:18:10 -0400 (EDT) (envelope-from tdavies@darkphysics.net) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH v4 2/5] Staging: rtl8192e: Rename function DeActivateBAEntry Date: Thu, 27 Jul 2023 23:19:27 -0700 Message-ID: <20230728061930.624540-3-tdavies@darkphysics.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728061930.624540-1-tdavies@darkphysics.net> References: <20230728061930.624540-1-tdavies@darkphysics.net> MIME-Version: 1.0 X-Pobox-Relay-ID: 87A3FEF0-2D0E-11EE-8671-C65BE52EC81B-45285927!pb-smtp1.pobox.com X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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: 1772647616244179545 X-GMAIL-MSGID: 1772647616244179545 Rename function DeActivateBAEntry to deactivate_ba_entry in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- v4: Resending. git send-email failed to send patch #5. v3: Changed patch #5, Rename global function ResetBaEntry to rtllib_reset_ba_entry v2: Sent to mailing list via git send-email, patches are the same. 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 Fri Jul 28 06:19: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: 127353 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp241203vqg; Thu, 27 Jul 2023 23:50:17 -0700 (PDT) X-Google-Smtp-Source: APBJJlHxCgWf+U5l88rAP8xqwu95P6kL7P1UWbF8xE51dPuCZUIxI3bG40YJsA1f7ZGdRuMtMPsS X-Received: by 2002:a05:6a00:2449:b0:681:415d:ba2c with SMTP id d9-20020a056a00244900b00681415dba2cmr1245190pfj.31.1690527016908; Thu, 27 Jul 2023 23:50:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690527016; cv=none; d=google.com; s=arc-20160816; b=LqwSqPjpS90you1YDKfgfVRSabzBbZZnKIQu8YfG2s/5AjgpTmy3iE7daX1wYd/G5m jAQFEopcp2oC4fR4QaVsvIBT6fCMfiN7406t3lkMmG0T2jIifJoKBNcHcsIvncxMreim qoQ+rxItaC9+4NByg+EvW6BT0oi4zkjIyW4w7YNihqpDAX1ic2sRFloQe+CHdb1XYUWr YSnWQIC42JldmsvVbJckhChD382h9Phd5xJbwpZ0XuBrhGADvTqRNma+xsNyqoZf0NBC L6NocRRpA59XbcURl4nxa618AvPZfNQqkVVRGx/86dxUBAX4qs19s7QdR2lVfXppZRLf WN3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=ERDv9zZ6doqisqSPy7I+QHyZeImMSBGWAcuH0OyGxoY=; fh=I5RbcQPTSTvrwt0yqig+bV2C3roPED/NlXe1P2BfE7E=; b=clH75yZ1qi4maT4xg/sBYDLX901dxkcwddm7fdbFX5qsVzZlJ75vadAjToTmi9wVUh dbN1N6heoJEghkm/WHH+eeVpvRPPli7n8Np19tjt/tmTShkIqb2OMsPw7KFPiB78MZZP 8YdpwTV+qS0JN5kmLJaZz4ak7cdF2VofgcPDVSrCRlreYRDeTBR9RzXT1lX86/oFGg7V fSDZgECEF7edVIJN1NCd1vAvcEuMK57RJvLDQ0CY4QVhuLsTQ0Rcy/xiudh3r40e7ato Q6MNIrcZfUYzUFmdFg5h4ERcYB/U20eUW57WviPv9B6OYLLc2FMR5V3sbz2V7Dogq+2C e/OA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b="r5wA3wk/"; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="I0qIJ0//"; 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 n25-20020aa79059000000b0067dd7254cb0si2545505pfo.39.2023.07.27.23.50.01; Thu, 27 Jul 2023 23:50:16 -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="r5wA3wk/"; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b="I0qIJ0//"; 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 S233529AbjG1GTY (ORCPT + 99 others); Fri, 28 Jul 2023 02:19:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233508AbjG1GTV (ORCPT ); Fri, 28 Jul 2023 02:19:21 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 413E14227 for ; Thu, 27 Jul 2023 23:18:50 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 6E06B1A8D15; Fri, 28 Jul 2023 02:18:15 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=OiV0njMtvH9qWAdC500rUNA/t fiOlHiTZyJUFPDpZT4=; b=r5wA3wk/UPymoUvFComw7ycJ9OwtKVjBso8lp+MM6 kvsh5Bj87ujlyFawJQyV378/iGdVXF6jRJQK63KCtSuOIOD+CMOa8j4kch17LJJ+ 6+LFuMLRWFqbBYdccOHz51o/fbFPA1COPMaCXbyTxVILhoEKb2DBz+ngus5psSru kg= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 66BFD1A8D14; Fri, 28 Jul 2023 02:18:15 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=2019-09.pbsmtp; bh=f9flxcSu4TBNa6nh5mI3LwHd7NstE09ghZl7BbcmNSE=; b=I0qIJ0//fmeysgWMvoIij2y/Fevl8l+LnwQ/620UiO+SqRBp4ewdJBsub+hIrWgTt1+Do5lQr7YYVlE1GRpn3L2vZPSC1sQ3JnCLhFv1f47fiQccMvaD30tOlFnqSubfLMCshqyp8HAfU+7tch2M/IDRRX9uDwSI2svgkyZhqoo= Received: from basil.darkphysics (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 E128A1A8D0E; Fri, 28 Jul 2023 02:18:12 -0400 (EDT) (envelope-from tdavies@darkphysics.net) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH v4 3/5] Staging: rtl8192e: Rename function TxTsDeleteBA Date: Thu, 27 Jul 2023 23:19:28 -0700 Message-ID: <20230728061930.624540-4-tdavies@darkphysics.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728061930.624540-1-tdavies@darkphysics.net> References: <20230728061930.624540-1-tdavies@darkphysics.net> MIME-Version: 1.0 X-Pobox-Relay-ID: 88E9AEEA-2D0E-11EE-8F68-C65BE52EC81B-45285927!pb-smtp1.pobox.com X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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: 1772646057235057299 X-GMAIL-MSGID: 1772646057235057299 Rename function TxTsDeleteBA to tx_ts_delete_ba in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- v4: Resending. git send-email failed to send patch #5. v3: Changed patch #5, Rename global function ResetBaEntry to rtllib_reset_ba_entry v2: Sent to mailing list via git send-email, patches are the same. 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 Fri Jul 28 06:19:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 127352 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp237247vqg; Thu, 27 Jul 2023 23:40:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlH1K/JbYN42PAMDN2G1RtDqg/FjVWhoo06wvo7//0OpHuol362yjJGPcwh2nwEfF+0eYYin X-Received: by 2002:a05:6e02:148f:b0:346:4f31:f0db with SMTP id n15-20020a056e02148f00b003464f31f0dbmr2634263ilk.26.1690526434808; Thu, 27 Jul 2023 23:40:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690526434; cv=none; d=google.com; s=arc-20160816; b=LDzRYGn+g8GpysL3Rq+HDgXm4Nbe0AcBSS0cJFnaJmVEZukbHFYjXk6vx3DD5EyKCQ hwGIXdQ3lQgbTvVBq6sGtrjhlSNV2u+ewKJFFymgrc0GDJuOB7Dznal+fydAGHVc6Phy prixqFCPyYwmogi0Lh0lwpTJdnvE3MJmm0Y1Sy45beQF0HCYPy401q+3DCFhrtW4ZcAe Hz82YPXeKasWftFerjwHH+D4ukRxpYT5mD304gyXJeR7fYiOWYDxULQsTe1O4JqasVaK drWt7uYCf/IbINnSkxaaqoWUfCNUZecBkXvDTxvxqAaLoBra51zlpFuca6oHlMIoG/+9 SbfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=LJgoJcsYGim7LTkI77pzmFtkjI+VCA85pPdZixqKz+s=; fh=I5RbcQPTSTvrwt0yqig+bV2C3roPED/NlXe1P2BfE7E=; b=pnlhq6WwAeo1mvVtG/fhqHgzGBj/dltHhn6t0zJXWH85FShLq0wnGWVKnOZAiSqzra p5yfcQOSs5Kh/0b8iEtkNizKpMB6MlGxEKNS6d9xQ1Y0ASrUMcsUGySDgnY4C16pxEtu NiobYGpsBIQgx+5zzCv/AiE4eXonG8PIf3LZus+RusySzO/PLjn6vFqwLtRQO0DCx5Mm W+WFo4Qc5D8zsK8aTnuyv/6Qfv7daEUvjHBQw2q06gJyJAugLO0gmxY66KlgBHlUhp6h 8xIGrhY1o1ziS85m5qFqHR6Uk1cZ9rlyqw5Pu9Sc4ULKj/yx08F1jRzvjpgisjcf4HNQ Kepg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=G8Z+ZVVi; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=tLmYe7Q8; 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 ot18-20020a17090b3b5200b0024e37ccb3fesi1346180pjb.68.2023.07.27.23.40.20; Thu, 27 Jul 2023 23:40:34 -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=G8Z+ZVVi; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=tLmYe7Q8; 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 S233551AbjG1GT1 (ORCPT + 99 others); Fri, 28 Jul 2023 02:19:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233523AbjG1GTW (ORCPT ); Fri, 28 Jul 2023 02:19:22 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 13861422A for ; Thu, 27 Jul 2023 23:18:51 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 958371A8D1C; Fri, 28 Jul 2023 02:18:17 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=6wbE+b3eVTEl5JFy1TZ+bCkBE 90FAdLDnnQfs6Ey7sY=; b=G8Z+ZVVij1M3XZ0rIMkK8ocol0o91QC9ML6Z2DLsW XJmQbnZnDb9Tpi6dM2ozGQdbuk8IObeu1F/M2LhUPJifPDSjrtsxLHzwNGZVZBzk a8DRkDLSUcdTKbHHM27cse7RfqSNv3IcGS+lptyu+2anNqBeKg4agQZ4Z+QZJTzt KY= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 8E8B51A8D1A; Fri, 28 Jul 2023 02:18:17 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=2019-09.pbsmtp; bh=KFf1g/fvlcjp5JfdzMMLkzLtnS8FfEMWtEw5UKL5ZrI=; b=tLmYe7Q80PjDg1EUPtwYw/vCj7vUVqbtezwG+ai0jTxZGY8bZZedeNLVwKkHnpY1nvlGQPRBQMvyLqCxa09CO31D8AyJlDJWfWVV8RHp6zncJrOrD3knpomPQhWardEY9NlAos95Q//TiAJFOmE3VF+3/E2j3thVsfDSneCPkDE= Received: from basil.darkphysics (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 593231A8D13; Fri, 28 Jul 2023 02:18:15 -0400 (EDT) (envelope-from tdavies@darkphysics.net) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH v4 4/5] Staging: rtl8192e: Rename function RxTsDeleteBA Date: Thu, 27 Jul 2023 23:19:29 -0700 Message-ID: <20230728061930.624540-5-tdavies@darkphysics.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728061930.624540-1-tdavies@darkphysics.net> References: <20230728061930.624540-1-tdavies@darkphysics.net> MIME-Version: 1.0 X-Pobox-Relay-ID: 8A62E264-2D0E-11EE-9A06-C65BE52EC81B-45285927!pb-smtp1.pobox.com X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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: 1772645446557414769 X-GMAIL-MSGID: 1772645446557414769 Rename function RxTsDeleteBA to rx_ts_delete_ba in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- v4: Resending. git send-email failed to send patch #5. v3: Changed patch #5, Rename global function ResetBaEntry to rtllib_reset_ba_entry v2: Sent to mailing list via git send-email, patches are the same. 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 6538343ea44d..9662d75257ce 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -41,7 +41,7 @@ static u8 tx_ts_delete_ba(struct rtllib_device *ieee, struct tx_ts_record *pTxTs return bSendDELBA; } -static u8 RxTsDeleteBA(struct rtllib_device *ieee, struct rx_ts_record *pRxTs) +static u8 rx_ts_delete_ba(struct rtllib_device *ieee, struct rx_ts_record *pRxTs) { struct ba_record *pBa = &pRxTs->rx_admitted_ba_record; u8 bSendDELBA = false; @@ -441,7 +441,7 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struct sk_buff *skb) return -1; } - RxTsDeleteBA(ieee, pRxTs); + rx_ts_delete_ba(ieee, pRxTs); } else { struct tx_ts_record *pTxTs; @@ -501,7 +501,7 @@ void TsInitDelBA(struct rtllib_device *ieee, } else if (TxRxSelect == RX_DIR) { struct rx_ts_record *pRxTs = (struct rx_ts_record *)pTsCommonInfo; - if (RxTsDeleteBA(ieee, pRxTs)) + if (rx_ts_delete_ba(ieee, pRxTs)) rtllib_send_DELBA(ieee, pTsCommonInfo->Addr, &pRxTs->rx_admitted_ba_record, TxRxSelect, DELBA_REASON_END_BA); @@ -537,7 +537,7 @@ void RxBaInactTimeout(struct timer_list *t) struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device, RxTsRecord[pRxTs->num]); - RxTsDeleteBA(ieee, pRxTs); + rx_ts_delete_ba(ieee, pRxTs); rtllib_send_DELBA(ieee, pRxTs->ts_common_info.Addr, &pRxTs->rx_admitted_ba_record, RX_DIR, DELBA_REASON_TIMEOUT); From patchwork Fri Jul 28 06:19:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 127367 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp252389vqg; Fri, 28 Jul 2023 00:15:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlH54HPPzEz5g8Bf6RffvjuwrOjekz+WbWaPUzIbzZS146PBgHxnwQ8f2tl+/AGAqYTVAVKk X-Received: by 2002:a17:902:f547:b0:1b8:b827:aa8e with SMTP id h7-20020a170902f54700b001b8b827aa8emr655467plf.11.1690528545708; Fri, 28 Jul 2023 00:15:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690528545; cv=none; d=google.com; s=arc-20160816; b=ROgBts0qmQYMs2eDaapQQ7tLsKpBJvhzGuks3v3jgDAosthe4BFblevjXL54WiWL0y oiOqxy9JbwBUcSx+/DFX5ZN8ALbugsIg21XcRFppc9EnPG4hrZqyvGrt0H1WbrqnD7s+ eCc7RvI6vXibROEnT0WjmMnBqS+Y3L4v4WZt/TX3fAchxQi0goayAdE3RcG3BHljxHqq S3+Arv4IL6BaBZrGWIEDenYvxBrEnmh4ukAHl2bfCVW8yMZTxO2kNMIgrks2geYPQcQC ARrDV9sVi6nLDKL6SDH2WDjb0Sywyy/9ItjfpHQfWp0ZN3+nzzpJ3WnwVJc3jm/Mp1d6 /GXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=lwE6eyxOuQbTcbkf9CZdczJFRXAT8z2Pb2RZcKo4+ZI=; fh=I5RbcQPTSTvrwt0yqig+bV2C3roPED/NlXe1P2BfE7E=; b=xVnj/WQLM4IYC8akYY3WFPPfIYseqVNMtz8fq6spi2nDgrZSEz96zDhrybXaJjvSJC RG8fQa+iaePtuk8nsi9WLbzPSPrp+uCvnoEAO0lW5oq9DepCHqmiHQwKr0TvZ2LTQK6q 7OK2yT/n2O9iQ/LgXJiRga73umXzesNnQHBFqpsUGDczFW+nygRqjPT4q+xK5/2j4JP+ UKMMnRs5AT/L8zTTvd8sgcZBCmV75QcSlt3nO/zX/ZU7EQOr0aCVrRaZZ1hvN7InX5os rLpUsq6AKPOE50T5rVEkp7jfqDj82yCSgUJcqI9GrGAUfHRbiED4O1b5tZWWpALUm6C7 kpeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b=r68f4Cic; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=dgksz02m; 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 lc5-20020a170902fa8500b001b9d335175asi2585538plb.292.2023.07.28.00.15.32; Fri, 28 Jul 2023 00:15:45 -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=r68f4Cic; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=dgksz02m; 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 S233475AbjG1GTj (ORCPT + 99 others); Fri, 28 Jul 2023 02:19:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44882 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233572AbjG1GTg (ORCPT ); Fri, 28 Jul 2023 02:19:36 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A9B1913D for ; Thu, 27 Jul 2023 23:19:05 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id BA72E1A8D1E; Fri, 28 Jul 2023 02:18:19 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=pobox.com; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=sasl; bh=COpGeTLjpZ9YKLcwM5ezF6QSu 9d8w3sdre09Itj6Y2Y=; b=r68f4Cic6LstmPCRccPAo+Hj8Eqfrj3JFMmePirWx Ds3mz5ux41g4Q2zIdavE4BbLK2lEJw0VMsSYRPeSjP7Lz1zwGiF8d5SdZtNbKD+K Bmx443sXDPbolAxl9k6Bx0ilqQSFzAOOZwSOMmGJDRmVRtRRAiRbck/NPSAKXmLs Ns= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id B3AB61A8D1D; Fri, 28 Jul 2023 02:18:19 -0400 (EDT) (envelope-from tdavies@darkphysics.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=darkphysics.net; h=from:to:cc:subject:date:message-id:in-reply-to:references:mime-version:content-transfer-encoding; s=2019-09.pbsmtp; bh=iVc9Etj2FqWwWTcqnp+zFzfbRi2T9cIl827B0Z5dMGg=; b=dgksz02m9y7Y9rqDObq2r3oLlMwMrjTN6orr28N2444/+CB0jgMcSEjcqZ7V0XSvCGTEZVyhncP3xqlIaSx1OO+PZiitwJDpanlGSwA9UxW3w755FRvhXUXn412eQw0Pv8JUSdJDBUDIq853eAk6ejThrQEqaPVvx1XwP4v1mnk= Received: from basil.darkphysics (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 825EB1A8D18; Fri, 28 Jul 2023 02:18:17 -0400 (EDT) (envelope-from tdavies@darkphysics.net) From: Tree Davies To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com, anjan@momi.ca, error27@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Tree Davies Subject: [PATCH v4 5/5] Staging: rtl8192e: Rename function ResetBaEntry Date: Thu, 27 Jul 2023 23:19:30 -0700 Message-ID: <20230728061930.624540-6-tdavies@darkphysics.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728061930.624540-1-tdavies@darkphysics.net> References: <20230728061930.624540-1-tdavies@darkphysics.net> MIME-Version: 1.0 X-Pobox-Relay-ID: 8BAB0570-2D0E-11EE-BDB8-C65BE52EC81B-45285927!pb-smtp1.pobox.com X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,NO_DNS_FOR_FROM,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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: 1772647660137638068 X-GMAIL-MSGID: 1772647660137638068 Rename function ResetBaEntry to rtllib_reset_ba_entry in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- v4: Resending. git send-email failed to send patch #5. v3: Changed patch #5, Rename global function ResetBaEntry to rtllib_reset_ba_entry v2: Sent to mailing list via git send-email, patches are the same. drivers/staging/rtl8192e/rtl819x_BAProc.c | 2 +- drivers/staging/rtl8192e/rtl819x_TSProc.c | 6 +++--- drivers/staging/rtl8192e/rtllib.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rtl8192e/rtl819x_BAProc.c index 9662d75257ce..600802c795b9 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -54,7 +54,7 @@ static u8 rx_ts_delete_ba(struct rtllib_device *ieee, struct rx_ts_record *pRxTs return bSendDELBA; } -void ResetBaEntry(struct ba_record *pBA) +void rtllib_reset_ba_entry(struct ba_record *pBA) { pBA->b_valid = false; pBA->ba_param_set.short_data = 0; diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index c61fdf73c572..2779a31457a5 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -117,8 +117,8 @@ static void ResetTxTsEntry(struct tx_ts_record *pTS) pTS->bAddBaReqDelayed = false; pTS->bUsingBa = false; pTS->bDisable_AddBa = false; - ResetBaEntry(&pTS->TxAdmittedBARecord); - ResetBaEntry(&pTS->TxPendingBARecord); + rtllib_reset_ba_entry(&pTS->TxAdmittedBARecord); + rtllib_reset_ba_entry(&pTS->TxPendingBARecord); } static void ResetRxTsEntry(struct rx_ts_record *pTS) @@ -126,7 +126,7 @@ static void ResetRxTsEntry(struct rx_ts_record *pTS) ResetTsCommonInfo(&pTS->ts_common_info); pTS->rx_indicate_seq = 0xffff; pTS->rx_timeout_indicate_seq = 0xffff; - ResetBaEntry(&pTS->rx_admitted_ba_record); + rtllib_reset_ba_entry(&pTS->rx_admitted_ba_record); } void TSInitialize(struct rtllib_device *ieee) diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/rtllib.h index e3ce4431d460..c770ec37aeff 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -2016,7 +2016,7 @@ void TsInitDelBA(struct rtllib_device *ieee, void BaSetupTimeOut(struct timer_list *t); void TxBaInactTimeout(struct timer_list *t); void RxBaInactTimeout(struct timer_list *t); -void ResetBaEntry(struct ba_record *pBA); +void rtllib_reset_ba_entry(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);