From patchwork Sat Aug 12 20:16:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tree Davies X-Patchwork-Id: 134961 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b824:0:b0:3f2:4152:657d with SMTP id z4csp1904553vqi; Sat, 12 Aug 2023 14:32:32 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFfn6GQggPh2baVS/bf+1ByixJj4uvKVZN64sJoAgTcBvL9IsrNpNi6k397O3wgZ9wRUWD1 X-Received: by 2002:a17:903:11d1:b0:1bb:d586:d29a with SMTP id q17-20020a17090311d100b001bbd586d29amr10690742plh.34.1691875951728; Sat, 12 Aug 2023 14:32:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691875951; cv=none; d=google.com; s=arc-20160816; b=Ya1jwo9LZVxT31oBjkL9co2i0k3wPpeBlgaAARJt+S0nvH01afTZdNqJ4p+/a6GSuX fuGKH3noxmyn0tY+KVnQYtM38ocBWywfDy2FnizmjG33aRLMG8bO4X+hqjyOCU6rXwfJ Dgdqtj31I9OV+nBps8B4GwwUEUi8gTR4PL5QuCkzJaCIhjABdOWY8CKkoYoISe2I/dVK UlGXnrf6h2fYeLOvHXQwBEPYgqx6XQRSd8PnGCrkkZGlWuGi8hmhl356YpfvGzvfGsPr DR14hykdpASqb2gQpBWGnPuYUtBXRiTNPH821Pki8JGT2+EJ5KtD8kHG7OkJcgABnrUs j/bQ== 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=DIPJARs1DrGwRV2aFgnOZt1mtemypGFMh7TSbwnbyDg=; fh=I5RbcQPTSTvrwt0yqig+bV2C3roPED/NlXe1P2BfE7E=; b=PoEoVsF+YXBKiUisf9BHaHhPgdAM+vOkDnV3r8v+mVTXVMqJzSVFvMbpueFhboYL0u T+AEKY5jO0RpBj/Wg89dikj50PXcSyw7EwC5ruyFmGJ4CIn+PuRu83/UnadjKqE0trBx vHKPQugBuAMZF0r/gQx8B0baRQx0PJmjo271UCwt+0Q2ostNX3N05JDvFlSuMxh0Yqh0 +28BmHwYJVmlsP8jQjrrVckH3iBru5hEtRp/4pi4mquQ/SrnOAcrepOXFqC9HiLdh7/F pap1HVveOTFwgYhVkuGM+e2RKjCreCW8wZlr3WVkUyxmMhpJNaN7sx/5N7+uzBR5+UVT BOJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@pobox.com header.s=sasl header.b="Q/zf3050"; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=cfWjmrTd; 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 j190-20020a6380c7000000b005577ad28a97si5582669pgd.633.2023.08.12.14.32.18; Sat, 12 Aug 2023 14:32:31 -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="Q/zf3050"; dkim=neutral (body hash did not verify) header.i=@darkphysics.net header.s=2019-09.pbsmtp header.b=cfWjmrTd; 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 S231326AbjHLUP3 (ORCPT + 99 others); Sat, 12 Aug 2023 16:15:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231409AbjHLUP0 (ORCPT ); Sat, 12 Aug 2023 16:15:26 -0400 Received: from pb-smtp20.pobox.com (pb-smtp20.pobox.com [173.228.157.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31A9A1732 for ; Sat, 12 Aug 2023 13:15:20 -0700 (PDT) Received: from pb-smtp20.pobox.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id D48891BE9A; Sat, 12 Aug 2023 16:15: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=L0ynV+/O/P8DNs7oaVJa22cif MQ2JHSMMJl7QFT+FOA=; b=Q/zf30500h7OgHg5+AhGbxGfv+iqoKobuUaeGIrL5 NTM8tr1eDQ1/Q8wI5Mn7BxZYsv3v4C012YmUcfZPudSw2VValH7SG7pdiOUlfsXM jq7j2yXzpGcCl1xGQHbYBXhB3VKx+btgVTiqN9bszkZ2ClDxwpnx8T3p5jlcfn5i 2Q= Received: from pb-smtp20.sea.icgroup.com (unknown [127.0.0.1]) by pb-smtp20.pobox.com (Postfix) with ESMTP id CD3781BE99; Sat, 12 Aug 2023 16:15: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=7fRIKL4dtBHmZrSNQprTlvPVhAs8lnxzdECjsTF2G0g=; b=cfWjmrTdaql0/ESoNzP9hbeCCpXccJVJPr1sGKv6N/gcLoAmkzGF/x+zLCD6xlXUcxEXrB1OCnELkE7s4vuKYfUfUJAe0WO8kV9m7FeE/YLeWzT5kOP6/rIbImLxq530TpFYWugtwIDUb3kTt+3MHVKLWrvpXL40GXl09sWHJVw= 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-smtp20.pobox.com (Postfix) with ESMTPSA id 0D58A1BE95; Sat, 12 Aug 2023 16:15: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 06/16] Staging: rtl8192e: Rename variable pRxTs in function RxPktPendingTimeout() Date: Sat, 12 Aug 2023 13:16:52 -0700 Message-ID: <20230812201702.83421-7-tdavies@darkphysics.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230812201702.83421-1-tdavies@darkphysics.net> References: <20230812201702.83421-1-tdavies@darkphysics.net> MIME-Version: 1.0 X-Pobox-Relay-ID: F39BBCCA-394C-11EE-82C8-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,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: 1774060518088610821 X-GMAIL-MSGID: 1774060518088610821 Rename variable pRxTs in function RxPktPendingTimeout() to rx_ts to fix checkpatch warning Avoid CamelCase. Signed-off-by: Tree Davies --- drivers/staging/rtl8192e/rtl819x_TSProc.c | 32 +++++++++++------------ 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rtl8192e/rtl819x_TSProc.c index 24a8b9fc0168..1c78134fc625 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -10,10 +10,10 @@ static void RxPktPendingTimeout(struct timer_list *t) { - struct rx_ts_record *pRxTs = from_timer(pRxTs, t, + struct rx_ts_record *rx_ts = from_timer(rx_ts, t, rx_pkt_pending_timer); - struct rtllib_device *ieee = container_of(pRxTs, struct rtllib_device, - RxTsRecord[pRxTs->num]); + struct rtllib_device *ieee = container_of(rx_ts, struct rtllib_device, + RxTsRecord[rx_ts->num]); struct rx_reorder_entry *pReorderEntry = NULL; @@ -22,24 +22,24 @@ static void RxPktPendingTimeout(struct timer_list *t) bool bPktInBuf = false; spin_lock_irqsave(&(ieee->reorder_spinlock), flags); - if (pRxTs->rx_timeout_indicate_seq != 0xffff) { - while (!list_empty(&pRxTs->rx_pending_pkt_list)) { + if (rx_ts->rx_timeout_indicate_seq != 0xffff) { + while (!list_empty(&rx_ts->rx_pending_pkt_list)) { pReorderEntry = (struct rx_reorder_entry *) - list_entry(pRxTs->rx_pending_pkt_list.prev, + list_entry(rx_ts->rx_pending_pkt_list.prev, struct rx_reorder_entry, List); if (index == 0) - pRxTs->rx_indicate_seq = pReorderEntry->SeqNum; + rx_ts->rx_indicate_seq = pReorderEntry->SeqNum; if (SN_LESS(pReorderEntry->SeqNum, - pRxTs->rx_indicate_seq) || + rx_ts->rx_indicate_seq) || SN_EQUAL(pReorderEntry->SeqNum, - pRxTs->rx_indicate_seq)) { + rx_ts->rx_indicate_seq)) { list_del_init(&pReorderEntry->List); if (SN_EQUAL(pReorderEntry->SeqNum, - pRxTs->rx_indicate_seq)) - pRxTs->rx_indicate_seq = - (pRxTs->rx_indicate_seq + 1) % 4096; + rx_ts->rx_indicate_seq)) + rx_ts->rx_indicate_seq = + (rx_ts->rx_indicate_seq + 1) % 4096; netdev_dbg(ieee->dev, "%s(): Indicate SeqNum: %d\n", @@ -58,7 +58,7 @@ static void RxPktPendingTimeout(struct timer_list *t) } if (index > 0) { - pRxTs->rx_timeout_indicate_seq = 0xffff; + rx_ts->rx_timeout_indicate_seq = 0xffff; if (index > REORDER_WIN_SIZE) { netdev_warn(ieee->dev, @@ -72,9 +72,9 @@ static void RxPktPendingTimeout(struct timer_list *t) bPktInBuf = false; } - if (bPktInBuf && (pRxTs->rx_timeout_indicate_seq == 0xffff)) { - pRxTs->rx_timeout_indicate_seq = pRxTs->rx_indicate_seq; - mod_timer(&pRxTs->rx_pkt_pending_timer, jiffies + + if (bPktInBuf && (rx_ts->rx_timeout_indicate_seq == 0xffff)) { + rx_ts->rx_timeout_indicate_seq = rx_ts->rx_indicate_seq; + mod_timer(&rx_ts->rx_pkt_pending_timer, jiffies + msecs_to_jiffies(ieee->ht_info->rx_reorder_pending_time) ); }