From patchwork Fri Jul 28 05:47:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 127341 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp234914vqg; Thu, 27 Jul 2023 23:34:44 -0700 (PDT) X-Google-Smtp-Source: APBJJlFbQdtGhXryYrIMfRseWWeu+zaKSyaltHRy1BZBJGD7Y7cUwZv+UwrJjQ0GqAOoLXweNPKa X-Received: by 2002:a17:902:dad2:b0:1b8:9b1b:ae7a with SMTP id q18-20020a170902dad200b001b89b1bae7amr665891plx.34.1690526084280; Thu, 27 Jul 2023 23:34:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690526084; cv=none; d=google.com; s=arc-20160816; b=pD1OW4QjyyOFCNMzZxrAVAGQg16b7iDKauB+PV2gf8+cIWCRLYpBmTcUuL5GT3+yd+ lGuXBw6jTHAnXrQ+BRPq4QyWVpu54VHrhlQC9DgJjXfvrtP+7gCrGCwLfrmkYjIxsum9 57UyaPnV4Eep6KjdZZtZyI7nflQG2hZ08DpqD3jJnz9va6GhchZnhD4sm7gAur1SnlHf 3tlNd6X2oEgM3b4WseSY83P6R0ishOk0m0YeEetqrAJuHrqXC7u+KTP46Pos+zjniW4g nMu7xDlDf8s2Eu/mI4er2VLlzmKr/OFGGHF5Cc/MkZYxEdslzZNX0OrwjFt4Bu2VcWDy 0kaw== 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=DajOpGOfoCF1WMQauzstbM7HhRbE4RgkoMtPqNaqA3A=; fh=I5RbcQPTSTvrwt0yqig+bV2C3roPED/NlXe1P2BfE7E=; b=McpiOhAAYAA0N+A6ofcQfTyhF3Cf2pOamnIcwhyPfi5ayKSoR5x+Z1B4mPwhu5mOD7 KpZgaPiLkIgH4L0U3qG+tNl01uwArly22TfkHNL83HVQrUHfwb7Zgov8TrC7bOOOLQ+V K8D69lKUs9Z+RGG3rWQGQTXApCVuJNzUmLOHtSpAXmPnfmBTCjDxdC3n8It0nouSDZOh ejtkMQN9KwOh2ITyTDhu42RTpdnYT1mHp85BVkWc4s3uiqob4s3Cn6HjzYzIF0aEP5pM sM+fHROdkzKjFKbIwquW3y9E0XNm9RCRsagCy/tJTogYFT+M9tsLS31Ac6LsFDb0LauH Y8Yw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b="f/bsOpeb"; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=hXfqNjm4; 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 k9-20020a170902c40900b001b81e6ce809si2768443plk.5.2023.07.27.23.34.31; Thu, 27 Jul 2023 23:34:44 -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="f/bsOpeb"; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=hXfqNjm4; 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 S229946AbjG1Fq5 (ORCPT + 99 others); Fri, 28 Jul 2023 01:46:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233437AbjG1Fqn (ORCPT ); Fri, 28 Jul 2023 01:46:43 -0400 Received: from pb-smtp1.pobox.com (pb-smtp1.pobox.com [64.147.108.70]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2F8C735B8 for ; Thu, 27 Jul 2023 22:46:23 -0700 (PDT) Received: from pb-smtp1.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 77F451A8A14; Fri, 28 Jul 2023 01:46:22 -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=uWcpY9tEW15/LWTbqHMjYwFOD e7nP5AzxTp2FXkDfu0=; b=f/bsOpebdABaOyooSi5ZRcvdWbU7Ey9QK6YYz9c2E akOfOVCEI+DjHVPJtsGSHzwdnmQBw6lxCn4pIU/B/h6gZh7cBNsh+sHc9Unnf6/o lleaITj4pD86sf15PIGw+bR3h/9PyxMM7vhGFgf2eZr9pfpPYRdccupMds7+ZXTY Hk= Received: from pb-smtp1.nyi.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 6FE891A8A13; Fri, 28 Jul 2023 01:46:22 -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=eK7mYYCfud4wfsG0kxY8/fURuzguYFmTT6xrkDLazyw=; b=hXfqNjm4kNLqPDf0u++NuDz3+BTxRmUU4Sd2eCM/r3n3HY9YW/B1WNPvkbfULVOvM4Gt2DMjoHFMYz9NKiwFy+K8Tws6vt9MlrVfiwTVbw4EH0wdI1f66cZVVBXVuCB2OU0KrPBUvMQw1yxNpU0tJ0nj4QqdLLL5OHlzRnvTxe8= 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 445DB1A8A0D; Fri, 28 Jul 2023 01:46:20 -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 v3 2/5] Staging: rtl8192e: Rename function DeActivateBAEntry Date: Thu, 27 Jul 2023 22:47:39 -0700 Message-ID: <20230728054742.622297-3-tdavies@darkphysics.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230728054742.622297-1-tdavies@darkphysics.net> References: <20230728054742.622297-1-tdavies@darkphysics.net> MIME-Version: 1.0 X-Pobox-Relay-ID: 14E37A7A-2D0A-11EE-95FF-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: 1772645079292239787 X-GMAIL-MSGID: 1772645079292239787 Rename function DeActivateBAEntry to deactivate_ba_entry in order to Fix checkpatch warning: Avoid CamelCase Signed-off-by: Tree Davies --- 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;