From nobody Mon Apr 13 14:28:52 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DE90C433FE for ; Sun, 13 Nov 2022 04:36:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235127AbiKMEgQ (ORCPT ); Sat, 12 Nov 2022 23:36:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234995AbiKMEfq (ORCPT ); Sat, 12 Nov 2022 23:35:46 -0500 Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91D6F12D12 for ; Sat, 12 Nov 2022 20:35:45 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso5550818wmo.1 for ; Sat, 12 Nov 2022 20:35:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=WdNPeBuZne6ZjAt+1em7v+tbiZS7ElWikTlojXTRK9s=; b=lLbSa5IG7gJUk9wcyTNCOHZy18TZHwpmV6jdDz3QM0qco+gFsxnDlPKsa2bh9oe8ft IcYdyXsdtgNeioRuUPQjcsIQTi5jiR8ohmjftLKfI046jKXt9a1lHfpVftQAKPEJGmlq IK884br2bvWb0Rnbzk+nMjvUlBdzBmZ25UtYxXEpSDYYBoJC9KKJ+iJd3KOEoSSBRx/8 EWtOau9DdfMx/NbibpLpCSNJh9szmFRkKX4TzJOy1Wb5nFWYy7Bprj37P8wPtjqJPtOV QssmVT1Dgsn0h2B/jAXSnb5Xi0gy0vLk+k2KdDNYcNdB3H5E+iwFgaNn16PhafrZc1ja JDcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=WdNPeBuZne6ZjAt+1em7v+tbiZS7ElWikTlojXTRK9s=; b=SIgM5Fo4S54l4EZt97CKf/gyDsAYwQMPA4iGX8gL4R+WtSTuSPNUQJ2taXnvoDJPTh FfvkN5xcNkIvcaTD/DQNxcbz7R4HEWFK0mfOkGVpuj/ceYSZqMdqbfnC4N/TTD6S6sum xNRIrCONIgnUiYp7yVGpKdMYbjQwCVTk7TirPw6e33Hac95CX/tgz0W7A0pAJrryLG40 Gh5CGlzVADIMaQZhZ+0qLCn+5W/U9u5z20GPJEfU0QGuExf83l7zzXfvwACLyXTQBKoo XqKbYDdxL15TgwCOG4zpDrwnJmzQ4Z1U+g2pZBv11gTrrFOOBQEo42M6mR8YwFONBEcK FN3Q== X-Gm-Message-State: ANoB5pmAp0dMmxdUfacmlyQAhOY7wnjXvKrYRoU0TB1MMZwkj1+0VCVY LFPPmNylxhDRNdwZdImPmXPQjFD6bpk= X-Google-Smtp-Source: AA0mqf6GgwuJyv2Gj3Vagw1EMhbwUk5AbeRtmvx+pSiIFQB1cQRvkiZW6n1ExE0/+tHpz/WWceu9/A== X-Received: by 2002:a1c:f714:0:b0:3cf:6a66:e324 with SMTP id v20-20020a1cf714000000b003cf6a66e324mr4900638wmh.158.1668314145111; Sat, 12 Nov 2022 20:35:45 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id t7-20020adff047000000b0022e57e66824sm6948774wro.99.2022.11.12.20.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:35:44 -0800 (PST) Date: Sun, 13 Nov 2022 05:35:43 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Rename RFInProgres.., bEnableHT and RegChannelPlan Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable RFInProgressTimeOut to rf_in_progress_timeout, bEnableHT to enable_ht and RegChannelPlan to reg_chnl_plan to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 ++++++------ drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib_softmac.c | 14 +++++++------- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- drivers/staging/rtl8192e/rtllib_tx.c | 8 ++++---- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index bbaf20fbfde0..d0ce89837073 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -474,10 +474,10 @@ static void _rtl92e_read_eeprom_info(struct net_devic= e *dev) =20 priv->rf_chip =3D RF_8256; =20 - if (priv->RegChannelPlan =3D=3D 0xf) + if (priv->reg_chnl_plan =3D=3D 0xf) priv->ChannelPlan =3D priv->eeprom_ChannelPlan; else - priv->ChannelPlan =3D priv->RegChannelPlan; + priv->ChannelPlan =3D priv->reg_chnl_plan; =20 if (priv->eeprom_vid =3D=3D 0x1186 && priv->eeprom_did =3D=3D 0x3304) priv->CustomerID =3D RT_CID_DLINK; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 144bc7c9abd5..1bf5e760d87a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -672,9 +672,9 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u= 8 wireless_mode) =20 if ((wireless_mode =3D=3D WIRELESS_MODE_N_24G) || (wireless_mode =3D=3D WIRELESS_MODE_N_5G)) { - priv->rtllib->pHTInfo->bEnableHT =3D 1; + priv->rtllib->pHTInfo->enable_ht =3D 1; } else { - priv->rtllib->pHTInfo->bEnableHT =3D 0; + priv->rtllib->pHTInfo->enable_ht =3D 0; } _rtl92e_refresh_support_rate(priv); } @@ -723,7 +723,7 @@ static int _rtl92e_sta_down(struct net_device *dev, boo= l shutdownrf) { struct r8192_priv *priv =3D rtllib_priv(dev); unsigned long flags =3D 0; - u8 RFInProgressTimeOut =3D 0; + u8 rf_in_progress_timeout =3D 0; =20 if (priv->up =3D=3D 0) return -1; @@ -755,12 +755,12 @@ static int _rtl92e_sta_down(struct net_device *dev, b= ool shutdownrf) spin_lock_irqsave(&priv->rf_ps_lock, flags); while (priv->rf_change_in_progress) { spin_unlock_irqrestore(&priv->rf_ps_lock, flags); - if (RFInProgressTimeOut > 100) { + if (rf_in_progress_timeout > 100) { spin_lock_irqsave(&priv->rf_ps_lock, flags); break; } mdelay(1); - RFInProgressTimeOut++; + rf_in_progress_timeout++; spin_lock_irqsave(&priv->rf_ps_lock, flags); } priv->rf_change_in_progress =3D true; @@ -845,7 +845,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rxringcount =3D MAX_RX_COUNT; priv->irq_enabled =3D 0; priv->chan =3D 1; - priv->RegChannelPlan =3D 0xf; + priv->reg_chnl_plan =3D 0xf; priv->rtllib->mode =3D WIRELESS_MODE_AUTO; priv->rtllib->iw_mode =3D IW_MODE_INFRA; priv->rtllib->bNetPromiscuousMode =3D false; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 1ae3c77e2fef..98c750730f87 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -467,7 +467,7 @@ struct r8192_priv { =20 bool bTXPowerDataReadFromEEPORM; =20 - u16 RegChannelPlan; + u16 reg_chnl_plan; u16 ChannelPlan; u8 bHwRfOffAction; =20 diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 76bc9c5a6d83..22e4f126ed56 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -96,7 +96,7 @@ enum ht_aggre_mode { =20 =20 struct rt_hi_throughput { - u8 bEnableHT; + u8 enable_ht; u8 bCurrentHTSupport; =20 u8 bRegBW40MHz; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 2092ebf717a1..2c4c1cb4cbed 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -690,7 +690,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device= *ieee, struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; u8 bIOTAction =3D 0; =20 - /* unmark bEnableHT flag here is the same reason why unmarked in + /* unmark enable_ht flag here is the same reason why unmarked in * function rtllib_softmac_new_net. WB 2008.09.10 */ if (pNetwork->bssht.bd_support_ht) { @@ -776,7 +776,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) { struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; =20 - if (pHTInfo->bEnableHT) { + if (pHTInfo->enable_ht) { pHTInfo->bCurrentHTSupport =3D true; pHTInfo->bCurSuppCCK =3D pHTInfo->bRegSuppCCK; =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index ee4173a6ade0..ac8132d8c45a 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1179,11 +1179,11 @@ rtllib_association_req(struct rtllib_network *beaco= n, if ((ieee->rtllib_ap_sec_type && (ieee->rtllib_ap_sec_type(ieee) & SEC_ALG_TKIP)) || ieee->bForcedBgMode) { - ieee->pHTInfo->bEnableHT =3D 0; + ieee->pHTInfo->enable_ht =3D 0; ieee->mode =3D WIRELESS_MODE_G; } =20 - if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { + if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) { ht_cap_buf =3D (u8 *)&(ieee->pHTInfo->SelfHTCap); ht_cap_len =3D sizeof(ieee->pHTInfo->SelfHTCap); HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len, @@ -1324,7 +1324,7 @@ rtllib_association_req(struct rtllib_network *beacon, memcpy(tag, osCcxVerNum.Octet, osCcxVerNum.Length); tag +=3D osCcxVerNum.Length; } - if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { + if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) { if (ieee->pHTInfo->ePeerHTSpecVer !=3D HT_SPEC_VER_EWC) { tag =3D skb_put(skb, ht_cap_len); *tag++ =3D MFIE_TYPE_HT_CAP; @@ -1358,7 +1358,7 @@ rtllib_association_req(struct rtllib_network *beacon, rtllib_TURBO_Info(ieee, &tag); } =20 - if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { + if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) { if (ieee->pHTInfo->ePeerHTSpecVer =3D=3D HT_SPEC_VER_EWC) { tag =3D skb_put(skb, ht_cap_len); *tag++ =3D MFIE_TYPE_GENERIC; @@ -1524,14 +1524,14 @@ static void rtllib_associate_complete_wq(void *data) ieee->SetWirelessMode(ieee->dev, IEEE_B); netdev_info(ieee->dev, "Using B rates:%d\n", ieee->rate); } - if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT) { + if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) { netdev_info(ieee->dev, "Successfully associated, ht enabled\n"); HTOnAssocRsp(ieee); } else { netdev_info(ieee->dev, "Successfully associated, ht not enabled(%d, %d)\n", ieee->pHTInfo->bCurrentHTSupport, - ieee->pHTInfo->bEnableHT); + ieee->pHTInfo->enable_ht); memset(ieee->dot11ht_oper_rate_set, 0, 16); } ieee->LinkDetectInfo.SlotNum =3D 2 * (1 + @@ -1684,7 +1684,7 @@ inline void rtllib_softmac_new_net(struct rtllib_devi= ce *ieee, ieee->current_network.ssid, ieee->current_network.channel, ieee->current_network.qos_data.supported, - ieee->pHTInfo->bEnableHT, + ieee->pHTInfo->enable_ht, ieee->current_network.bssht.bd_support_ht, ieee->current_network.mode, ieee->current_network.flags); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index fdf867a5dd7a..7bac30b87c93 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -359,7 +359,7 @@ void rtllib_wx_sync_scan_wq(void *data) if (ieee->ScanOperationBackupHandler) ieee->ScanOperationBackupHandler(ieee->dev, SCAN_OPT_BACKUP); =20 - if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->bEnableHT && + if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht && ieee->pHTInfo->bCurBW40MHz) { b40M =3D 1; chan_offset =3D ieee->pHTInfo->CurSTAExtChnlOffset; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index be3779efcd23..8b01cfe03381 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -273,7 +273,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_devic= e *ieee, if (rtllib_act_scanning(ieee, false)) return; =20 - if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT) + if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht) return; if (!IsQoSDataFrame(skb->data)) return; @@ -354,7 +354,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_dev= ice *ieee, =20 tcb_desc->bUseShortGI =3D false; =20 - if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT) + if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht) return; =20 if (pHTInfo->forced_short_gi) { @@ -375,7 +375,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_de= vice *ieee, =20 tcb_desc->bPacketBW =3D false; =20 - if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT) + if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht) return; =20 if (tcb_desc->bMulticast || tcb_desc->bBroadcast) @@ -438,7 +438,7 @@ static void rtllib_query_protectionmode(struct rtllib_d= evice *ieee, tcb_desc->rts_rate =3D MGN_24M; break; } - if (pHTInfo->bCurrentHTSupport && pHTInfo->bEnableHT) { + if (pHTInfo->bCurrentHTSupport && pHTInfo->enable_ht) { u8 HTOpMode =3D pHTInfo->current_op_mode; =20 if ((pHTInfo->bCurBW40MHz && (HTOpMode =3D=3D 2 || --=20 2.37.3