Received: by 2002:a05:7412:8d10:b0:f3:1519:9f41 with SMTP id bj16csp2062189rdb; Thu, 7 Dec 2023 17:56:30 -0800 (PST) X-Google-Smtp-Source: AGHT+IFkF9sW9m543Kx7vT6CXLm30tvGzX4X5lYRrTklDNaVyzPY94HuRt7eULdG0Y90G5TfFbEg X-Received: by 2002:a05:6358:9214:b0:170:160f:4400 with SMTP id d20-20020a056358921400b00170160f4400mr4946710rwb.17.1702000590616; Thu, 07 Dec 2023 17:56:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702000590; cv=none; d=google.com; s=arc-20160816; b=ZpjAlBpqxt60eBOVy0jXz8pKnr/gdHjyu6J8JazG/A/hs4z86lt4Nj1mtX59ar60QX FoEsSK25i/30C5zn4FMZFNlA4XUK1O0yx7R47TToLlULqpMfc9Zq9sNAg5fxPfcry8Fh FaYXZhx6jEZKMEj35Ad/xnxkl2C4Ibo33u7Q5pMLrENkOIS0CyY4eUQzg6EQ9hqY/EzT 2QTx/Zuh3YojQmiwGMGB4N1kIfwqEm3YCWpvd9wbdmCBAup9fcnmAePlhCyWrs92LFKr MwLE1nd6+KyjiL5eSF/Y2GQLFk5BEINfzLNv62w6e0JdFIiglmQ4MCbsgRSQheZbPKYY 1f4w== 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 :feedback-id:dkim-signature:dkim-signature; bh=qdU7YaA5F2sl4c6JILBgnoiR/p6RwiGUUhFFxFoXd34=; fh=N6kOWzzoyFx46KhufQEFsHexRnrKpkm1lLeFNNXuCFg=; b=Ds+oLT+XeNZDhnCmS3AdHMHtMVYH3KoQMqfaWLsDvMV4r46I+eUfc0iDoYJCqX6AtL 3suRMYOkL1R6RegGeNzAL1w+ZY3lfl1nFdVzp8tgEiqnhFJYQU7yPKXPz1icpYviynFa on289MI0rqsRXJHF4zMX0sSeN0ziAWcLV3fv78jlSjgkmgYUiBt1p1SK4Cu9Ng9E9cPn Uyp6bQv7o4GzUVMShprrx7NlxG1qYKAB/6P71n331Xhrf7iWKZYD0BgHR22Rh9zwoQwt DvA34aIurxd1b9fObT+EbRspD6DDfBABzmrxm43/cYBiJuQq3CeDWdursg4HvxSx5mfw gu1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@fastmail.org header.s=fm1 header.b=kY4o1Lvd; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=PDbt1lvj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fastmail.org Return-Path: Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id z11-20020aa7888b000000b006ceb1a0fa60si661583pfe.8.2023.12.07.17.56.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 17:56:30 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@fastmail.org header.s=fm1 header.b=kY4o1Lvd; dkim=pass header.i=@messagingengine.com header.s=fm1 header.b=PDbt1lvj; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=fastmail.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 8AB0480909C3; Thu, 7 Dec 2023 17:55:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1572951AbjLHBzO (ORCPT + 99 others); Thu, 7 Dec 2023 20:55:14 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235374AbjLHBzK (ORCPT ); Thu, 7 Dec 2023 20:55:10 -0500 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4741CD5B for ; Thu, 7 Dec 2023 17:55:16 -0800 (PST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id B14515C0203; Thu, 7 Dec 2023 20:55:15 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Thu, 07 Dec 2023 20:55:15 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fastmail.org; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm1; t=1702000515; x= 1702086915; bh=qdU7YaA5F2sl4c6JILBgnoiR/p6RwiGUUhFFxFoXd34=; b=k Y4o1LvdFq7mtMsPHsFEJR2U/mrW2VQ75qCTMrOLCnLaZBCdyWTGWrtAU+BN8EEW8 JwtokYSZrzPVQlHqOJddA1cz9nIwGPVmubta7K36W4HKsg5mhc4Abu5f9qwKFZLu lzXG2CXgz2cC6sUh8RM43itdFPjzb8UtvqOgFOjYOHiXGbo+YLzefe4TnvOeMBWU g71pxYQfEiXVmNSvBH4zcn72+8u1wPiJyrNjJ8gLNg1DMyl2E8wfbAA+QFyOWel2 VDhF62akfzLZfx/FxjoQ1rDrXQiYSwP5bTcOs5yH5CJkLiSquixzzqd2XVYNsW7Q bGNpJxjHPPTgUDUbGo7Zw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; t=1702000515; x= 1702086915; bh=qdU7YaA5F2sl4c6JILBgnoiR/p6RwiGUUhFFxFoXd34=; b=P Dbt1lvjhXQaZN9RS0Rm6H2BObqKTkLHCzoZ8U/kWTZnvagBTGVBTy3Mwyk7jHOkW jAqhR1jJbFXZNdM3lT8Zto3woFNRSYnH1UQuFdkkSotnRM9haOpwbkZnovWOMmBN 0hAL6O4FDpKudUyoY5CnbUMaomGHb7RrtGMOWhgjH1CwX+y6YJ7KDMcdUiup/y0i mhF3U5COwNak6WD746fpiLDN3/ouZiR+xPlx1/794xZfMrxwf7lxZPUMMNlCvfcn phDs3w6KL83BJkwVi/PfWJENh+/V/F0lTGuKMngyO7fHvDA6phfJPGcnH0WgHvNd ilw3CUJiaxlgmwsFaNtaQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudekgedgfeegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefirghrhicutfhoohhkrghrugcuoehgrghrhihrohhokhgr rhgusehfrghsthhmrghilhdrohhrgheqnecuggftrfgrthhtvghrnhepkeeuvdffueduke egieeuffejhefgkeetfeehueelfeduuefgveellefhfefgjedvnecuvehluhhsthgvrhfu ihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepghgrrhihrhhoohhkrghrugesfh grshhtmhgrihhlrdhorhhg X-ME-Proxy: Feedback-ID: ifd194980:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Thu, 7 Dec 2023 20:55:15 -0500 (EST) From: Gary Rookard To: gregkh@linuxfoundation.org, philipp.g.hortmann@gmail.com Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Gary Rookard Subject: [PATCH 1/5] staging: rtl8192e: renamed variable bCurShortGI40MHz Date: Thu, 7 Dec 2023 20:55:32 -0500 Message-ID: <20231208015536.21013-2-garyrookard@fastmail.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231208015536.21013-1-garyrookard@fastmail.org> References: <20231208015536.21013-1-garyrookard@fastmail.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Thu, 07 Dec 2023 17:55:37 -0800 (PST) Coding style issue, checkpatch Avoid CamelCase, rename it. bCurShortGI40MHz -> cur_short_gi_40mhz Signed-off-by: Gary Rookard --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 6 +++--- drivers/staging/rtl8192e/rtllib_tx.c | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c index 39fa5f60db45..f01240f7e514 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1763,7 +1763,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) } ratr_value &= 0x0FFFFFFF; if (ieee->ht_info->cur_tx_bw40mhz && - ieee->ht_info->bCurShortGI40MHz) + ieee->ht_info->cur_short_gi_40mhz) ratr_value |= 0x80000000; else if (!ieee->ht_info->cur_tx_bw40mhz && ieee->ht_info->bCurShortGI20MHz) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 330dafd62656..c73d2ac910d5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -287,7 +287,7 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) if (priv->rtllib->link_state == MAC80211_LINKED) { bshort_gi_enabled = (ht_info->cur_tx_bw40mhz && - ht_info->bCurShortGI40MHz) || + ht_info->cur_short_gi_40mhz) || (!ht_info->cur_tx_bw40mhz && ht_info->bCurShortGI20MHz); diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl8192e/rtl819x_HT.h index 98c1e5840e31..f89b618f71a5 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -97,7 +97,7 @@ struct rt_hi_throughput { u8 reg_bw_40mhz; u8 cur_bw_40mhz; u8 reg_short_gi_40mhz; - u8 bCurShortGI40MHz; + u8 cur_short_gi_40mhz; u8 reg_short_gi_20mhz; u8 bCurShortGI20MHz; u8 reg_supp_cck; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rtl8192e/rtl819x_HTProc.c index a421c56af9e2..f9c76aaf8791 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -109,7 +109,7 @@ static u16 ht_mcs_to_data_rate(struct rtllib_device *ieee, u8 mcs_rate) u8 is40MHz = (ht_info->cur_bw_40mhz) ? 1 : 0; u8 isShortGI = (ht_info->cur_bw_40mhz) ? - ((ht_info->bCurShortGI40MHz) ? 1 : 0) : + ((ht_info->cur_short_gi_40mhz) ? 1 : 0) : ((ht_info->bCurShortGI20MHz) ? 1 : 0); return MCS_DATA_RATE[is40MHz][isShortGI][(mcs_rate & 0x7f)]; } @@ -481,7 +481,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ht_info->bCurShortGI20MHz = ((ht_info->reg_short_gi_20mhz) ? ((pPeerHTCap->ShortGI20Mhz == 1) ? true : false) : false); - ht_info->bCurShortGI40MHz = ((ht_info->reg_short_gi_40mhz) ? + ht_info->cur_short_gi_40mhz = ((ht_info->reg_short_gi_40mhz) ? ((pPeerHTCap->ShortGI40Mhz == 1) ? true : false) : false); @@ -563,7 +563,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) ht_info->cur_tx_bw40mhz = false; ht_info->bCurShortGI20MHz = false; - ht_info->bCurShortGI40MHz = false; + ht_info->cur_short_gi_40mhz = false; ht_info->forced_short_gi = false; ht_info->bCurSuppCCK = true; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192e/rtllib_tx.c index e2dd2772bbeb..041520e6c28d 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -362,7 +362,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee, return; } - if (ht_info->cur_bw_40mhz && ht_info->bCurShortGI40MHz) + if (ht_info->cur_bw_40mhz && ht_info->cur_short_gi_40mhz) tcb_desc->bUseShortGI = true; else if (!ht_info->cur_bw_40mhz && ht_info->bCurShortGI20MHz) tcb_desc->bUseShortGI = true; -- 2.41.0