From nobody Mon Apr 13 13:09:55 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 DA452C4332F for ; Sun, 13 Nov 2022 04:35:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234907AbiKMEfE (ORCPT ); Sat, 12 Nov 2022 23:35:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233196AbiKMEe7 (ORCPT ); Sat, 12 Nov 2022 23:34:59 -0500 Received: from mail-wm1-x32d.google.com (mail-wm1-x32d.google.com [IPv6:2a00:1450:4864:20::32d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 624F92708 for ; Sat, 12 Nov 2022 20:34:58 -0800 (PST) Received: by mail-wm1-x32d.google.com with SMTP id v124-20020a1cac82000000b003cf7a4ea2caso8155638wme.5 for ; Sat, 12 Nov 2022 20:34:58 -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=oAWsbWp78QUbwJYkMpafVAHECF2EYb69Stx3JjLvYOQ=; b=nf81Mq/+xahfo8zf8EKAT/QdV1cKt7E9G/tSFG0mJxYlwVnM/wZFBBQwnVLq6kMieL 0sPqFoSbV58vABF7JXnaVlHDZS3ftVA5+aAo/U/KQPdgPtefBPaJPyj+T9VUIMjOiPf3 5LKJuTOFl0YuwJZ1n/9AdK33PUBVyBpIada6he634J+1LrEtb7FhRTlIwtOqd8fB52yl UNXXH1cSLdJ1+06A3dYBDY/QsCKX8GRoDC699jpzUXEtgOUk0EgwWj38YYP11Hmluz98 iYPVCLTg9ciXUdaSSP10yXJ6xFFy8mdzOLBOW242MMkVMMspK75kqI0u8b+M2KYKScbR s/yw== 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=oAWsbWp78QUbwJYkMpafVAHECF2EYb69Stx3JjLvYOQ=; b=RjVlJXeasNw3BrX28FhLFSTnuNDn+Xt8O3rmqWuEpUZW6ML9M9xr/QQ/0DVB4gHAuf NDS6NR8DCIKanjHKWG+ksTXM8ORn7PD7zkokGyBRorlg5ob2re2DTBRN8Vle5VR8+tWm e/MLcok8EQsFpCmpOqzm7wA0dug8tUZwQpMMFy7cYp4klr55hr+jUOC1IolLuLFzsufb RdZsaM6KgGkCC/TTlkGEMFur3QspxeaTggz4C32KfuW8IvSzTwtl3Mvs3IpuCqjXI4g1 1lnJpTkLBJ7aLFP4IBrRkQ97egbOQZUhmrn9sdlox/AKCJCLxskyNKFBtQokTCG5U8lb Hlew== X-Gm-Message-State: ANoB5plEO9796r/k/cAF1T9B5yaRpdPY1XBZWRnpaoYlocehvPgV6kgv id4JFddNWnmPN03MlsvmJNo= X-Google-Smtp-Source: AA0mqf40PHWzizxXwoZEMCCbXgQ0xHjuGvwiTwPZZunfTm9pIwmgo6xca2PBpEyJYKf8xRKMTY46ww== X-Received: by 2002:a7b:cb97:0:b0:3cf:a359:de90 with SMTP id m23-20020a7bcb97000000b003cfa359de90mr4999369wmi.122.1668314096849; Sat, 12 Nov 2022 20:34:56 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id e1-20020adfe381000000b0023662d97130sm5881812wrm.20.2022.11.12.20.34.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:34:56 -0800 (PST) Date: Sun, 13 Nov 2022 05:34:54 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] staging: rtl8192e: Rename bTxDisableRate.., RegMaxLPSAwa.. and bTxUseD.. Message-ID: <092eb2dc73d37daf851ea9ef9cb7e4df6f766845.1668313325.git.philipp.g.hortmann@gmail.com> 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 bTxDisableRateFallBack to tx_dis_rate_fallback, RegMaxLPSAwakeIntvl to reg_max_lps_awake_intvl and bTxUseDriverAssingedRate to tx_use_drv_assinged_rate to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 10 ++++---- drivers/staging/rtl8192e/rtllib_softmac.c | 14 +++++------ drivers/staging/rtl8192e/rtllib_tx.c | 24 +++++++++---------- 7 files changed, 34 insertions(+), 34 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 210b7ecc273a..39aac83d8960 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1136,8 +1136,8 @@ void rtl92e_fill_tx_desc(struct net_device *dev, str= uct tx_desc *pdesc, cb_desc->priority); pdesc->TxFWInfoSize =3D sizeof(struct tx_fwinfo_8190pci); =20 - pdesc->DISFB =3D cb_desc->bTxDisableRateFallBack; - pdesc->USERATE =3D cb_desc->bTxUseDriverAssingedRate; + pdesc->DISFB =3D cb_desc->tx_dis_rate_fallback; + pdesc->USERATE =3D cb_desc->tx_use_drv_assinged_rate; =20 pdesc->FirstSeg =3D 1; pdesc->LastSeg =3D 1; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 213aac943ef7..952fe8d7a7be 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -494,8 +494,8 @@ static void _rtl92e_prepare_beacon(struct tasklet_struc= t *t) tcb_desc->queue_index =3D BEACON_QUEUE; tcb_desc->data_rate =3D 2; tcb_desc->RATRIndex =3D 7; - tcb_desc->bTxDisableRateFallBack =3D 1; - tcb_desc->bTxUseDriverAssingedRate =3D 1; + tcb_desc->tx_dis_rate_fallback =3D 1; + tcb_desc->tx_use_drv_assinged_rate =3D 1; skb_push(pnewskb, priv->rtllib->tx_headroom); =20 pdesc =3D &ring->desc[0]; @@ -822,7 +822,7 @@ static void _rtl92e_init_priv_constant(struct net_devic= e *dev) struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->PowerSaveControl; =20 - pPSC->RegMaxLPSAwakeIntvl =3D 5; + pPSC->reg_max_lps_awake_intvl =3D 5; } =20 static void _rtl92e_init_priv_variable(struct net_device *dev) @@ -1538,8 +1538,8 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *sk= b, struct net_device *dev) } =20 tcb_desc->RATRIndex =3D 7; - tcb_desc->bTxDisableRateFallBack =3D 1; - tcb_desc->bTxUseDriverAssingedRate =3D 1; + tcb_desc->tx_dis_rate_fallback =3D 1; + tcb_desc->tx_use_drv_assinged_rate =3D 1; tcb_desc->bTxEnableFwCalcDur =3D 1; skb_push(skb, priv->rtllib->tx_headroom); ret =3D _rtl92e_tx(dev, skb); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 12eea4fcb9dd..ffef63e8dcae 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -196,7 +196,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net= _device *dev, netdev_info(dev, "%s(): set lps awake interval ! extra is %d\n", __func__, *extra); =20 - pPSC->RegMaxLPSAwakeIntvl =3D *extra; + pPSC->reg_max_lps_awake_intvl =3D *extra; mutex_unlock(&priv->wx_mutex); return 0; } diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 2c0a8d5c8f27..7fad983ad4be 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -91,8 +91,8 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) pHTInfo->self_mimo_ps =3D 3; if (pHTInfo->self_mimo_ps =3D=3D 2) pHTInfo->self_mimo_ps =3D 3; - ieee->bTxDisableRateFallBack =3D 0; - ieee->bTxUseDriverAssingedRate =3D 0; + ieee->tx_dis_rate_fallback =3D 0; + ieee->tx_use_drv_assinged_rate =3D 0; =20 ieee->bTxEnableFwCalcDur =3D 1; =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index e0fa87b12ceb..ca9e016ffa9f 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -126,8 +126,8 @@ struct cb_desc { u8 bFirstSeg:1; u8 bLastSeg:1; u8 bEncrypt:1; - u8 bTxDisableRateFallBack:1; - u8 bTxUseDriverAssingedRate:1; + u8 tx_dis_rate_fallback:1; + u8 tx_use_drv_assinged_rate:1; u8 bHwSec:1; =20 u8 nStuckCount; @@ -1256,7 +1256,7 @@ struct rt_pwr_save_ctrl { =20 bool bLeisurePs; u8 LpsIdleCount; - u8 RegMaxLPSAwakeIntvl; + u8 reg_max_lps_awake_intvl; u8 LPSAwakeIntvl; =20 u32 CurPsLevel; @@ -1441,8 +1441,8 @@ struct rtllib_device { u8 RegHTSuppRateSet[16]; u8 HTCurrentOperaRate; u8 HTHighestOperaRate; - u8 bTxDisableRateFallBack; - u8 bTxUseDriverAssingedRate; + u8 tx_dis_rate_fallback; + u8 tx_use_drv_assinged_rate; u8 bTxEnableFwCalcDur; atomic_t atm_swbw; =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 1253de481805..604d4fd7e2cd 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -220,8 +220,8 @@ inline void softmac_mgmt_xmit(struct sk_buff *skb, stru= ct rtllib_device *ieee) =20 tcb_desc->data_rate =3D MgntQuery_MgntFrameTxRate(ieee); tcb_desc->RATRIndex =3D 7; - tcb_desc->bTxDisableRateFallBack =3D 1; - tcb_desc->bTxUseDriverAssingedRate =3D 1; + tcb_desc->tx_dis_rate_fallback =3D 1; + tcb_desc->tx_use_drv_assinged_rate =3D 1; if (single) { if (ieee->queue_stop) { enqueue_mgmt(ieee, skb); @@ -298,8 +298,8 @@ softmac_ps_mgmt_xmit(struct sk_buff *skb, =20 tcb_desc->data_rate =3D MgntQuery_MgntFrameTxRate(ieee); tcb_desc->RATRIndex =3D 7; - tcb_desc->bTxDisableRateFallBack =3D 1; - tcb_desc->bTxUseDriverAssingedRate =3D 1; + tcb_desc->tx_dis_rate_fallback =3D 1; + tcb_desc->tx_use_drv_assinged_rate =3D 1; if (single) { if (type !=3D RTLLIB_FTYPE_CTL) { header->seq_ctl =3D cpu_to_le16(ieee->seq_ctrl[0] << 4); @@ -1996,12 +1996,12 @@ static short rtllib_sta_ps_sleep(struct rtllib_devi= ce *ieee, u64 *time) =20 if (pPSC->LPSAwakeIntvl =3D=3D 0) pPSC->LPSAwakeIntvl =3D 1; - if (pPSC->RegMaxLPSAwakeIntvl =3D=3D 0) + if (pPSC->reg_max_lps_awake_intvl =3D=3D 0) MaxPeriod =3D 1; - else if (pPSC->RegMaxLPSAwakeIntvl =3D=3D 0xFF) + else if (pPSC->reg_max_lps_awake_intvl =3D=3D 0xFF) MaxPeriod =3D ieee->current_network.dtim_period; else - MaxPeriod =3D pPSC->RegMaxLPSAwakeIntvl; + MaxPeriod =3D pPSC->reg_max_lps_awake_intvl; pPSC->LPSAwakeIntvl =3D (pPSC->LPSAwakeIntvl >=3D MaxPeriod) ? MaxPeriod : (pPSC->LPSAwakeIntvl + 1); diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 101f44129145..be3779efcd23 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -477,13 +477,13 @@ static void rtllib_query_protectionmode(struct rtllib= _device *ieee, static void rtllib_txrate_selectmode(struct rtllib_device *ieee, struct cb_desc *tcb_desc) { - if (ieee->bTxDisableRateFallBack) - tcb_desc->bTxDisableRateFallBack =3D true; + if (ieee->tx_dis_rate_fallback) + tcb_desc->tx_dis_rate_fallback =3D true; =20 - if (ieee->bTxUseDriverAssingedRate) - tcb_desc->bTxUseDriverAssingedRate =3D true; - if (!tcb_desc->bTxDisableRateFallBack || - !tcb_desc->bTxUseDriverAssingedRate) { + if (ieee->tx_use_drv_assinged_rate) + tcb_desc->tx_use_drv_assinged_rate =3D true; + if (!tcb_desc->tx_dis_rate_fallback || + !tcb_desc->tx_use_drv_assinged_rate) { if (ieee->iw_mode =3D=3D IW_MODE_INFRA || ieee->iw_mode =3D=3D IW_MODE_ADHOC) tcb_desc->RATRIndex =3D 0; @@ -886,14 +886,14 @@ static int rtllib_xmit_inter(struct sk_buff *skb, str= uct net_device *dev) HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate =3D MgntQuery_TxRateExcludeCCKRates(ieee); - tcb_desc->bTxDisableRateFallBack =3D false; + tcb_desc->tx_dis_rate_fallback =3D false; } else { tcb_desc->data_rate =3D ieee->basic_rate; - tcb_desc->bTxDisableRateFallBack =3D 1; + tcb_desc->tx_dis_rate_fallback =3D 1; } =20 tcb_desc->RATRIndex =3D 7; - tcb_desc->bTxUseDriverAssingedRate =3D 1; + tcb_desc->tx_use_drv_assinged_rate =3D 1; } else { if (is_multicast_ether_addr(header.addr1)) tcb_desc->bMulticast =3D 1; @@ -910,14 +910,14 @@ static int rtllib_xmit_inter(struct sk_buff *skb, str= uct net_device *dev) HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate =3D MgntQuery_TxRateExcludeCCKRates(ieee); - tcb_desc->bTxDisableRateFallBack =3D false; + tcb_desc->tx_dis_rate_fallback =3D false; } else { tcb_desc->data_rate =3D MGN_1M; - tcb_desc->bTxDisableRateFallBack =3D 1; + tcb_desc->tx_dis_rate_fallback =3D 1; } =20 tcb_desc->RATRIndex =3D 7; - tcb_desc->bTxUseDriverAssingedRate =3D 1; + tcb_desc->tx_use_drv_assinged_rate =3D 1; tcb_desc->bdhcp =3D 1; } =20 --=20 2.37.3 From nobody Mon Apr 13 13:09:55 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 212FFC4332F for ; Sun, 13 Nov 2022 04:35:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235125AbiKMEfe (ORCPT ); Sat, 12 Nov 2022 23:35:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233029AbiKMEfT (ORCPT ); Sat, 12 Nov 2022 23:35:19 -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 8EDAA13CF3 for ; Sat, 12 Nov 2022 20:35:15 -0800 (PST) Received: by mail-wm1-x32b.google.com with SMTP id p13-20020a05600c468d00b003cf8859ed1bso5550501wmo.1 for ; Sat, 12 Nov 2022 20:35:15 -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=2/o6EraAMHRFczQfa/cndaMxG5eJqM4XVYqY/gLHBFE=; b=O0j/ndj4Q6/BRI+wENUeg9dUFH0gzI5urlQjcsjzDPJxheO8771IGfBo1eBFvW+i4R 1JQaeM0Mc4hZ3yX8yLCJ4+s1HPIL3Z1emofsHQtURufs2wHyceL8pfQUhJLnQzp/cpz9 6S60LCJvdIaGCif5eMbSLGlhjxYbhXdAJvNqC81bEgCIiKIWfQIrswcvQjx8wNlAu8is JVA60/N0PvkuOtnafY8ZNIGyQ35W4gN/ttJGYt54k05it5ohHALRJHZqpT30vjJLGJ0y zqsP9Z822qWrfcohaUgo+JJYJuapviax2JoS3nxvqxvEFgYmbx+UwPyJwODHajmApjsw eEKQ== 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=2/o6EraAMHRFczQfa/cndaMxG5eJqM4XVYqY/gLHBFE=; b=nGPOy0teIaTLvliCIyYamu07G5rohGNT76ujMBtSsh09TVZe1X5BHHi7BqnfYpM91y kIGOVTEpGIZ7fwFE2VEsqJodSGkep8lrwLUcotlpfHI6Uonm53EHgEshJ14PiwMz7kG5 udAdoGuRbomy/efeCOYQxATAjL/rYO5zm0/lQTpYRbqTF5QD7XFAjvejY5qj0EJDn7qZ qlWtiYZGxVpoo/Lqu+GRD+yE9dt8XfTSqnB9Z1aeZS6eyguodnbPJ5XmUfKpRVXj2FRD nXzDo93OZmUcKVi42cWTYgn1DYRAIEQBpL3o/Tf1vZAlCHlx8iPuflxKbNbpDTuLofvE lCtg== X-Gm-Message-State: ANoB5pklKSvPHW8azHKzHg+4Vde412ntmUbkS4Y/sZo2cNBlLnDa4K+t 7edPujP67plb8ddyVD+aPGY= X-Google-Smtp-Source: AA0mqf4HwOlEt7Ph+7yaJWMCwU+h25eLl56zG2E48mghbCuCKPuwIG83eLzhOhnanu2uKMq0uGgkbQ== X-Received: by 2002:a05:600c:1c0a:b0:3cf:84e9:e722 with SMTP id j10-20020a05600c1c0a00b003cf84e9e722mr4868314wms.8.1668314114031; Sat, 12 Nov 2022 20:35:14 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id i17-20020adfefd1000000b00236b2804d79sm6047007wrp.2.2022.11.12.20.35.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:35:13 -0800 (PST) Date: Sun, 13 Nov 2022 05:35:12 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Rename Regdot11HTOper.., bSupportM.. and PowerSaveCo.. Message-ID: <1ef7fd22b4a037c4d1f8685065ce7916b6f0930b.1668313325.git.philipp.g.hortmann@gmail.com> 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 Regdot11HTOperationalRateSet to reg_dot11ht_oper_rate_set, bSupportMode to support_mode and PowerSaveControl to pwr_save_ctrl to avoid CamelCase which is not accepted by checkpatch. Fix unnecessary parentheses warning from checkpatch when used with this variables. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 30 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 10 +++---- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 +-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 4 +-- drivers/staging/rtl8192e/rtllib_softmac.c | 10 +++---- 7 files changed, 31 insertions(+), 31 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index 58da2dab55bd..b14497423cbf 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1304,7 +1304,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - (&(priv->rtllib->PowerSaveControl)); + (&priv->rtllib->pwr_save_ctrl); bool bResult =3D true; u8 i =3D 0, QueueID =3D 0; struct rtl8192_tx_ring *ring =3D NULL; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 952fe8d7a7be..16e15b8e1b7a 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -607,13 +607,13 @@ static void _rtl92e_refresh_support_rate(struct r8192= _priv *priv) =20 if (ieee->mode =3D=3D WIRELESS_MODE_N_24G || ieee->mode =3D=3D WIRELESS_MODE_N_5G) { - memcpy(ieee->Regdot11HTOperationalRateSet, + memcpy(ieee->reg_dot11ht_oper_rate_set, ieee->RegHTSuppRateSet, 16); memcpy(ieee->Regdot11TxHTOperationalRateSet, ieee->RegHTSuppRateSet, 16); =20 } else { - memset(ieee->Regdot11HTOperationalRateSet, 0, 16); + memset(ieee->reg_dot11ht_oper_rate_set, 0, 16); } } =20 @@ -642,19 +642,19 @@ static u8 _rtl92e_get_supported_wireless_mode(struct = net_device *dev) void rtl92e_set_wireless_mode(struct net_device *dev, u8 wireless_mode) { struct r8192_priv *priv =3D rtllib_priv(dev); - u8 bSupportMode =3D _rtl92e_get_supported_wireless_mode(dev); + u8 support_mode =3D _rtl92e_get_supported_wireless_mode(dev); =20 if ((wireless_mode =3D=3D WIRELESS_MODE_AUTO) || - ((wireless_mode & bSupportMode) =3D=3D 0)) { - if (bSupportMode & WIRELESS_MODE_N_24G) { + ((wireless_mode & support_mode) =3D=3D 0)) { + if (support_mode & WIRELESS_MODE_N_24G) { wireless_mode =3D WIRELESS_MODE_N_24G; - } else if (bSupportMode & WIRELESS_MODE_N_5G) { + } else if (support_mode & WIRELESS_MODE_N_5G) { wireless_mode =3D WIRELESS_MODE_N_5G; - } else if ((bSupportMode & WIRELESS_MODE_A)) { + } else if ((support_mode & WIRELESS_MODE_A)) { wireless_mode =3D WIRELESS_MODE_A; - } else if ((bSupportMode & WIRELESS_MODE_G)) { + } else if ((support_mode & WIRELESS_MODE_G)) { wireless_mode =3D WIRELESS_MODE_G; - } else if ((bSupportMode & WIRELESS_MODE_B)) { + } else if ((support_mode & WIRELESS_MODE_B)) { wireless_mode =3D WIRELESS_MODE_B; } else { netdev_info(dev, @@ -683,7 +683,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool = is_silent_reset) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl); bool init_status; =20 priv->bdisable_nic =3D false; @@ -820,7 +820,7 @@ static void _rtl92e_init_priv_constant(struct net_devic= e *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - &priv->rtllib->PowerSaveControl; + &priv->rtllib->pwr_save_ctrl; =20 pPSC->reg_max_lps_awake_intvl =3D 5; } @@ -877,7 +877,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rf_change_in_progress =3D false; priv->bHwRfOffAction =3D 0; priv->SetRFPowerStateInProgress =3D false; - priv->rtllib->PowerSaveControl.bLeisurePs =3D true; + priv->rtllib->pwr_save_ctrl.bLeisurePs =3D true; priv->rtllib->LPSDelayCnt =3D 0; priv->rtllib->sta_sleep =3D LPS_IS_WAKE; priv->rtllib->rf_power_state =3D rf_on; @@ -1272,7 +1272,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) static u8 check_reset_cnt; unsigned long flags; struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl); bool bBusyTraffic =3D false; bool bHigherBusyTraffic =3D false; bool bHigherBusyRxTraffic =3D false; @@ -1295,7 +1295,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) RTLLIB_NOLINK) && (ieee->rf_power_state =3D=3D rf_on) && !ieee->is_set_key && (!ieee->proto_stoppping) && !ieee->wx_set_enc) { - if ((ieee->PowerSaveControl.ReturnPoint =3D=3D + if ((ieee->pwr_save_ctrl.ReturnPoint =3D=3D IPS_CALLBACK_NONE) && (!ieee->bNetPromiscuousMode)) { rtl92e_ips_enter(dev); @@ -2422,7 +2422,7 @@ bool rtl92e_enable_nic(struct net_device *dev) bool init_status =3D true; struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl); =20 if (!priv->up) { netdev_warn(dev, "%s(): Driver is already down!\n", __func__); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index 1501f7be8eee..8a6b7f58ebfd 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -101,7 +101,7 @@ static void _rtl92e_ps_update_rf_state(struct net_devic= e *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl; =20 pPSC->bSwRfProcessing =3D true; rtl92e_set_rf_state(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS); @@ -113,7 +113,7 @@ void rtl92e_ips_enter(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl; enum rt_rf_power_state rt_state; =20 rt_state =3D priv->rtllib->rf_power_state; @@ -129,7 +129,7 @@ void rtl92e_ips_leave(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl; enum rt_rf_power_state rt_state; =20 rt_state =3D priv->rtllib->rf_power_state; @@ -207,7 +207,7 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl; =20 if (!((priv->rtllib->iw_mode =3D=3D IW_MODE_INFRA) && (priv->rtllib->state =3D=3D RTLLIB_LINKED)) @@ -233,7 +233,7 @@ void rtl92e_leisure_ps_leave(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - &(priv->rtllib->PowerSaveControl); + &priv->rtllib->pwr_save_ctrl; =20 if (pPSC->bLeisurePs) { if (priv->rtllib->ps !=3D RTLLIB_PS_DISABLED) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index ffef63e8dcae..d68f8f5902c8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -160,7 +160,7 @@ static int _rtl92e_wx_adapter_power_status(struct net_d= evice *dev, { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl); struct rtllib_device *ieee =3D priv->rtllib; =20 mutex_lock(&priv->wx_mutex); @@ -189,7 +189,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net= _device *dev, { struct r8192_priv *priv =3D rtllib_priv(dev); struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) - (&priv->rtllib->PowerSaveControl); + (&priv->rtllib->pwr_save_ctrl); =20 mutex_lock(&priv->wx_mutex); =20 diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 7fad983ad4be..52f41562dd82 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -323,7 +323,7 @@ void HTConstructCapabilityElement(struct rtllib_device = *ieee, u8 *posHTCap, pCapELE->MPDUDensity =3D 0; } =20 - memcpy(pCapELE->MCS, ieee->Regdot11HTOperationalRateSet, 16); + memcpy(pCapELE->MCS, ieee->reg_dot11ht_oper_rate_set, 16); memset(&pCapELE->ExtHTCapInfo, 0, 2); memset(pCapELE->TxBFCap, 0, 4); =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index ca9e016ffa9f..d80883b211ce 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1435,7 +1435,7 @@ struct rtllib_device { struct rt_hi_throughput *pHTInfo; =20 spinlock_t reorder_spinlock; - u8 Regdot11HTOperationalRateSet[16]; + u8 reg_dot11ht_oper_rate_set[16]; u8 Regdot11TxHTOperationalRateSet[16]; u8 dot11HTOperationalRateSet[16]; u8 RegHTSuppRateSet[16]; @@ -1645,7 +1645,7 @@ struct rtllib_device { =20 struct rt_link_detect LinkDetectInfo; bool bIsAggregateFrame; - struct rt_pwr_save_ctrl PowerSaveControl; + struct rt_pwr_save_ctrl pwr_save_ctrl; =20 /* used if IEEE_SOFTMAC_TX_QUEUE is set */ struct tx_pending tx_pending; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 604d4fd7e2cd..498febc88b15 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1504,7 +1504,7 @@ static void rtllib_associate_complete_wq(void *data) container_of_work_rsl(data, struct rtllib_device, associate_complete_wq); - struct rt_pwr_save_ctrl *pPSC =3D &(ieee->PowerSaveControl); + struct rt_pwr_save_ctrl *pPSC =3D &ieee->pwr_save_ctrl; =20 netdev_info(ieee->dev, "Associated successfully with %pM\n", ieee->current_network.bssid); @@ -1960,7 +1960,7 @@ static short rtllib_sta_ps_sleep(struct rtllib_device= *ieee, u64 *time) { int timeout; u8 dtim; - struct rt_pwr_save_ctrl *pPSC =3D &(ieee->PowerSaveControl); + struct rt_pwr_save_ctrl *pPSC =3D &ieee->pwr_save_ctrl; =20 if (ieee->LPSDelayCnt) { ieee->LPSDelayCnt--; @@ -2984,9 +2984,9 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->ps =3D RTLLIB_PS_DISABLED; ieee->sta_sleep =3D LPS_IS_WAKE; =20 - ieee->Regdot11HTOperationalRateSet[0] =3D 0xff; - ieee->Regdot11HTOperationalRateSet[1] =3D 0xff; - ieee->Regdot11HTOperationalRateSet[4] =3D 0x01; + ieee->reg_dot11ht_oper_rate_set[0] =3D 0xff; + ieee->reg_dot11ht_oper_rate_set[1] =3D 0xff; + ieee->reg_dot11ht_oper_rate_set[4] =3D 0x01; =20 ieee->Regdot11TxHTOperationalRateSet[0] =3D 0xff; ieee->Regdot11TxHTOperationalRateSet[1] =3D 0xff; --=20 2.37.3 From nobody Mon Apr 13 13:09:55 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 69351C4332F for ; Sun, 13 Nov 2022 04:35:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235131AbiKMEfv (ORCPT ); Sat, 12 Nov 2022 23:35:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235108AbiKMEfd (ORCPT ); Sat, 12 Nov 2022 23:35:33 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0266012D2E for ; Sat, 12 Nov 2022 20:35:31 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id bs21so11619567wrb.4 for ; Sat, 12 Nov 2022 20:35:30 -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=+xSpqv/MkVFvfAJFl0bb4h6TCaeJGIx/kL5+ZcR/XYY=; b=KCHCCF+fs7xSAHId4LUhcGUtbge3q7a3kRbhnRfcT00F36IOJW8a5/VrJ2si8vw/d9 kwEz8zdxD7p49ttNY/gu49Jix1LJyjemTo4iOTDHc0HHh2upleGJL14+1qdLSXg9p4PJ NSOYu/fQLM7VU5f1D1YwTC+yaAvQMWiy8XfALuTp7tdtZdy16r76RgWUsG5y0CaV6XvK Rx6ANOswaqztthW5VthKBbNK0hiouqedAacaqg4rB0vNBRkazmqGK3IEn591q9zuQF9g lX3vN/4Wp0saojKK2VJxH0lSAyZag6HqzwU8o+U8hV3bZPo0nHhqRgnyAkuz4H9aQ3Oo sGRA== 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=+xSpqv/MkVFvfAJFl0bb4h6TCaeJGIx/kL5+ZcR/XYY=; b=CaHb3i4mbrIEaZvzkwDiHLdFY7ImgBUKTfq8W8RtjhCB8TqONRxssKuTEuIhuTtKEH RPr/zcTE28XgnLNx/ahHwsXgKsSZHI3rLMV6shrpnyfYMbMd+Smg1fnK+dyO5fdfQ+sE C9kqwiLIMES4kniLobnPCPj4bJkH2QEMmx2ejPmFbrOuuoo0qKsFKiQGP5fUk9dWOf6h wm6Z+UpVV+ryySpyvGikvnpmCfIY4CI4k8HCE52G2TzBAcKXg81l6u1jBsIPTwux7dXO ORD159a7oYCvTDOHO4PmDmgGA0LmgQqO8lBTVxq67KYI6jBzjOMlhSq8UT6Wr28a+M3N OH8A== X-Gm-Message-State: ANoB5pmjPcq9/d0YhyBPWHUVMeYWs0SNVywBlzMopc8rWvyAV+bYOvrw bPr+ij960/Bs90ufik++oHb7sZDPRnM= X-Google-Smtp-Source: AA0mqf7yfxn2zSlaA4ryJjS6to7i+1FvQKyp0PZ4KbD8a5QuLOpEA6hIR4tP04xu27gaH5KebROWRQ== X-Received: by 2002:a5d:4144:0:b0:236:6f90:3edb with SMTP id c4-20020a5d4144000000b002366f903edbmr4396723wrq.20.1668314129456; Sat, 12 Nov 2022 20:35:29 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id l1-20020a5d6741000000b002365cd93d05sm5768090wrw.102.2022.11.12.20.35.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:35:29 -0800 (PST) Date: Sun, 13 Nov 2022 05:35:27 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Rename Regdot11TxHT.., dot11HTOpera.. and RegHTSuppRa.. Message-ID: <0c87e7ffc94be1c26f6400f5e12419f2df0418a3.1668313325.git.philipp.g.hortmann@gmail.com> 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 Regdot11TxHTOperationalRateSet to reg_dot11tx_ht_oper_rate_set, dot11HTOperationalRateSet to dot11ht_oper_rate_set and RegHTSuppRateSet to reg_ht_supp_rate_set to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 14 +++++++------- drivers/staging/rtl8192e/rtllib.h | 6 +++--- drivers/staging/rtl8192e/rtllib_softmac.c | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 39aac83d8960..bbaf20fbfde0 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1958,7 +1958,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); struct rtllib_device *ieee =3D priv->rtllib; - u8 *pMcsRate =3D ieee->dot11HTOperationalRateSet; + u8 *pMcsRate =3D ieee->dot11ht_oper_rate_set; u32 ratr_value =3D 0; u16 rate_config =3D 0; u8 rate_index =3D 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 16e15b8e1b7a..d5eec6d6b644 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -608,9 +608,9 @@ static void _rtl92e_refresh_support_rate(struct r8192_p= riv *priv) if (ieee->mode =3D=3D WIRELESS_MODE_N_24G || ieee->mode =3D=3D WIRELESS_MODE_N_5G) { memcpy(ieee->reg_dot11ht_oper_rate_set, - ieee->RegHTSuppRateSet, 16); - memcpy(ieee->Regdot11TxHTOperationalRateSet, - ieee->RegHTSuppRateSet, 16); + ieee->reg_ht_supp_rate_set, 16); + memcpy(ieee->reg_dot11tx_ht_oper_rate_set, + ieee->reg_ht_supp_rate_set, 16); =20 } else { memset(ieee->reg_dot11ht_oper_rate_set, 0, 16); diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 52f41562dd82..2092ebf717a1 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -489,7 +489,7 @@ static u8 HTFilterMCSRate(struct rtllib_device *ieee, u= 8 *pSupportMCS, u8 i; =20 for (i =3D 0; i <=3D 15; i++) - pOperateMCS[i] =3D ieee->Regdot11TxHTOperationalRateSet[i] & + pOperateMCS[i] =3D ieee->reg_dot11tx_ht_oper_rate_set[i] & pSupportMCS[i]; =20 HT_PickMCSRate(ieee, pOperateMCS); @@ -604,7 +604,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) =20 HTIOTActDetermineRaFunc(ieee, ((pPeerHTCap->MCS[1]) !=3D 0)); =20 - HTFilterMCSRate(ieee, pPeerHTCap->MCS, ieee->dot11HTOperationalRateSet); + HTFilterMCSRate(ieee, pPeerHTCap->MCS, ieee->dot11ht_oper_rate_set); =20 pHTInfo->peer_mimo_ps =3D pPeerHTCap->MimoPwrSave; if (pHTInfo->peer_mimo_ps =3D=3D MIMO_PS_STATIC) @@ -612,7 +612,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) else pMcsFilter =3D MCS_FILTER_ALL; ieee->HTHighestOperaRate =3D HTGetHighestMCSRate(ieee, - ieee->dot11HTOperationalRateSet, + ieee->dot11ht_oper_rate_set, pMcsFilter); ieee->HTCurrentOperaRate =3D ieee->HTHighestOperaRate; =20 @@ -661,7 +661,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->iot_ra_func =3D 0; =20 { - u8 *RegHTSuppRateSets =3D &ieee->RegHTSuppRateSet[0]; + u8 *RegHTSuppRateSets =3D &ieee->reg_ht_supp_rate_set[0]; =20 RegHTSuppRateSets[0] =3D 0xFF; RegHTSuppRateSets[1] =3D 0xFF; @@ -796,10 +796,10 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) =20 pHTInfo->current_mpdu_density =3D pHTInfo->current_mpdu_density; =20 - HTFilterMCSRate(ieee, ieee->Regdot11TxHTOperationalRateSet, - ieee->dot11HTOperationalRateSet); + HTFilterMCSRate(ieee, ieee->reg_dot11tx_ht_oper_rate_set, + ieee->dot11ht_oper_rate_set); ieee->HTHighestOperaRate =3D HTGetHighestMCSRate(ieee, - ieee->dot11HTOperationalRateSet, + ieee->dot11ht_oper_rate_set, MCS_FILTER_ALL); ieee->HTCurrentOperaRate =3D ieee->HTHighestOperaRate; =20 diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index d80883b211ce..487aa337eafa 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1436,9 +1436,9 @@ struct rtllib_device { =20 spinlock_t reorder_spinlock; u8 reg_dot11ht_oper_rate_set[16]; - u8 Regdot11TxHTOperationalRateSet[16]; - u8 dot11HTOperationalRateSet[16]; - u8 RegHTSuppRateSet[16]; + u8 reg_dot11tx_ht_oper_rate_set[16]; + u8 dot11ht_oper_rate_set[16]; + u8 reg_ht_supp_rate_set[16]; u8 HTCurrentOperaRate; u8 HTHighestOperaRate; u8 tx_dis_rate_fallback; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 498febc88b15..09cc3b3068cc 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1532,7 +1532,7 @@ static void rtllib_associate_complete_wq(void *data) "Successfully associated, ht not enabled(%d, %d)\n", ieee->pHTInfo->bCurrentHTSupport, ieee->pHTInfo->bEnableHT); - memset(ieee->dot11HTOperationalRateSet, 0, 16); + memset(ieee->dot11ht_oper_rate_set, 0, 16); } ieee->LinkDetectInfo.SlotNum =3D 2 * (1 + ieee->current_network.beacon_interval / @@ -1728,7 +1728,7 @@ inline void rtllib_softmac_new_net(struct rtllib_devi= ce *ieee, netdev_info(ieee->dev, "Using B rates\n"); } - memset(ieee->dot11HTOperationalRateSet, 0, 16); + memset(ieee->dot11ht_oper_rate_set, 0, 16); ieee->state =3D RTLLIB_LINKED; } } @@ -2988,9 +2988,9 @@ int rtllib_softmac_init(struct rtllib_device *ieee) ieee->reg_dot11ht_oper_rate_set[1] =3D 0xff; ieee->reg_dot11ht_oper_rate_set[4] =3D 0x01; =20 - ieee->Regdot11TxHTOperationalRateSet[0] =3D 0xff; - ieee->Regdot11TxHTOperationalRateSet[1] =3D 0xff; - ieee->Regdot11TxHTOperationalRateSet[4] =3D 0x01; + ieee->reg_dot11tx_ht_oper_rate_set[0] =3D 0xff; + ieee->reg_dot11tx_ht_oper_rate_set[1] =3D 0xff; + ieee->reg_dot11tx_ht_oper_rate_set[4] =3D 0x01; =20 ieee->FirstIe_InScan =3D false; ieee->actscanning =3D false; --=20 2.37.3 From nobody Mon Apr 13 13:09:55 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 9FC21C4332F for ; Sun, 13 Nov 2022 04:36:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235148AbiKMEf6 (ORCPT ); Sat, 12 Nov 2022 23:35:58 -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 S235040AbiKMEfj (ORCPT ); Sat, 12 Nov 2022 23:35:39 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4572C13CD1 for ; Sat, 12 Nov 2022 20:35:38 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id d9so6928583wrm.13 for ; Sat, 12 Nov 2022 20:35:38 -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=yRX3eE2HdBt1z4bDSGuk1t5Mi99j8zw3bmMFn1kRYTI=; b=o8B9MRnRo0c+D/p5/V2igXjad+/H43wBAqZl4DvpsS1tLELu0k/VZweMBjzyB8cFUS nvFqH2mXgZx90QDm9aAk3HVztOOqQ4UpBCgTZHZKYjpWxQgXcyPJOk8Nwpuj3dzTNq1G mrwW+BxfmQKioNJ4I/oIpFjjt7CPFiNJ0DZ2J5WFmZ81TDqZmbd+KycrfJP3Vy4rd8LQ e0etKRlLGTW/xAMH9zU3UDPMql8TWq4o8mSr09+iwXj8qeCrHTwoN7IlhiOL8hYLQieb 0PLBl+jTF6oQ8E/LaVsUwpPjbBuRKIuVtX+0VuN/d9DS/xm3j6VNQRO6agvpu7IHUcGZ VPzA== 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=yRX3eE2HdBt1z4bDSGuk1t5Mi99j8zw3bmMFn1kRYTI=; b=fJlfUyXkuXqsKmdCiFPYc9rEYkDUZqru7rtvArRut0UA9ZWR47I4/0cDswxIpCy1t+ lLnLkWBBLtZWpG4139di0O87/kyMQ/1M303ucSoDxNwoICvvMpAIv57H71yhwzeuoU36 tFTufZGi+OePVMa2+r/MmM6U3HA9Tq2FjvDbAQarL89qfvwadhbgstNkY9ZpDplZ4Hi+ FvaCQ68sBk7yFGTmPKurBaL04TLufNN0cSkUcnEGXHcgY+tsDwiVEjhUh73uifX5wBxH IZyF2SrfeHbb9VTRuJ+evTc7QwMVP4GpmTCHGkN0UoGwhjJND865FU+xeLxjozBTFX7g swhA== X-Gm-Message-State: ANoB5pk6FSqjQTV3ww2PbD/N7REDsnrVzJHNEq5jyonvAEDcyOi2sTAP pGQ5lMulpobvWv92Wzf0uVM= X-Google-Smtp-Source: AA0mqf6UyJZqxT8k8dUMA4zxqkvN6GbWy+RKukJ8ScYNp+wyVpMwX5ZlqGzBtyCPX2K5S1z42jNfBA== X-Received: by 2002:adf:dcc3:0:b0:235:14dc:5e14 with SMTP id x3-20020adfdcc3000000b0023514dc5e14mr4749909wrm.252.1668314136691; Sat, 12 Nov 2022 20:35:36 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id w12-20020a05600c474c00b003b435c41103sm17880764wmo.0.2022.11.12.20.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:35:36 -0800 (PST) Date: Sun, 13 Nov 2022 05:35:34 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Rename pPSC Message-ID: <47ded8a906e55d6f09b51cd8f2dfb78b7b92c1cc.1668313325.git.philipp.g.hortmann@gmail.com> 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 pPSC to psc to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 14 +++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 32 ++++++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 10 ++--- drivers/staging/rtl8192e/rtllib.h | 10 ++--- drivers/staging/rtl8192e/rtllib_softmac.c | 38 +++++++++---------- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index b14497423cbf..c357adf95a3d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1303,7 +1303,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, enum rt_rf_power_state rf_power_state) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); bool bResult =3D true; u8 i =3D 0, QueueID =3D 0; @@ -1318,7 +1318,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, switch (rf_power_state) { case rf_on: if ((priv->rtllib->rf_power_state =3D=3D rf_off) && - RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) { + RT_IN_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC)) { bool rtstatus; u32 InitilizeCount =3D 3; =20 @@ -1335,7 +1335,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, return false; } =20 - RT_CLEAR_PS_LEVEL(pPSC, + RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); } else { rtl92e_writeb(dev, ANAPAR, 0x37); @@ -1399,11 +1399,11 @@ static bool _rtl92e_set_rf_power_state(struct net_d= evice *dev, break; } =20 - if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && - !RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) { + if (psc->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && + !RT_IN_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC)) { rtl92e_disable_nic(dev); - RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); - } else if (!(pPSC->RegRfPsLevel & + RT_SET_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); + } else if (!(psc->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC)) { rtl92e_set_rf_off(dev); } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index d5eec6d6b644..144bc7c9abd5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -682,7 +682,7 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u= 8 wireless_mode) static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); bool init_status; =20 @@ -700,7 +700,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool = is_silent_reset) return -1; } =20 - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); + RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); priv->bfirst_init =3D false; =20 if (priv->polling_timer_on =3D=3D 0) @@ -819,10 +819,10 @@ static void _rtl92e_init_priv_handler(struct net_devi= ce *dev) static void _rtl92e_init_priv_constant(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; =20 - pPSC->reg_max_lps_awake_intvl =3D 5; + psc->reg_max_lps_awake_intvl =3D 5; } =20 static void _rtl92e_init_priv_variable(struct net_device *dev) @@ -1271,7 +1271,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) enum reset_type ResetType =3D RESET_TYPE_NORESET; static u8 check_reset_cnt; unsigned long flags; - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); bool bBusyTraffic =3D false; bool bHigherBusyTraffic =3D false; @@ -1389,7 +1389,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) =20 spin_lock_irqsave(&priv->tx_lock, flags); if ((check_reset_cnt++ >=3D 3) && (!ieee->is_roaming) && - (!priv->rf_change_in_progress) && (!pPSC->bSwRfProcessing)) { + (!priv->rf_change_in_progress) && (!psc->bSwRfProcessing)) { ResetType =3D _rtl92e_if_check_reset(dev); check_reset_cnt =3D 3; } @@ -2421,7 +2421,7 @@ bool rtl92e_enable_nic(struct net_device *dev) { bool init_status =3D true; struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); =20 if (!priv->up) { @@ -2437,7 +2437,7 @@ bool rtl92e_enable_nic(struct net_device *dev) priv->bdisable_nic =3D false; return false; } - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); + RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); priv->bfirst_init =3D false; =20 rtl92e_irq_enable(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index 8a6b7f58ebfd..ef4f736ce325 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -100,27 +100,27 @@ void rtl92e_enter_sleep(struct net_device *dev, u64 t= ime) static void _rtl92e_ps_update_rf_state(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; =20 - pPSC->bSwRfProcessing =3D true; - rtl92e_set_rf_state(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS); + psc->bSwRfProcessing =3D true; + rtl92e_set_rf_state(dev, psc->eInactivePowerState, RF_CHANGE_BY_IPS); =20 - pPSC->bSwRfProcessing =3D false; + psc->bSwRfProcessing =3D false; } =20 void rtl92e_ips_enter(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; enum rt_rf_power_state rt_state; =20 rt_state =3D priv->rtllib->rf_power_state; - if (rt_state =3D=3D rf_on && !pPSC->bSwRfProcessing && + if (rt_state =3D=3D rf_on && !psc->bSwRfProcessing && (priv->rtllib->state !=3D RTLLIB_LINKED) && (priv->rtllib->iw_mode !=3D IW_MODE_MASTER)) { - pPSC->eInactivePowerState =3D rf_off; + psc->eInactivePowerState =3D rf_off; _rtl92e_ps_update_rf_state(dev); } } @@ -128,14 +128,14 @@ void rtl92e_ips_enter(struct net_device *dev) void rtl92e_ips_leave(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; enum rt_rf_power_state rt_state; =20 rt_state =3D priv->rtllib->rf_power_state; - if (rt_state !=3D rf_on && !pPSC->bSwRfProcessing && + if (rt_state !=3D rf_on && !psc->bSwRfProcessing && priv->rtllib->rf_off_reason <=3D RF_CHANGE_BY_IPS) { - pPSC->eInactivePowerState =3D rf_on; + psc->eInactivePowerState =3D rf_on; _rtl92e_ps_update_rf_state(dev); } } @@ -206,7 +206,7 @@ static bool _rtl92e_ps_set_mode(struct net_device *dev,= u8 rtPsMode) void rtl92e_leisure_ps_enter(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; =20 if (!((priv->rtllib->iw_mode =3D=3D IW_MODE_INFRA) && @@ -215,8 +215,8 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) (priv->rtllib->iw_mode =3D=3D IW_MODE_MASTER)) return; =20 - if (pPSC->bLeisurePs) { - if (pPSC->LpsIdleCount >=3D RT_CHECK_FOR_HANG_PERIOD) { + if (psc->bLeisurePs) { + if (psc->LpsIdleCount >=3D RT_CHECK_FOR_HANG_PERIOD) { =20 if (priv->rtllib->ps =3D=3D RTLLIB_PS_DISABLED) { if (priv->rtllib->SetFwCmdHandler) @@ -225,17 +225,17 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) RTLLIB_PS_UNICAST); } } else - pPSC->LpsIdleCount++; + psc->LpsIdleCount++; } } =20 void rtl92e_leisure_ps_leave(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; =20 - if (pPSC->bLeisurePs) { + if (psc->bLeisurePs) { if (priv->rtllib->ps !=3D RTLLIB_PS_DISABLED) { _rtl92e_ps_set_mode(dev, RTLLIB_PS_DISABLED); if (priv->rtllib->SetFwCmdHandler) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index d68f8f5902c8..b200d53c8e3d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -159,7 +159,7 @@ static int _rtl92e_wx_adapter_power_status(struct net_d= evice *dev, union iwreq_data *wrqu, char *extra) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); struct rtllib_device *ieee =3D priv->rtllib; =20 @@ -167,13 +167,13 @@ static int _rtl92e_wx_adapter_power_status(struct net= _device *dev, =20 if (*extra || priv->force_lps) { priv->ps_force =3D false; - pPSC->bLeisurePs =3D true; + psc->bLeisurePs =3D true; } else { if (priv->rtllib->state =3D=3D RTLLIB_LINKED) rtl92e_leisure_ps_leave(dev); =20 priv->ps_force =3D true; - pPSC->bLeisurePs =3D false; + psc->bLeisurePs =3D false; ieee->ps =3D *extra; } =20 @@ -188,7 +188,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net= _device *dev, char *extra) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); =20 mutex_lock(&priv->wx_mutex); @@ -196,7 +196,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net= _device *dev, netdev_info(dev, "%s(): set lps awake interval ! extra is %d\n", __func__, *extra); =20 - pPSC->reg_max_lps_awake_intvl =3D *extra; + psc->reg_max_lps_awake_intvl =3D *extra; mutex_unlock(&priv->wx_mutex); return 0; } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 487aa337eafa..6b7b2c887c34 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -111,11 +111,11 @@ static inline void *netdev_priv_rsl(struct net_device= *dev) #define SUPPORT_CKIP_MIC 0x08 #define SUPPORT_CKIP_PK 0x10 #define RT_RF_OFF_LEVL_HALT_NIC BIT3 -#define RT_IN_PS_LEVEL(pPSC, _PS_FLAG) \ - ((pPSC->CurPsLevel & _PS_FLAG) ? true : false) -#define RT_CLEAR_PS_LEVEL(pPSC, _PS_FLAG) \ - (pPSC->CurPsLevel &=3D (~(_PS_FLAG))) -#define RT_SET_PS_LEVEL(pPSC, _PS_FLAG) (pPSC->CurPsLevel |=3D _PS_FLAG) +#define RT_IN_PS_LEVEL(psc, _PS_FLAG) \ + ((psc->CurPsLevel & _PS_FLAG) ? true : false) +#define RT_CLEAR_PS_LEVEL(psc, _PS_FLAG) \ + (psc->CurPsLevel &=3D (~(_PS_FLAG))) +#define RT_SET_PS_LEVEL(psc, _PS_FLAG) (psc->CurPsLevel |=3D _PS_FLAG) =20 /* defined for skb cb field */ /* At most 28 byte */ diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 09cc3b3068cc..ee4173a6ade0 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1504,7 +1504,7 @@ static void rtllib_associate_complete_wq(void *data) container_of_work_rsl(data, struct rtllib_device, associate_complete_wq); - struct rt_pwr_save_ctrl *pPSC =3D &ieee->pwr_save_ctrl; + struct rt_pwr_save_ctrl *psc =3D &ieee->pwr_save_ctrl; =20 netdev_info(ieee->dev, "Associated successfully with %pM\n", ieee->current_network.bssid); @@ -1542,7 +1542,7 @@ static void rtllib_associate_complete_wq(void *data) ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D 1; ieee->LinkDetectInfo.NumRecvDataInPeriod =3D 1; } - pPSC->LpsIdleCount =3D 0; + psc->LpsIdleCount =3D 0; ieee->link_change(ieee->dev); =20 if (ieee->is_silent_reset) { @@ -1960,7 +1960,7 @@ static short rtllib_sta_ps_sleep(struct rtllib_device= *ieee, u64 *time) { int timeout; u8 dtim; - struct rt_pwr_save_ctrl *pPSC =3D &ieee->pwr_save_ctrl; + struct rt_pwr_save_ctrl *psc =3D &ieee->pwr_save_ctrl; =20 if (ieee->LPSDelayCnt) { ieee->LPSDelayCnt--; @@ -1990,21 +1990,21 @@ static short rtllib_sta_ps_sleep(struct rtllib_devi= ce *ieee, u64 *time) =20 if (time) { if (ieee->bAwakePktSent) { - pPSC->LPSAwakeIntvl =3D 1; + psc->LPSAwakeIntvl =3D 1; } else { u8 MaxPeriod =3D 1; =20 - if (pPSC->LPSAwakeIntvl =3D=3D 0) - pPSC->LPSAwakeIntvl =3D 1; - if (pPSC->reg_max_lps_awake_intvl =3D=3D 0) + if (psc->LPSAwakeIntvl =3D=3D 0) + psc->LPSAwakeIntvl =3D 1; + if (psc->reg_max_lps_awake_intvl =3D=3D 0) MaxPeriod =3D 1; - else if (pPSC->reg_max_lps_awake_intvl =3D=3D 0xFF) + else if (psc->reg_max_lps_awake_intvl =3D=3D 0xFF) MaxPeriod =3D ieee->current_network.dtim_period; else - MaxPeriod =3D pPSC->reg_max_lps_awake_intvl; - pPSC->LPSAwakeIntvl =3D (pPSC->LPSAwakeIntvl >=3D + MaxPeriod =3D psc->reg_max_lps_awake_intvl; + psc->LPSAwakeIntvl =3D (psc->LPSAwakeIntvl >=3D MaxPeriod) ? MaxPeriod : - (pPSC->LPSAwakeIntvl + 1); + (psc->LPSAwakeIntvl + 1); } { u8 LPSAwakeIntvl_tmp =3D 0; @@ -2012,23 +2012,23 @@ static short rtllib_sta_ps_sleep(struct rtllib_devi= ce *ieee, u64 *time) u8 count =3D ieee->current_network.tim.tim_count; =20 if (count =3D=3D 0) { - if (pPSC->LPSAwakeIntvl > period) + if (psc->LPSAwakeIntvl > period) LPSAwakeIntvl_tmp =3D period + - (pPSC->LPSAwakeIntvl - + (psc->LPSAwakeIntvl - period) - - ((pPSC->LPSAwakeIntvl-period) % + ((psc->LPSAwakeIntvl-period) % period); else - LPSAwakeIntvl_tmp =3D pPSC->LPSAwakeIntvl; + LPSAwakeIntvl_tmp =3D psc->LPSAwakeIntvl; =20 } else { - if (pPSC->LPSAwakeIntvl > + if (psc->LPSAwakeIntvl > ieee->current_network.tim.tim_count) LPSAwakeIntvl_tmp =3D count + - (pPSC->LPSAwakeIntvl - count) - - ((pPSC->LPSAwakeIntvl-count)%period); + (psc->LPSAwakeIntvl - count) - + ((psc->LPSAwakeIntvl-count)%period); else - LPSAwakeIntvl_tmp =3D pPSC->LPSAwakeIntvl; + LPSAwakeIntvl_tmp =3D psc->LPSAwakeIntvl; } =20 *time =3D ieee->current_network.last_dtim_sta_time --=20 2.37.3 From nobody Mon Apr 13 13:09:55 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 From nobody Mon Apr 13 13:09:55 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 5E4CEC4332F for ; Sun, 13 Nov 2022 04:36:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235213AbiKMEgZ (ORCPT ); Sat, 12 Nov 2022 23:36:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37854 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235164AbiKMEfy (ORCPT ); Sat, 12 Nov 2022 23:35:54 -0500 Received: from mail-wr1-x42f.google.com (mail-wr1-x42f.google.com [IPv6:2a00:1450:4864:20::42f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9B5E512D1B for ; Sat, 12 Nov 2022 20:35:52 -0800 (PST) Received: by mail-wr1-x42f.google.com with SMTP id d9so6928952wrm.13 for ; Sat, 12 Nov 2022 20:35:52 -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=5tZwItwL6s7lK3c+/8kCHb4udKHuff6wggT5kROdGK0=; b=PbWShGzBJPGbiRKsvmA0+Of1Q2hjrvNcZtQ9snSBkDjv3sUDgqR76LMQr3OmBfDKqJ miv/z/k4VMST+1xYB/goAtAoBoCsNCRILNbA3ye7MjOepB/ggksGF6JEADBY570MOOd1 JoJMR02Zw27r5qE1znonwRLTOsNFt5AD7geOPudRuC/PA9aoWi05HIi/68qu6IsXReN8 HMoQdWYuLIcZwRhRUIdbet1RDw4gfef1ZxrFYZAFdZNEt8SE8eSBwrEf3GHlq5SZspG1 +mOjCYItnF+hoXz4G25QJ4a7IRAZvEWLULoXOGs9KkkGunGrs3iBWuBLCgFA3dly1Cwm nksg== 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=5tZwItwL6s7lK3c+/8kCHb4udKHuff6wggT5kROdGK0=; b=GVgYLrtYxPUtLmFbcoFevzbSEQvLci4hL7bqippWiZ7c3ToNXqoHj4O/tTALD2JtUG 5ncz0MwJnjfvOfrRI+uUEP3ljXp6C0O1pF5p4guy7Rrq6J8aqG3o2/BBAuNhnP/Ljo6s EBzA8oSsLlRrV/4qBYq1GV25oQRy6kFBvK1nSnyaX9sly90M+LOhFynHfBWIsK4ABra6 YR+mXnUPgYuRF98UwOa+kX4TDAV4sQEAp5OXetMjHlKUnWVMpgEX5l9VQsu++ht/6goK TQkscCyL1E84uCrRPcAQpIoGgyXMoXhkAfPs/zo0YvAq3qoxiaN8EV5bNrc6CxiqAphb 141A== X-Gm-Message-State: ANoB5pnq4tNQtFptlvXqkNcdc+F1fOEVHhzUGl6L2L48EvhMateD78Us 4wgIxsKGAqEp+4jaOIYazTA= X-Google-Smtp-Source: AA0mqf7oX67XqqD1ToukRTizzMIUIX/MbWx1hSLaiCbk6tyoOxcQmTMzenLPcwkCfmASOwn7H9qIog== X-Received: by 2002:a5d:688f:0:b0:236:70ab:52fb with SMTP id h15-20020a5d688f000000b0023670ab52fbmr4555451wru.557.1668314151144; Sat, 12 Nov 2022 20:35:51 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id z8-20020adfec88000000b00236722ebe66sm5967890wrn.75.2022.11.12.20.35.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:35:50 -0800 (PST) Date: Sun, 13 Nov 2022 05:35:49 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] staging: rtl8192e: Rename LinkDetectInfo Message-ID: <48d043893fa755490e810af204e5b7ad2ba606de.1668313325.git.philipp.g.hortmann@gmail.com> 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 LinkDetectInfo to link_detect_info to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 58 ++++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 14 ++--- drivers/staging/rtl8192e/rtllib_softmac.c | 26 ++++----- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 8 +-- 6 files changed, 55 insertions(+), 55 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 1bf5e760d87a..3379b4229a85 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -1250,15 +1250,15 @@ static void _rtl92e_update_rxcounts(struct r8192_pr= iv *priv, u32 *TotalRxBcnNum, *TotalRxBcnNum =3D 0; *TotalRxDataNum =3D 0; =20 - SlotIndex =3D (priv->rtllib->LinkDetectInfo.SlotIndex++) % - (priv->rtllib->LinkDetectInfo.SlotNum); - priv->rtllib->LinkDetectInfo.RxBcnNum[SlotIndex] =3D - priv->rtllib->LinkDetectInfo.NumRecvBcnInPeriod; - priv->rtllib->LinkDetectInfo.RxDataNum[SlotIndex] =3D - priv->rtllib->LinkDetectInfo.NumRecvDataInPeriod; - for (i =3D 0; i < priv->rtllib->LinkDetectInfo.SlotNum; i++) { - *TotalRxBcnNum +=3D priv->rtllib->LinkDetectInfo.RxBcnNum[i]; - *TotalRxDataNum +=3D priv->rtllib->LinkDetectInfo.RxDataNum[i]; + SlotIndex =3D (priv->rtllib->link_detect_info.SlotIndex++) % + (priv->rtllib->link_detect_info.SlotNum); + priv->rtllib->link_detect_info.RxBcnNum[SlotIndex] =3D + priv->rtllib->link_detect_info.NumRecvBcnInPeriod; + priv->rtllib->link_detect_info.RxDataNum[SlotIndex] =3D + priv->rtllib->link_detect_info.NumRecvDataInPeriod; + for (i =3D 0; i < priv->rtllib->link_detect_info.SlotNum; i++) { + *TotalRxBcnNum +=3D priv->rtllib->link_detect_info.RxBcnNum[i]; + *TotalRxDataNum +=3D priv->rtllib->link_detect_info.RxDataNum[i]; } } =20 @@ -1304,22 +1304,22 @@ static void _rtl92e_watchdog_wq_cb(void *data) } if ((ieee->state =3D=3D RTLLIB_LINKED) && (ieee->iw_mode =3D=3D IW_MODE_INFRA) && (!ieee->bNetPromiscuousMode)) { - if (ieee->LinkDetectInfo.NumRxOkInPeriod > 100 || - ieee->LinkDetectInfo.NumTxOkInPeriod > 100) + if (ieee->link_detect_info.NumRxOkInPeriod > 100 || + ieee->link_detect_info.NumTxOkInPeriod > 100) bBusyTraffic =3D true; =20 - if (ieee->LinkDetectInfo.NumRxOkInPeriod > 4000 || - ieee->LinkDetectInfo.NumTxOkInPeriod > 4000) { + if (ieee->link_detect_info.NumRxOkInPeriod > 4000 || + ieee->link_detect_info.NumTxOkInPeriod > 4000) { bHigherBusyTraffic =3D true; - if (ieee->LinkDetectInfo.NumRxOkInPeriod > 5000) + if (ieee->link_detect_info.NumRxOkInPeriod > 5000) bHigherBusyRxTraffic =3D true; else bHigherBusyRxTraffic =3D false; } =20 - if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + - ieee->LinkDetectInfo.NumTxOkInPeriod) > 8) || - (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) + if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + + ieee->link_detect_info.NumTxOkInPeriod) > 8) || + (ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) bEnterPS =3D false; else bEnterPS =3D true; @@ -1336,13 +1336,13 @@ static void _rtl92e_watchdog_wq_cb(void *data) rtl92e_leisure_ps_leave(dev); } =20 - ieee->LinkDetectInfo.NumRxOkInPeriod =3D 0; - ieee->LinkDetectInfo.NumTxOkInPeriod =3D 0; - ieee->LinkDetectInfo.NumRxUnicastOkInPeriod =3D 0; - ieee->LinkDetectInfo.bBusyTraffic =3D bBusyTraffic; + ieee->link_detect_info.NumRxOkInPeriod =3D 0; + ieee->link_detect_info.NumTxOkInPeriod =3D 0; + ieee->link_detect_info.NumRxUnicastOkInPeriod =3D 0; + ieee->link_detect_info.bBusyTraffic =3D bBusyTraffic; =20 - ieee->LinkDetectInfo.bHigherBusyTraffic =3D bHigherBusyTraffic; - ieee->LinkDetectInfo.bHigherBusyRxTraffic =3D bHigherBusyRxTraffic; + ieee->link_detect_info.bHigherBusyTraffic =3D bHigherBusyTraffic; + ieee->link_detect_info.bHigherBusyRxTraffic =3D bHigherBusyRxTraffic; =20 if (ieee->state =3D=3D RTLLIB_LINKED && ieee->iw_mode =3D=3D IW_MODE_INFR= A) { u32 TotalRxBcnNum =3D 0; @@ -1383,8 +1383,8 @@ static void _rtl92e_watchdog_wq_cb(void *data) =20 priv->check_roaming_cnt =3D 0; } - ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D 0; - ieee->LinkDetectInfo.NumRecvDataInPeriod =3D 0; + ieee->link_detect_info.NumRecvBcnInPeriod =3D 0; + ieee->link_detect_info.NumRecvDataInPeriod =3D 0; } =20 spin_lock_irqsave(&priv->tx_lock, flags); @@ -2213,25 +2213,25 @@ static irqreturn_t _rtl92e_irq(int irq, void *netde= v) =20 if (inta & IMR_BKDOK) { priv->stats.txbkokint++; - priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.NumTxOkInPeriod++; _rtl92e_tx_isr(dev, BK_QUEUE); } =20 if (inta & IMR_BEDOK) { priv->stats.txbeokint++; - priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.NumTxOkInPeriod++; _rtl92e_tx_isr(dev, BE_QUEUE); } =20 if (inta & IMR_VIDOK) { priv->stats.txviokint++; - priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.NumTxOkInPeriod++; _rtl92e_tx_isr(dev, VI_QUEUE); } =20 if (inta & IMR_VODOK) { priv->stats.txvookint++; - priv->rtllib->LinkDetectInfo.NumTxOkInPeriod++; + priv->rtllib->link_detect_info.NumTxOkInPeriod++; _rtl92e_tx_isr(dev, VO_QUEUE); } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index b200d53c8e3d..4f16c3d079cc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -393,7 +393,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, rt_state =3D priv->rtllib->rf_power_state; if (!priv->up) return -ENETDOWN; - if (priv->rtllib->LinkDetectInfo.bBusyTraffic =3D=3D true) + if (priv->rtllib->link_detect_info.bBusyTraffic =3D=3D true) return -EAGAIN; =20 if (wrqu->data.flags & IW_SCAN_THIS_ESSID) { diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 6b7b2c887c34..b5313c1ea32d 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1643,7 +1643,7 @@ struct rtllib_device { struct bandwidth_autoswitch bandwidth_auto_switch; bool FwRWRF; =20 - struct rt_link_detect LinkDetectInfo; + struct rt_link_detect link_detect_info; bool bIsAggregateFrame; struct rt_pwr_save_ctrl pwr_save_ctrl; =20 diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 46d75e925ee9..f9a35fcb1d1b 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1211,9 +1211,9 @@ static void rtllib_rx_check_leave_lps(struct rtllib_d= evice *ieee, u8 unicast, if (unicast) { =20 if (ieee->state =3D=3D RTLLIB_LINKED) { - if (((ieee->LinkDetectInfo.NumRxUnicastOkInPeriod + - ieee->LinkDetectInfo.NumTxOkInPeriod) > 8) || - (ieee->LinkDetectInfo.NumRxUnicastOkInPeriod > 2)) { + if (((ieee->link_detect_info.NumRxUnicastOkInPeriod + + ieee->link_detect_info.NumTxOkInPeriod) > 8) || + (ieee->link_detect_info.NumRxUnicastOkInPeriod > 2)) { if (ieee->LeisurePSLeave) ieee->LeisurePSLeave(ieee->dev); } @@ -1355,8 +1355,8 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device = *ieee, struct sk_buff *skb, =20 /* Update statstics for AP roaming */ if (!bToOtherSTA) { - ieee->LinkDetectInfo.NumRecvDataInPeriod++; - ieee->LinkDetectInfo.NumRxOkInPeriod++; + ieee->link_detect_info.NumRecvDataInPeriod++; + ieee->link_detect_info.NumRxOkInPeriod++; } =20 /* Data frame - extract src/dst addresses */ @@ -1437,7 +1437,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device = *ieee, struct sk_buff *skb, else nr_subframes =3D 1; if (unicast) - ieee->LinkDetectInfo.NumRxUnicastOkInPeriod +=3D nr_subframes; + ieee->link_detect_info.NumRxUnicastOkInPeriod +=3D nr_subframes; rtllib_rx_check_leave_lps(ieee, unicast, nr_subframes); } =20 @@ -2620,7 +2620,7 @@ static inline void rtllib_process_probe_response( } if (is_beacon(frame_ctl)) { if (ieee->state >=3D RTLLIB_LINKED) - ieee->LinkDetectInfo.NumRecvBcnInPeriod++; + ieee->link_detect_info.NumRecvBcnInPeriod++; } } list_for_each_entry(target, &ieee->network_list, list) { diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index ac8132d8c45a..1d583e73d753 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1534,13 +1534,13 @@ static void rtllib_associate_complete_wq(void *data) ieee->pHTInfo->enable_ht); memset(ieee->dot11ht_oper_rate_set, 0, 16); } - ieee->LinkDetectInfo.SlotNum =3D 2 * (1 + + ieee->link_detect_info.SlotNum =3D 2 * (1 + ieee->current_network.beacon_interval / 500); - if (ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D=3D 0 || - ieee->LinkDetectInfo.NumRecvDataInPeriod =3D=3D 0) { - ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D 1; - ieee->LinkDetectInfo.NumRecvDataInPeriod =3D 1; + if (ieee->link_detect_info.NumRecvBcnInPeriod =3D=3D 0 || + ieee->link_detect_info.NumRecvDataInPeriod =3D=3D 0) { + ieee->link_detect_info.NumRecvBcnInPeriod =3D 1; + ieee->link_detect_info.NumRecvDataInPeriod =3D 1; } psc->LpsIdleCount =3D 0; ieee->link_change(ieee->dev); @@ -2369,7 +2369,7 @@ rtllib_rx_deauth(struct rtllib_device *ieee, struct s= k_buff *skb) ieee->state =3D RTLLIB_ASSOCIATING; ieee->softmac_stats.reassoc++; ieee->is_roaming =3D true; - ieee->LinkDetectInfo.bBusyTraffic =3D false; + ieee->link_detect_info.bBusyTraffic =3D false; rtllib_disassociate(ieee); RemovePeerTS(ieee, header->addr2); if (ieee->LedControlHandler !=3D NULL) @@ -2963,13 +2963,13 @@ int rtllib_softmac_init(struct rtllib_device *ieee) if (!ieee->dot11d_info) return -ENOMEM; =20 - ieee->LinkDetectInfo.SlotIndex =3D 0; - ieee->LinkDetectInfo.SlotNum =3D 2; - ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D 0; - ieee->LinkDetectInfo.NumRecvDataInPeriod =3D 0; - ieee->LinkDetectInfo.NumTxOkInPeriod =3D 0; - ieee->LinkDetectInfo.NumRxOkInPeriod =3D 0; - ieee->LinkDetectInfo.NumRxUnicastOkInPeriod =3D 0; + ieee->link_detect_info.SlotIndex =3D 0; + ieee->link_detect_info.SlotNum =3D 2; + ieee->link_detect_info.NumRecvBcnInPeriod =3D 0; + ieee->link_detect_info.NumRecvDataInPeriod =3D 0; + ieee->link_detect_info.NumTxOkInPeriod =3D 0; + ieee->link_detect_info.NumRxOkInPeriod =3D 0; + ieee->link_detect_info.NumRxUnicastOkInPeriod =3D 0; ieee->bIsAggregateFrame =3D false; ieee->assoc_id =3D 0; ieee->queue_stop =3D 0; diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index 7bac30b87c93..e02e7d9566b2 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -391,10 +391,10 @@ void rtllib_wx_sync_scan_wq(void *data) /* Notify AP that I wake up again */ rtllib_sta_ps_send_null_frame(ieee, 0); =20 - if (ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D=3D 0 || - ieee->LinkDetectInfo.NumRecvDataInPeriod =3D=3D 0) { - ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D 1; - ieee->LinkDetectInfo.NumRecvDataInPeriod =3D 1; + if (ieee->link_detect_info.NumRecvBcnInPeriod =3D=3D 0 || + ieee->link_detect_info.NumRecvDataInPeriod =3D=3D 0) { + ieee->link_detect_info.NumRecvBcnInPeriod =3D 1; + ieee->link_detect_info.NumRecvDataInPeriod =3D 1; } =20 if (ieee->data_hard_resume) --=20 2.37.3 From nobody Mon Apr 13 13:09:55 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 23D2FC433FE for ; Sun, 13 Nov 2022 04:36:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235159AbiKMEgv (ORCPT ); Sat, 12 Nov 2022 23:36:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37376 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235144AbiKMEgQ (ORCPT ); Sat, 12 Nov 2022 23:36:16 -0500 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5CCA913D4E for ; Sat, 12 Nov 2022 20:35:59 -0800 (PST) Received: by mail-wr1-x434.google.com with SMTP id g12so11599540wrs.10 for ; Sat, 12 Nov 2022 20:35:59 -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=E4lHrdyZ1OUai3OcgSWAkeaePSfKre0ZQFniV/1r+XE=; b=IeXwsq2CEqFze2oocqsQt5ErcQl37/diyh7GaRX1+p86++EAMWrNg0cbJcbRJp0VKb x0M1hHpJE+rvc/rDGluGt1+VK1/EBCCgycJF5XI6f1aS6BONr/n39Gkx4WN4srMzNpD9 a2c16sx34aOi8bUMZy7SeyL8nl4que75etyHdAN/lWX7qUvs+6l05CgBBOoT0jhkMUS4 2S9aFQtWT0KRUWX3ZJnWUH3juaH9w2SEVI1DU3HceflNrZYrD6kBw8xpti1Zahp0pOGf Zj9s2XYlrhwDYkXvXPx0wCONn5uod7lBd7IIS1nMzVAIn4NMXlDKiDRYkH8DZtSTrQhr enow== 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=E4lHrdyZ1OUai3OcgSWAkeaePSfKre0ZQFniV/1r+XE=; b=T2VB7rmKhMCFO3OUiAuzb4/bsxM0StnfLFkZeH02x2XZ9QvZJOuKHKXgn/ArKn3U2X Kqql+i/MRekvK8H7gllR5dyFiAMFCPOw4C4pmMMklIW6/jibxBdycG4t0z1OyvQmPh1a R2DVEFtiTCXOBuedAzoqxthXaKqQ8iSs6sy6FXAqwYSL1o5po+dkG0nycF/uV5x9zWdq EA3NXwUZIuI3PLOS8GUqDJFu2Nv9a9VEs1osTsf852n3+glqhlJgw/jRfnW3jgKl+8Gy oNI14KpEHP/I0nJufn1p/NTYhk3Mtzeqg/afvzsVcPZgF71BObTP/whypq5aHH/YlBsa Bh2Q== X-Gm-Message-State: ANoB5pnjI9ewbOhASVTa6/5WSGImmxngYtFcuzdXFHIkW8oD7X4lwvDz rhP2o9GLVgUypJDXvuTux6gROg7Q9K0= X-Google-Smtp-Source: AA0mqf5uxvhh67S6SjHE0i0/bVxuZ45nc1bRfnWqDNN/j3KfPJ0/qq5yCscppChxly4kcbqsCm0yXQ== X-Received: by 2002:adf:f6ca:0:b0:236:6e2a:ac12 with SMTP id y10-20020adff6ca000000b002366e2aac12mr4386420wrp.366.1668314157951; Sat, 12 Nov 2022 20:35:57 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id l26-20020a05600c2cda00b003cf774c31a0sm14627087wmc.16.2022.11.12.20.35.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:35:57 -0800 (PST) Date: Sun, 13 Nov 2022 05:35:55 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] staging: rtl8192e: Rename bNetPromisc.., IntelPromiscu.. and bPromiscu.. Message-ID: <69d9998a30ce2286c3ae6cb4510174e1255b3f9e.1668313325.git.philipp.g.hortmann@gmail.com> 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 bNetPromiscuousMode to net_promiscuous_md, IntelPromiscuousModeInfo to intel_promiscuous_md_info and bPromiscuousOn to promiscuous_on to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 20 +++++++++---------- drivers/staging/rtl8192e/rtllib.h | 6 +++--- drivers/staging/rtl8192e/rtllib_rx.c | 8 ++++---- drivers/staging/rtl8192e/rtllib_softmac.c | 4 ++-- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index d0ce89837073..2ccd1e0542c2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -859,7 +859,7 @@ void rtl92e_link_change(struct net_device *dev) =20 reg =3D rtl92e_readl(dev, RCR); if (priv->rtllib->state =3D=3D RTLLIB_LINKED) { - if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn) + if (ieee->intel_promiscuous_md_info.promiscuous_on) ; else priv->ReceiveConfig =3D reg |=3D RCR_CBSSID; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 3379b4229a85..94b8ed2e3489 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -848,9 +848,9 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) 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; - priv->rtllib->IntelPromiscuousModeInfo.bPromiscuousOn =3D false; - priv->rtllib->IntelPromiscuousModeInfo.bFilterSourceStationFrame =3D + priv->rtllib->net_promiscuous_md =3D false; + priv->rtllib->intel_promiscuous_md_info.promiscuous_on =3D false; + priv->rtllib->intel_promiscuous_md_info.bFilterSourceStationFrame =3D false; priv->rtllib->ieee_up =3D 0; priv->retry_rts =3D DEFAULT_RETRY_RTS; @@ -1297,13 +1297,13 @@ static void _rtl92e_watchdog_wq_cb(void *data) (!ieee->proto_stoppping) && !ieee->wx_set_enc) { if ((ieee->pwr_save_ctrl.ReturnPoint =3D=3D IPS_CALLBACK_NONE) && - (!ieee->bNetPromiscuousMode)) { + (!ieee->net_promiscuous_md)) { rtl92e_ips_enter(dev); } } } if ((ieee->state =3D=3D RTLLIB_LINKED) && (ieee->iw_mode =3D=3D - IW_MODE_INFRA) && (!ieee->bNetPromiscuousMode)) { + IW_MODE_INFRA) && (!ieee->net_promiscuous_md)) { if (ieee->link_detect_info.NumRxOkInPeriod > 100 || ieee->link_detect_info.NumTxOkInPeriod > 100) bBusyTraffic =3D true; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 4f16c3d079cc..c31e5b572e9e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -251,7 +251,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev, rt_state =3D priv->rtllib->rf_power_state; mutex_lock(&priv->wx_mutex); if (wrqu->mode =3D=3D IW_MODE_ADHOC || wrqu->mode =3D=3D IW_MODE_MONITOR = || - ieee->bNetPromiscuousMode) { + ieee->net_promiscuous_md) { if (rt_state =3D=3D rf_off) { if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { @@ -1014,28 +1014,28 @@ static int _rtl92e_wx_set_promisc_mode(struct net_d= evice *dev, u32 info_buf[3]; =20 u32 oid; - u32 bPromiscuousOn; + u32 promiscuous_on; u32 bFilterSourceStationFrame; =20 if (copy_from_user(info_buf, wrqu->data.pointer, sizeof(info_buf))) return -EFAULT; =20 oid =3D info_buf[0]; - bPromiscuousOn =3D info_buf[1]; + promiscuous_on =3D info_buf[1]; bFilterSourceStationFrame =3D info_buf[2]; =20 if (oid =3D=3D OID_RT_INTEL_PROMISCUOUS_MODE) { - ieee->IntelPromiscuousModeInfo.bPromiscuousOn =3D - (bPromiscuousOn) ? (true) : (false); - ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame =3D + ieee->intel_promiscuous_md_info.promiscuous_on =3D + (promiscuous_on) ? (true) : (false); + ieee->intel_promiscuous_md_info.bFilterSourceStationFrame =3D (bFilterSourceStationFrame) ? (true) : (false); - (bPromiscuousOn) ? + (promiscuous_on) ? (rtllib_EnableIntelPromiscuousMode(dev, false)) : (rtllib_DisableIntelPromiscuousMode(dev, false)); =20 netdev_info(dev, "=3D=3D=3D=3D=3D=3D=3D>%s(), on =3D %d, filter src sta =3D %d\n", - __func__, bPromiscuousOn, + __func__, promiscuous_on, bFilterSourceStationFrame); } else { return -1; @@ -1054,8 +1054,8 @@ static int _rtl92e_wx_get_promisc_mode(struct net_dev= ice *dev, mutex_lock(&priv->wx_mutex); =20 snprintf(extra, 45, "PromiscuousMode:%d, FilterSrcSTAFrame:%d", - ieee->IntelPromiscuousModeInfo.bPromiscuousOn, - ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame); + ieee->intel_promiscuous_md_info.promiscuous_on, + ieee->intel_promiscuous_md_info.bFilterSourceStationFrame); wrqu->data.length =3D strlen(extra) + 1; =20 mutex_unlock(&priv->wx_mutex); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index b5313c1ea32d..493759cc6ccf 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1384,7 +1384,7 @@ struct rt_pmkid_list { }; =20 struct rt_intel_promisc_mode { - bool bPromiscuousOn; + bool promiscuous_on; bool bFilterSourceStationFrame; }; =20 @@ -1470,8 +1470,8 @@ struct rtllib_device { int scan_age; =20 int iw_mode; /* operating mode (IW_MODE_*) */ - bool bNetPromiscuousMode; - struct rt_intel_promisc_mode IntelPromiscuousModeInfo; + bool net_promiscuous_md; + struct rt_intel_promisc_mode intel_promiscuous_md_info; =20 spinlock_t lock; spinlock_t wpax_suitlist_lock; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index f9a35fcb1d1b..ccb61d8decd3 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -999,8 +999,8 @@ static int rtllib_rx_data_filter(struct rtllib_device *= ieee, u16 fc, } =20 /* Filter packets sent by an STA that will be forwarded by AP */ - if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn && - ieee->IntelPromiscuousModeInfo.bFilterSourceStationFrame) { + if (ieee->intel_promiscuous_md_info.promiscuous_on && + ieee->intel_promiscuous_md_info.bFilterSourceStationFrame) { if ((fc & RTLLIB_FCTL_TODS) && !(fc & RTLLIB_FCTL_FROMDS) && !ether_addr_equal(dst, ieee->current_network.bssid) && ether_addr_equal(bssid, ieee->current_network.bssid)) { @@ -1011,7 +1011,7 @@ static int rtllib_rx_data_filter(struct rtllib_device= *ieee, u16 fc, /* Nullfunc frames may have PS-bit set, so they must be passed to * hostap_handle_sta_rx() before being dropped here. */ - if (!ieee->IntelPromiscuousModeInfo.bPromiscuousOn) { + if (!ieee->intel_promiscuous_md_info.promiscuous_on) { if (stype !=3D RTLLIB_STYPE_DATA && stype !=3D RTLLIB_STYPE_DATA_CFACK && stype !=3D RTLLIB_STYPE_DATA_CFPOLL && @@ -1317,7 +1317,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device = *ieee, struct sk_buff *skb, multicast =3D is_multicast_ether_addr(hdr->addr1); unicast =3D !multicast; if (unicast && !ether_addr_equal(dev->dev_addr, hdr->addr1)) { - if (ieee->bNetPromiscuousMode) + if (ieee->net_promiscuous_md) bToOtherSTA =3D true; else goto rx_dropped; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 1d583e73d753..8b1d88061125 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -445,7 +445,7 @@ void rtllib_EnableIntelPromiscuousMode(struct net_devic= e *dev, ieee->SetHwRegHandler(dev, HW_VAR_CECHK_BSSID, (u8 *)&bFilterOutNonAssociatedBSSID); =20 - ieee->bNetPromiscuousMode =3D true; + ieee->net_promiscuous_md =3D true; } EXPORT_SYMBOL(rtllib_EnableIntelPromiscuousMode); =20 @@ -466,7 +466,7 @@ void rtllib_DisableIntelPromiscuousMode(struct net_devi= ce *dev, ieee->SetHwRegHandler(dev, HW_VAR_CECHK_BSSID, (u8 *)&bFilterOutNonAssociatedBSSID); =20 - ieee->bNetPromiscuousMode =3D false; + ieee->net_promiscuous_md =3D false; } EXPORT_SYMBOL(rtllib_DisableIntelPromiscuousMode); =20 --=20 2.37.3 From nobody Mon Apr 13 13:09:55 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 9F48FC4332F for ; Sun, 13 Nov 2022 04:37:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235227AbiKMEhI (ORCPT ); Sat, 12 Nov 2022 23:37:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235173AbiKMEg2 (ORCPT ); Sat, 12 Nov 2022 23:36:28 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2133213FB7 for ; Sat, 12 Nov 2022 20:36:06 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id y16so11599523wrt.12 for ; Sat, 12 Nov 2022 20:36:06 -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=0CokBU8cM6zI23zkNc1rZIn7Gnc44VkzGzRrbVO49/Q=; b=U3y1e8ofpG+p/2Fof4nkCA84Kmk8Txxo7ss37NzUscGzy4tDhsZyTkITx17JbkDMp1 rQyupLV99RKeSq/2ZE3PkQExgHDp9/qpAe9C7sdAbzT3ANamC0HSC/GQZ4VdRvCYS/PT uerTCxNlq7yDCs8pNjqQufxP4r/igz6lPACweEJGkfcXgcF3Rhly9pCWUIgyocRAO4ih wNzIyzY5YTeCJ136iEbXYVXBzYaXV3jWJaD6bAmNYBiWfu2o4VzUQzfNElxHnol7hYF+ YMwxidL/tdZu9+PhciPz9WO4btuWvHxlF7VQ2WV/526AhivUwLNTfGAWEy5DmqeYOxzX jAIA== 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=0CokBU8cM6zI23zkNc1rZIn7Gnc44VkzGzRrbVO49/Q=; b=6EWbaALRZexX+OHJOkKlCgzVgCBbM7hyp+foF14X7063in3POWI5DtSP+e3UpqOnHC t12WIgy83SU11MmcpyQIIW9y+fslAvd2J/zdF+xOBOZm0p8FAiWQhNy8t+IV0pL2Z/n4 3U3hafzu54qntaQYkTktkRbNnA0o/R5g2vdxFPckA0K+B9hRJ5muXA1siWeUA4OjC2PF L/17mCYgDZF2jRA4b122UjcQuWrQXnvXMnYJqIiH6+AhNjHyrRa2BE+nnLApgXw8IG5C 7WapVQZSsz/titUlEUV/BHa/I+bbU/l1cuVw24DZZOywuj//2L8NbdwT+QDPnyj2yt+G UAhQ== X-Gm-Message-State: ANoB5pm8qS5Jzy5t17IiPvFPLQzi69WK/yfDtjm2hGGXvwBPoOY02Yef PJTf0vOXeCJ+wBtUVc2ImFzC/l4E4yo= X-Google-Smtp-Source: AA0mqf7Wb6/YTEZwuift2xUZSLB3DsxioGINWXNBzLhaF8M5t4rnJEimZSpREiOz3EwHfOXuu+LXng== X-Received: by 2002:adf:efc3:0:b0:23a:2311:b35 with SMTP id i3-20020adfefc3000000b0023a23110b35mr4395814wrp.183.1668314164584; Sat, 12 Nov 2022 20:36:04 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id o15-20020a05600c510f00b003c6d21a19a0sm9121807wms.29.2022.11.12.20.36.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:36:04 -0800 (PST) Date: Sun, 13 Nov 2022 05:36:02 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Rename bFilterSour.., CCKPresentAt.. and ResetProg.. Message-ID: <25ab52350a4a3249a1f76b28eea10c44e2f9552d.1668313325.git.philipp.g.hortmann@gmail.com> 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 bFilterSourceStationFrame to fltr_src_sta_frame, CCKPresentAttentuation to cck_present_attn and ResetProgress to rst_progress to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 12 +++++------ .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 20 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 14 ++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 20 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 12 +++++------ drivers/staging/rtl8192e/rtllib.h | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 2 +- 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 2ccd1e0542c2..0eeb9b2daefc 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -617,7 +617,7 @@ bool rtl92e_start_adapter(struct net_device *dev) start: rtl92e_reset_desc_ring(dev); priv->Rf_Mode =3D RF_OP_By_SW_3wire; - if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) { + if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { rtl92e_writeb(dev, ANAPAR, 0x37); mdelay(500); } @@ -650,7 +650,7 @@ bool rtl92e_start_adapter(struct net_device *dev) } =20 priv->LoopbackMode =3D RTL819X_NO_LOOPBACK; - if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) { + if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { ulRegRead =3D rtl92e_readl(dev, CPU_GEN); if (priv->LoopbackMode =3D=3D RTL819X_NO_LOOPBACK) ulRegRead =3D (ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) | @@ -699,7 +699,7 @@ bool rtl92e_start_adapter(struct net_device *dev) =20 rtl92e_writeb(dev, ACK_TIMEOUT, 0x30); =20 - if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) + if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) rtl92e_set_wireless_mode(dev, priv->rtllib->mode); rtl92e_cam_reset(dev); { @@ -739,7 +739,7 @@ bool rtl92e_start_adapter(struct net_device *dev) } } =20 - if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) { + if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { rtStatus =3D rtl92e_config_phy(dev); if (!rtStatus) { netdev_info(dev, "RF Config failed\n"); @@ -766,7 +766,7 @@ bool rtl92e_start_adapter(struct net_device *dev) else priv->Rf_Mode =3D RF_OP_By_SW_3wire; =20 - if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) { + if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { rtl92e_dm_init_txpower_tracking(dev); =20 if (priv->IC_Cut >=3D IC_VersionCut_D) { @@ -795,7 +795,7 @@ bool rtl92e_start_adapter(struct net_device *dev) } priv->CCKPresentAttentuation_40Mdefault =3D 0; priv->CCKPresentAttentuation_difference =3D 0; - priv->CCKPresentAttentuation =3D + priv->cck_present_attn =3D priv->CCKPresentAttentuation_20Mdefault; priv->btxpower_tracking =3D false; } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index c357adf95a3d..ac3c7f047ca2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1008,16 +1008,16 @@ static void _rtl92e_cck_tx_power_track_bw_switch_ts= si(struct net_device *dev) =20 switch (priv->CurrentChannelBW) { case HT_CHANNEL_WIDTH_20: - priv->CCKPresentAttentuation =3D + priv->cck_present_attn =3D priv->CCKPresentAttentuation_20Mdefault + priv->CCKPresentAttentuation_difference; =20 - if (priv->CCKPresentAttentuation > + if (priv->cck_present_attn > (CCKTxBBGainTableLength-1)) - priv->CCKPresentAttentuation =3D + priv->cck_present_attn =3D CCKTxBBGainTableLength-1; - if (priv->CCKPresentAttentuation < 0) - priv->CCKPresentAttentuation =3D 0; + if (priv->cck_present_attn < 0) + priv->cck_present_attn =3D 0; =20 if (priv->rtllib->current_network.channel =3D=3D 14 && !priv->bcck_in_ch14) { @@ -1033,16 +1033,16 @@ static void _rtl92e_cck_tx_power_track_bw_switch_ts= si(struct net_device *dev) break; =20 case HT_CHANNEL_WIDTH_20_40: - priv->CCKPresentAttentuation =3D + priv->cck_present_attn =3D priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_difference; =20 - if (priv->CCKPresentAttentuation > + if (priv->cck_present_attn > (CCKTxBBGainTableLength - 1)) - priv->CCKPresentAttentuation =3D + priv->cck_present_attn =3D CCKTxBBGainTableLength-1; - if (priv->CCKPresentAttentuation < 0) - priv->CCKPresentAttentuation =3D 0; + if (priv->cck_present_attn < 0) + priv->cck_present_attn =3D 0; =20 if (priv->rtllib->current_network.channel =3D=3D 14 && !priv->bcck_in_ch14) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 94b8ed2e3489..1c4985dcc5eb 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -850,7 +850,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rtllib->iw_mode =3D IW_MODE_INFRA; priv->rtllib->net_promiscuous_md =3D false; priv->rtllib->intel_promiscuous_md_info.promiscuous_on =3D false; - priv->rtllib->intel_promiscuous_md_info.bFilterSourceStationFrame =3D + priv->rtllib->intel_promiscuous_md_info.fltr_src_sta_frame =3D false; priv->rtllib->ieee_up =3D 0; priv->retry_rts =3D DEFAULT_RETRY_RTS; @@ -861,11 +861,11 @@ static void _rtl92e_init_priv_variable(struct net_dev= ice *dev) priv->promisc =3D (dev->flags & IFF_PROMISC) ? 1 : 0; priv->bcck_in_ch14 =3D false; priv->bfsync_processing =3D false; - priv->CCKPresentAttentuation =3D 0; + priv->cck_present_attn =3D 0; priv->rfa_txpowertrackingindex =3D 0; priv->rfc_txpowertrackingindex =3D 0; priv->CckPwEnl =3D 6; - priv->ResetProgress =3D RESET_TYPE_NORESET; + priv->rst_progress =3D RESET_TYPE_NORESET; priv->force_reset =3D false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); =20 @@ -1135,8 +1135,8 @@ static void _rtl92e_if_silent_reset(struct net_device= *dev) struct rtllib_device *ieee =3D priv->rtllib; unsigned long flag; =20 - if (priv->ResetProgress =3D=3D RESET_TYPE_NORESET) { - priv->ResetProgress =3D RESET_TYPE_SILENT; + if (priv->rst_progress =3D=3D RESET_TYPE_NORESET) { + priv->rst_progress =3D RESET_TYPE_SILENT; =20 spin_lock_irqsave(&priv->rf_ps_lock, flag); if (priv->rf_change_in_progress) { @@ -1233,7 +1233,7 @@ static void _rtl92e_if_silent_reset(struct net_device= *dev) rtl92e_cam_restore(dev); rtl92e_dm_restore_state(dev); END: - priv->ResetProgress =3D RESET_TYPE_NORESET; + priv->rst_progress =3D RESET_TYPE_NORESET; priv->reset_count++; priv->bResetInProgress =3D false; =20 @@ -1396,7 +1396,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) spin_unlock_irqrestore(&priv->tx_lock, flags); =20 if (ResetType =3D=3D RESET_TYPE_NORMAL) { - priv->ResetProgress =3D RESET_TYPE_NORMAL; + priv->rst_progress =3D RESET_TYPE_NORMAL; return; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 98c750730f87..dfbc9fbcc129 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -483,7 +483,7 @@ struct r8192_priv { u8 CCKPresentAttentuation_20Mdefault; u8 CCKPresentAttentuation_40Mdefault; s8 CCKPresentAttentuation_difference; - s8 CCKPresentAttentuation; + s8 cck_present_attn; long undecorated_smoothed_pwdb; =20 u32 MCSTxPowerLevelOriginalOffset[6]; @@ -536,7 +536,7 @@ struct r8192_priv { =20 u32 reset_count; =20 - enum reset_type ResetProgress; + enum reset_type rst_progress; u16 TxCounter; u16 RxCounter; bool bResetInProgress; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 767c746fc73d..234e85a25d45 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -267,7 +267,7 @@ static void _rtl92e_dm_check_ac_dc_power(struct net_dev= ice *dev) "PATH=3D/usr/bin:/bin", NULL}; =20 - if (priv->ResetProgress =3D=3D RESET_TYPE_SILENT) + if (priv->rst_progress =3D=3D RESET_TYPE_SILENT) return; if (priv->rtllib->state !=3D RTLLIB_LINKED) return; @@ -716,21 +716,21 @@ static void _rtl92e_dm_tx_power_tracking_callback_tss= i(struct net_device *dev) } =20 if (priv->CurrentChannelBW =3D=3D HT_CHANNEL_WIDTH_20) - priv->CCKPresentAttentuation =3D + priv->cck_present_attn =3D priv->CCKPresentAttentuation_20Mdefault + priv->CCKPresentAttentuation_difference; else - priv->CCKPresentAttentuation =3D + priv->cck_present_attn =3D priv->CCKPresentAttentuation_40Mdefault + priv->CCKPresentAttentuation_difference; =20 - if (priv->CCKPresentAttentuation > (CCKTxBBGainTableLength-1)) - priv->CCKPresentAttentuation =3D CCKTxBBGainTableLength-1; - if (priv->CCKPresentAttentuation < 0) - priv->CCKPresentAttentuation =3D 0; + if (priv->cck_present_attn > (CCKTxBBGainTableLength-1)) + priv->cck_present_attn =3D CCKTxBBGainTableLength-1; + if (priv->cck_present_attn < 0) + priv->cck_present_attn =3D 0; =20 - if (priv->CCKPresentAttentuation > -1 && - priv->CCKPresentAttentuation < CCKTxBBGainTableLength) { + if (priv->cck_present_attn > -1 && + priv->cck_present_attn < CCKTxBBGainTableLength) { if (priv->rtllib->current_network.channel =3D=3D 14 && !priv->bcck_in_ch14) { priv->bcck_in_ch14 =3D true; @@ -963,7 +963,7 @@ static void _rtl92e_dm_cck_tx_power_adjust_tssi(struct = net_device *dev, { u32 TempVal; struct r8192_priv *priv =3D rtllib_priv(dev); - u8 attenuation =3D priv->CCKPresentAttentuation; + u8 attenuation =3D priv->cck_present_attn; =20 TempVal =3D 0; if (!bInCH14) { diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index c31e5b572e9e..7ff14aa9f476 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -1015,20 +1015,20 @@ static int _rtl92e_wx_set_promisc_mode(struct net_d= evice *dev, =20 u32 oid; u32 promiscuous_on; - u32 bFilterSourceStationFrame; + u32 fltr_src_sta_frame; =20 if (copy_from_user(info_buf, wrqu->data.pointer, sizeof(info_buf))) return -EFAULT; =20 oid =3D info_buf[0]; promiscuous_on =3D info_buf[1]; - bFilterSourceStationFrame =3D info_buf[2]; + fltr_src_sta_frame =3D info_buf[2]; =20 if (oid =3D=3D OID_RT_INTEL_PROMISCUOUS_MODE) { ieee->intel_promiscuous_md_info.promiscuous_on =3D (promiscuous_on) ? (true) : (false); - ieee->intel_promiscuous_md_info.bFilterSourceStationFrame =3D - (bFilterSourceStationFrame) ? (true) : (false); + ieee->intel_promiscuous_md_info.fltr_src_sta_frame =3D + (fltr_src_sta_frame) ? (true) : (false); (promiscuous_on) ? (rtllib_EnableIntelPromiscuousMode(dev, false)) : (rtllib_DisableIntelPromiscuousMode(dev, false)); @@ -1036,7 +1036,7 @@ static int _rtl92e_wx_set_promisc_mode(struct net_dev= ice *dev, netdev_info(dev, "=3D=3D=3D=3D=3D=3D=3D>%s(), on =3D %d, filter src sta =3D %d\n", __func__, promiscuous_on, - bFilterSourceStationFrame); + fltr_src_sta_frame); } else { return -1; } @@ -1055,7 +1055,7 @@ static int _rtl92e_wx_get_promisc_mode(struct net_dev= ice *dev, =20 snprintf(extra, 45, "PromiscuousMode:%d, FilterSrcSTAFrame:%d", ieee->intel_promiscuous_md_info.promiscuous_on, - ieee->intel_promiscuous_md_info.bFilterSourceStationFrame); + ieee->intel_promiscuous_md_info.fltr_src_sta_frame); wrqu->data.length =3D strlen(extra) + 1; =20 mutex_unlock(&priv->wx_mutex); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 493759cc6ccf..9c81ca38f4b1 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1385,7 +1385,7 @@ struct rt_pmkid_list { =20 struct rt_intel_promisc_mode { bool promiscuous_on; - bool bFilterSourceStationFrame; + bool fltr_src_sta_frame; }; =20 =20 diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index ccb61d8decd3..75190c389ccf 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -1000,7 +1000,7 @@ static int rtllib_rx_data_filter(struct rtllib_device= *ieee, u16 fc, =20 /* Filter packets sent by an STA that will be forwarded by AP */ if (ieee->intel_promiscuous_md_info.promiscuous_on && - ieee->intel_promiscuous_md_info.bFilterSourceStationFrame) { + ieee->intel_promiscuous_md_info.fltr_src_sta_frame) { if ((fc & RTLLIB_FCTL_TODS) && !(fc & RTLLIB_FCTL_FROMDS) && !ether_addr_equal(dst, ieee->current_network.bssid) && ether_addr_equal(bssid, ieee->current_network.bssid)) { --=20 2.37.3 From nobody Mon Apr 13 13:09:55 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 267E3C4332F for ; Sun, 13 Nov 2022 04:37:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235263AbiKMEhN (ORCPT ); Sat, 12 Nov 2022 23:37:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38526 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235225AbiKMEge (ORCPT ); Sat, 12 Nov 2022 23:36:34 -0500 Received: from mail-wr1-x429.google.com (mail-wr1-x429.google.com [IPv6:2a00:1450:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E887912D18 for ; Sat, 12 Nov 2022 20:36:11 -0800 (PST) Received: by mail-wr1-x429.google.com with SMTP id y16so11599681wrt.12 for ; Sat, 12 Nov 2022 20:36:11 -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=6Waj2wVmJ6VIMUK7fVeeqwrsUbV46YA2aMojAJKw2kw=; b=jAAncIEP9n9rJ2pamz3EV6edyGp/ejCVX6op+UL3/q6bf7W5nucjG7Ur3/JaWTHPuI ijwKa7d67fjHAp9VIg9WFWifdzX535UqLbNjZI9ooseVITX7qTLqmwFbnK4rqUzTcSoP zC+ES5BLt0G2/KNBxoKYTeQQI9ewHK0hG8fFeu1OXelPkXCka+wdWcikYKcPIBoEiO9m uHLyawXlTrUEb5skzPAMffmPe8V5ph+jyAPMae9/I86iq3yG2o0IJzcPxEeY7tIFkmD8 JYgLkzVhfbTkUnox+glZPd+2048yf5zk0trhRwrLNKRaeDgXCw9erjBUc+ki0gtOY972 Lfpw== 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=6Waj2wVmJ6VIMUK7fVeeqwrsUbV46YA2aMojAJKw2kw=; b=goTUuwF0xfgOYjxv4MmMoN6SpiLFPbqxfwNxT07aGj3tQrP02YQgWGA/QPigk+meup 2EpwlnNICmkPfT+/snDW8+A+ypEZGZL7HeVItPBePS2LFg+5xM2tKpgMf0mqNk3Hq4Z0 fV7vdUsb93EwrClXHlDXHWu0GuwNVsuNkQuOB45Z7Wzt3h6P0cJu3pKC/CpmCPHeDi8e M16A7MpnvCAjH53OOD5JZJPFCYlR1KHvkj4vCbWdf5RVYoQNFqfxTzO/CQvgB2n1o5ge JtGBUyoZ9JazN7YzCo3BUaBlYPTp8dgx7x8lORP+nqDV7QsWJq4rPO3lhHvl1H0O5KHX NdQQ== X-Gm-Message-State: ANoB5plFwN3qCFMzF70CYaw9K44qh6PqslSO4ggU+B0WzUKbie2PBE2T nclID3liG8n0OPy8Ga76ep8= X-Google-Smtp-Source: AA0mqf6DhB+2BZOgiK2HVr1gVinRB4aH7sc2Kmdz8/0CIUyXHC9GLAxQ0JKAwTCk0tAwy+jxzbGEfA== X-Received: by 2002:a5d:6e0d:0:b0:236:71c3:bf36 with SMTP id h13-20020a5d6e0d000000b0023671c3bf36mr4353232wrz.184.1668314171252; Sat, 12 Nov 2022 20:36:11 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id m9-20020a05600c4f4900b003b3307fb98fsm9086747wmq.24.2022.11.12.20.36.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:36:10 -0800 (PST) Date: Sun, 13 Nov 2022 05:36:09 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Rename InterruptLog, RxCounter and bHwRfOffAction Message-ID: <82ea07ddd894ac9b863ce90ddb9ba78065bd1f4e.1668313325.git.philipp.g.hortmann@gmail.com> 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 InterruptLog to int_log, RxCounter to rx_ctr and bHwRfOffAction to hw_rf_off_action to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 4 ++-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 8 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 0eeb9b2daefc..e530f917fd23 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1928,7 +1928,7 @@ void rtl92e_stop_adapter(struct net_device *dev, bool= reset) if (!reset) { mdelay(150); =20 - priv->bHwRfOffAction =3D 2; + priv->hw_rf_off_action =3D 2; =20 if (!priv->rtllib->bSupportRemoteWakeUp) { rtl92e_set_rf_off(dev); @@ -2129,7 +2129,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) =20 SlotIndex =3D (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum; =20 - if (priv->RxCounter =3D=3D RegRxCounter) { + if (priv->rx_ctr =3D=3D RegRxCounter) { priv->SilentResetRxStuckEvent[SlotIndex] =3D 1; =20 for (i =3D 0; i < SilentResetRxSoltNum; i++) @@ -2147,7 +2147,7 @@ bool rtl92e_is_rx_stuck(struct net_device *dev) priv->SilentResetRxStuckEvent[SlotIndex] =3D 0; } =20 - priv->RxCounter =3D RegRxCounter; + priv->rx_ctr =3D RegRxCounter; =20 return bStuck; } diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index ac3c7f047ca2..a813eded4cb3 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1342,7 +1342,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, mdelay(1); rtl92e_set_bb_reg(dev, rFPGA0_AnalogParameter1, 0x4, 0x1); - priv->bHwRfOffAction =3D 0; + priv->hw_rf_off_action =3D 0; =20 rtl92e_set_bb_reg(dev, rFPGA0_XA_RFInterfaceOE, BIT4, 0x1); @@ -1450,7 +1450,7 @@ bool rtl92e_set_rf_power_state(struct net_device *dev, bool bResult =3D false; =20 if (rf_power_state =3D=3D priv->rtllib->rf_power_state && - priv->bHwRfOffAction =3D=3D 0) { + priv->hw_rf_off_action =3D=3D 0) { return bResult; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 1c4985dcc5eb..43601ec8d903 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -869,13 +869,13 @@ static void _rtl92e_init_priv_variable(struct net_dev= ice *dev) priv->force_reset =3D false; memset(priv->rtllib->swcamtable, 0, sizeof(struct sw_cam_table) * 32); =20 - memset(&priv->InterruptLog, 0, sizeof(struct log_int_8190)); - priv->RxCounter =3D 0; + memset(&priv->int_log, 0, sizeof(struct log_int_8190)); + priv->rx_ctr =3D 0; priv->rtllib->wx_set_enc =3D 0; priv->hw_radio_off =3D false; priv->rtllib->rf_off_reason =3D 0; priv->rf_change_in_progress =3D false; - priv->bHwRfOffAction =3D 0; + priv->hw_rf_off_action =3D 0; priv->SetRFPowerStateInProgress =3D false; priv->rtllib->pwr_save_ctrl.bLeisurePs =3D true; priv->rtllib->LPSDelayCnt =3D 0; @@ -2189,7 +2189,7 @@ static irqreturn_t _rtl92e_irq(int irq, void *netdev) =20 if (inta & IMR_ROK) { priv->stats.rxint++; - priv->InterruptLog.nIMR_ROK++; + priv->int_log.nIMR_ROK++; tasklet_schedule(&priv->irq_rx_tasklet); } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index dfbc9fbcc129..b1656d4ecbad 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -330,7 +330,7 @@ struct r8192_priv { =20 struct work_struct reset_wq; =20 - struct log_int_8190 InterruptLog; + struct log_int_8190 int_log; =20 enum rt_customer_id CustomerID; =20 @@ -469,7 +469,7 @@ struct r8192_priv { =20 u16 reg_chnl_plan; u16 ChannelPlan; - u8 bHwRfOffAction; + u8 hw_rf_off_action; =20 bool rf_change_in_progress; bool SetRFPowerStateInProgress; @@ -538,7 +538,7 @@ struct r8192_priv { =20 enum reset_type rst_progress; u16 TxCounter; - u16 RxCounter; + u16 rx_ctr; bool bResetInProgress; bool force_reset; bool force_lps; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 234e85a25d45..e0f6f1405c17 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1693,7 +1693,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) =20 if (bActuallySet) { mdelay(1000); - priv->bHwRfOffAction =3D 1; + priv->hw_rf_off_action =3D 1; rtl92e_set_rf_state(dev, rf_power_state_to_set, RF_CHANGE_BY_HW); if (priv->hw_radio_off) argv[1] =3D "RFOFF"; --=20 2.37.3 From nobody Mon Apr 13 13:09:55 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 19CEFC433FE for ; Sun, 13 Nov 2022 04:37:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235235AbiKMEhd (ORCPT ); Sat, 12 Nov 2022 23:37:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235233AbiKMEgh (ORCPT ); Sat, 12 Nov 2022 23:36:37 -0500 Received: from mail-wm1-x32e.google.com (mail-wm1-x32e.google.com [IPv6:2a00:1450:4864:20::32e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 93AAC13CF3 for ; Sat, 12 Nov 2022 20:36:19 -0800 (PST) Received: by mail-wm1-x32e.google.com with SMTP id j5-20020a05600c410500b003cfa9c0ea76so5544749wmi.3 for ; Sat, 12 Nov 2022 20:36:19 -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=2DKr7cwbkVgEdJvuHQ0DWRO4kJzVzO0mkTMPxDpfInI=; b=WWQniVj+v02JZBk+1TvKBaHKMDoGBi3MPb000u8U/EgiTH/T1TxTiJx1+iimQ5gQ3W ij9YE9TpbEOX7EmF9lr/gxbEe6+Vyls40Cf94NhB7ehQE9HUCalDAUnaJrAGNFNLMbZf 8ufR80v/LwG+WOVPiE7xrfffM5QNzcMxl8MnE/CsblD8Xbj+lnm6L9OvqOI3ONjli+O/ mdOtwLMF7tuMMArz25yUQTXs3qDSbY0Mg0U4WKNmod4fqYuio0vvzYBwh0IKzszOfmzA RTLvIBq0bet2gPsBLCsB3g8jI7ehL6Q6tZyJ9ZQYe0cBJZO6NtnTVn1+oGgHsxruTOoq kM5A== 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=2DKr7cwbkVgEdJvuHQ0DWRO4kJzVzO0mkTMPxDpfInI=; b=ALvhcXChShPF0I33g7bzDTM2BHv4oZCftKbQ9qgB1lkqieK3RzE+7GLxiIPD91lZI/ ghO5OxHBSRuAoRs+hoiV5EcCjQByp6lg4giW+xL+pi/P5WWIVI4faUInwnw5285ulwI5 Z6yTdxIeOHwNeWIC5vdP7Njw7tqwQpFJRAJfBVlczd0hvEz1R5g98V3hntojr42wVJDU BR4bXaWmnwh2CYWJ6GVwnVlh5DIL6Bwq5LtPNo7LZwiu2OEc43mw50sQOcArvjkLi5oU ssDv1uVy3xEqWnjsd7gCxe3UGZnwICNxZaNg5cYx2fPMFCfohnj/N9AqUPVWTaCBx+NY AT2g== X-Gm-Message-State: ANoB5pmXpwyniA4RkRDs6d/ZUKV5QrwJXUxx2mbSi11IxAWxJoC9O2qU emWRm46PNdwQsqWtssuZltQ= X-Google-Smtp-Source: AA0mqf7Fg/LaxV/0UzvOCF52HyDH0HCvbm0mKeC5DGhit675MLM1B+TxyttvEztwgVfEu9C7mtWW5A== X-Received: by 2002:a05:600c:1c89:b0:3cf:a41d:8418 with SMTP id k9-20020a05600c1c8900b003cfa41d8418mr5219611wms.190.1668314177739; Sat, 12 Nov 2022 20:36:17 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id c15-20020a05600c0a4f00b003b3365b38f9sm8229677wmq.10.2022.11.12.20.36.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:36:17 -0800 (PST) Date: Sun, 13 Nov 2022 05:36:15 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Rename pHTInfo Message-ID: <88cdc0ef393c92cb2102a66893c5320e8c8606df.1668313325.git.philipp.g.hortmann@gmail.com> 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 pHTInfo to ht_info to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 12 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 50 +-- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- drivers/staging/rtl8192e/rtl819x_BAProc.c | 20 +- drivers/staging/rtl8192e/rtl819x_HTProc.c | 354 +++++++++--------- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib.h | 4 +- drivers/staging/rtl8192e/rtllib_module.c | 6 +- drivers/staging/rtl8192e/rtllib_rx.c | 12 +- drivers/staging/rtl8192e/rtllib_softmac.c | 78 ++-- drivers/staging/rtl8192e/rtllib_softmac_wx.c | 8 +- drivers/staging/rtl8192e/rtllib_tx.c | 54 +-- 14 files changed, 307 insertions(+), 307 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index e530f917fd23..b9c846015d28 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1978,7 +1978,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) break; case IEEE_N_24G: case IEEE_N_5G: - if (ieee->pHTInfo->peer_mimo_ps =3D=3D 0) { + if (ieee->ht_info->peer_mimo_ps =3D=3D 0) { ratr_value &=3D 0x0007F007; } else { if (priv->rf_type =3D=3D RF_1T2R) @@ -1991,11 +1991,11 @@ void rtl92e_update_ratr_table(struct net_device *de= v) break; } ratr_value &=3D 0x0FFFFFFF; - if (ieee->pHTInfo->cur_tx_bw40mhz && - ieee->pHTInfo->bCurShortGI40MHz) + if (ieee->ht_info->cur_tx_bw40mhz && + ieee->ht_info->bCurShortGI40MHz) ratr_value |=3D 0x80000000; - else if (!ieee->pHTInfo->cur_tx_bw40mhz && - ieee->pHTInfo->bCurShortGI20MHz) + else if (!ieee->ht_info->cur_tx_bw40mhz && + ieee->ht_info->bCurShortGI20MHz) ratr_value |=3D 0x80000000; rtl92e_writel(dev, RATR0+rate_index*4, ratr_value); rtl92e_writeb(dev, UFWP, 1); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 9d8d4837e6b2..a4d65b4d99c2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -41,7 +41,7 @@ void rtl92e_enable_hw_security_config(struct net_device *= dev) } =20 ieee->hwsec_active =3D 1; - if ((ieee->pHTInfo->iot_action & HT_IOT_ACT_PURE_N_MODE) || !hwwep) { + if ((ieee->ht_info->iot_action & HT_IOT_ACT_PURE_N_MODE) || !hwwep) { ieee->hwsec_active =3D 0; SECR_value &=3D ~SCR_RxDecEnable; } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 43601ec8d903..399ee9783f99 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -307,7 +307,7 @@ static void _rtl92e_update_cap(struct net_device *dev, = u16 cap) u8 cur_slot_time =3D priv->slot_time; =20 if ((cap & WLAN_CAPABILITY_SHORT_SLOT_TIME) && - (!priv->rtllib->pHTInfo->current_rt2rt_long_slot_time)) { + (!priv->rtllib->ht_info->current_rt2rt_long_slot_time)) { if (cur_slot_time !=3D SHORT_SLOT_TIME) { slot_time_val =3D SHORT_SLOT_TIME; priv->rtllib->SetHwRegHandler(dev, @@ -339,10 +339,10 @@ static void _rtl92e_update_beacon(void *data) struct rtllib_device *ieee =3D priv->rtllib; struct rtllib_network *net =3D &ieee->current_network; =20 - if (ieee->pHTInfo->bCurrentHTSupport) + if (ieee->ht_info->bCurrentHTSupport) HT_update_self_and_peer_setting(ieee, net); - ieee->pHTInfo->current_rt2rt_long_slot_time =3D net->bssht.bd_rt2rt_long_= slot_time; - ieee->pHTInfo->RT2RT_HT_Mode =3D net->bssht.rt2rt_ht_mode; + ieee->ht_info->current_rt2rt_long_slot_time =3D net->bssht.bd_rt2rt_long_= slot_time; + ieee->ht_info->RT2RT_HT_Mode =3D net->bssht.rt2rt_ht_mode; _rtl92e_update_cap(dev, net->capability); } =20 @@ -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->enable_ht =3D 1; + priv->rtllib->ht_info->enable_ht =3D 1; } else { - priv->rtllib->pHTInfo->enable_ht =3D 0; + priv->rtllib->ht_info->enable_ht =3D 0; } _rtl92e_refresh_support_rate(priv); } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index e0f6f1405c17..a18393c8a833 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -321,7 +321,7 @@ void rtl92e_init_adaptive_rate(struct net_device *dev) static void _rtl92e_dm_check_rate_adaptive(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_hi_throughput *pHTInfo =3D priv->rtllib->pHTInfo; + struct rt_hi_throughput *ht_info =3D priv->rtllib->ht_info; struct rate_adaptive *pra =3D &priv->rate_adaptive; u32 currentRATR, targetRATR =3D 0; u32 LowRSSIThreshForRA =3D 0, HighRSSIThreshForRA =3D 0; @@ -340,10 +340,10 @@ static void _rtl92e_dm_check_rate_adaptive(struct net= _device *dev) =20 if (priv->rtllib->state =3D=3D RTLLIB_LINKED) { =20 - bshort_gi_enabled =3D (pHTInfo->cur_tx_bw40mhz && - pHTInfo->bCurShortGI40MHz) || - (!pHTInfo->cur_tx_bw40mhz && - pHTInfo->bCurShortGI20MHz); + bshort_gi_enabled =3D (ht_info->cur_tx_bw40mhz && + ht_info->bCurShortGI40MHz) || + (!ht_info->cur_tx_bw40mhz && + ht_info->bCurShortGI20MHz); =20 pra->upper_rssi_threshold_ratr =3D (pra->upper_rssi_threshold_ratr & (~BIT31)) | @@ -1532,7 +1532,7 @@ void rtl92e_dm_init_edca_turbo(struct net_device *dev) static void _rtl92e_dm_check_edca_turbo(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_hi_throughput *pHTInfo =3D priv->rtllib->pHTInfo; + struct rt_hi_throughput *ht_info =3D priv->rtllib->ht_info; =20 static unsigned long lastTxOkCnt; static unsigned long lastRxOkCnt; @@ -1543,18 +1543,18 @@ static void _rtl92e_dm_check_edca_turbo(struct net_= device *dev) goto dm_CheckEdcaTurbo_EXIT; if (priv->rtllib->state !=3D RTLLIB_LINKED) goto dm_CheckEdcaTurbo_EXIT; - if (priv->rtllib->pHTInfo->iot_action & HT_IOT_ACT_DISABLE_EDCA_TURBO) + if (priv->rtllib->ht_info->iot_action & HT_IOT_ACT_DISABLE_EDCA_TURBO) goto dm_CheckEdcaTurbo_EXIT; =20 if (!priv->rtllib->bis_any_nonbepkts) { curTxOkCnt =3D priv->stats.txbytesunicast - lastTxOkCnt; curRxOkCnt =3D priv->stats.rxbytesunicast - lastRxOkCnt; - if (pHTInfo->iot_action & HT_IOT_ACT_EDCA_BIAS_ON_RX) { + if (ht_info->iot_action & HT_IOT_ACT_EDCA_BIAS_ON_RX) { if (curTxOkCnt > 4*curRxOkCnt) { if (priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) { rtl92e_writel(dev, EDCAPARA_BE, - edca_setting_UL[pHTInfo->IOTPeer]); + edca_setting_UL[ht_info->IOTPeer]); priv->bis_cur_rdlstate =3D false; } } else { @@ -1562,10 +1562,10 @@ static void _rtl92e_dm_check_edca_turbo(struct net_= device *dev) !priv->bcurrent_turbo_EDCA) { if (priv->rtllib->mode =3D=3D WIRELESS_MODE_G) rtl92e_writel(dev, EDCAPARA_BE, - edca_setting_DL_GMode[pHTInfo->IOTPeer]); + edca_setting_DL_GMode[ht_info->IOTPeer]); else rtl92e_writel(dev, EDCAPARA_BE, - edca_setting_DL[pHTInfo->IOTPeer]); + edca_setting_DL[ht_info->IOTPeer]); priv->bis_cur_rdlstate =3D true; } } @@ -1576,17 +1576,17 @@ static void _rtl92e_dm_check_edca_turbo(struct net_= device *dev) !priv->bcurrent_turbo_EDCA) { if (priv->rtllib->mode =3D=3D WIRELESS_MODE_G) rtl92e_writel(dev, EDCAPARA_BE, - edca_setting_DL_GMode[pHTInfo->IOTPeer]); + edca_setting_DL_GMode[ht_info->IOTPeer]); else rtl92e_writel(dev, EDCAPARA_BE, - edca_setting_DL[pHTInfo->IOTPeer]); + edca_setting_DL[ht_info->IOTPeer]); priv->bis_cur_rdlstate =3D true; } } else { if (priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) { rtl92e_writel(dev, EDCAPARA_BE, - edca_setting_UL[pHTInfo->IOTPeer]); + edca_setting_UL[ht_info->IOTPeer]); priv->bis_cur_rdlstate =3D false; } =20 @@ -1621,23 +1621,23 @@ static void _rtl92e_dm_init_cts_to_self(struct net_= device *dev) static void _rtl92e_dm_cts_to_self(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv((struct net_device *)dev); - struct rt_hi_throughput *pHTInfo =3D priv->rtllib->pHTInfo; + struct rt_hi_throughput *ht_info =3D priv->rtllib->ht_info; static unsigned long lastTxOkCnt; static unsigned long lastRxOkCnt; unsigned long curTxOkCnt =3D 0; unsigned long curRxOkCnt =3D 0; =20 if (!priv->rtllib->bCTSToSelfEnable) { - pHTInfo->iot_action &=3D ~HT_IOT_ACT_FORCED_CTS2SELF; + ht_info->iot_action &=3D ~HT_IOT_ACT_FORCED_CTS2SELF; return; } - if (pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) { + if (ht_info->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) { curTxOkCnt =3D priv->stats.txbytesunicast - lastTxOkCnt; curRxOkCnt =3D priv->stats.rxbytesunicast - lastRxOkCnt; if (curRxOkCnt > 4*curTxOkCnt) - pHTInfo->iot_action &=3D ~HT_IOT_ACT_FORCED_CTS2SELF; + ht_info->iot_action &=3D ~HT_IOT_ACT_FORCED_CTS2SELF; else - pHTInfo->iot_action |=3D HT_IOT_ACT_FORCED_CTS2SELF; + ht_info->iot_action |=3D HT_IOT_ACT_FORCED_CTS2SELF; =20 lastTxOkCnt =3D priv->stats.txbytesunicast; lastRxOkCnt =3D priv->stats.rxbytesunicast; @@ -1648,10 +1648,10 @@ static void _rtl92e_dm_cts_to_self(struct net_devic= e *dev) static void _rtl92e_dm_init_wa_broadcom_iot(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv((struct net_device *)dev); - struct rt_hi_throughput *pHTInfo =3D priv->rtllib->pHTInfo; + struct rt_hi_throughput *ht_info =3D priv->rtllib->ht_info; =20 - pHTInfo->bWAIotBroadcom =3D false; - pHTInfo->WAIotTH =3D WAIotTHVal; + ht_info->bWAIotBroadcom =3D false; + ht_info->WAIotTH =3D WAIotTHVal; } =20 static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) @@ -1992,7 +1992,7 @@ static void _rtl92e_dm_fsync_timer_callback(struct ti= mer_list *t) =20 if (priv->rtllib->state =3D=3D RTLLIB_LINKED && priv->rtllib->bfsync_enable && - (priv->rtllib->pHTInfo->iot_action & HT_IOT_ACT_CDD_FSYNC)) { + (priv->rtllib->ht_info->iot_action & HT_IOT_ACT_CDD_FSYNC)) { u32 rate_bitmap; =20 for (rate_index =3D 0; rate_index <=3D 27; rate_index++) { @@ -2163,7 +2163,7 @@ static void _rtl92e_dm_check_fsync(struct net_device = *dev) static u32 reset_cnt; =20 if (priv->rtllib->state =3D=3D RTLLIB_LINKED && - priv->rtllib->pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) { + priv->rtllib->ht_info->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) { if (priv->rtllib->bfsync_enable =3D=3D 0) { switch (priv->rtllib->fsync_state) { case Default_Fsync: @@ -2288,7 +2288,7 @@ static void _rtl92e_dm_dynamic_tx_power(struct net_de= vice *dev) priv->bDynamicTxLowPower =3D false; return; } - if ((priv->rtllib->pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_ATHEROS) && + if ((priv->rtllib->ht_info->IOTPeer =3D=3D HT_IOT_PEER_ATHEROS) && (priv->rtllib->mode =3D=3D IEEE_G)) { txhipower_threshold =3D TX_POWER_ATHEROAP_THRESH_HIGH; txlowpower_threshold =3D TX_POWER_ATHEROAP_THRESH_LOW; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 7ff14aa9f476..bf0030144e5d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -915,7 +915,7 @@ static int _rtl92e_wx_set_encode_ext(struct net_device = *dev, key, 0); } else { if ((ieee->pairwise_key_type =3D=3D KEY_TYPE_CCMP) && - ieee->pHTInfo->bCurrentHTSupport) + ieee->ht_info->bCurrentHTSupport) rtl92e_writeb(dev, 0x173, 1); rtl92e_set_key(dev, 4, idx, alg, (u8 *)ieee->ap_mac_addr, 0, key); diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rt= l8192e/rtl819x_BAProc.c index 7c0369319f97..acc19514bca6 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -244,13 +244,13 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, st= ruct sk_buff *skb) pBaStartSeqCtrl =3D (union sequence_control *)(req + 7); =20 if (!ieee->current_network.qos_data.active || - !ieee->pHTInfo->bCurrentHTSupport || - (ieee->pHTInfo->iot_action & HT_IOT_ACT_REJECT_ADDBA_REQ)) { + !ieee->ht_info->bCurrentHTSupport || + (ieee->ht_info->iot_action & HT_IOT_ACT_REJECT_ADDBA_REQ)) { rc =3D ADDBA_STATUS_REFUSED; netdev_warn(ieee->dev, "Failed to reply on ADDBA_REQ as some capability is not ready(%d, %= d)\n", ieee->current_network.qos_data.active, - ieee->pHTInfo->bCurrentHTSupport); + ieee->ht_info->bCurrentHTSupport); goto OnADDBAReq_Fail; } if (!GetTs(ieee, (struct ts_common_info **)&pTS, dst, @@ -277,7 +277,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, stru= ct sk_buff *skb) pBA->ba_start_seq_ctrl =3D *pBaStartSeqCtrl; =20 if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev) || - (ieee->pHTInfo->iot_action & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT)) + (ieee->ht_info->iot_action & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT)) pBA->ba_param_set.field.buffer_size =3D 1; else pBA->ba_param_set.field.buffer_size =3D 32; @@ -326,13 +326,13 @@ int rtllib_rx_ADDBARsp(struct rtllib_device *ieee, st= ruct sk_buff *skb) pBaTimeoutVal =3D (u16 *)(tag + 7); =20 if (!ieee->current_network.qos_data.active || - !ieee->pHTInfo->bCurrentHTSupport || - !ieee->pHTInfo->bCurrentAMPDUEnable) { + !ieee->ht_info->bCurrentHTSupport || + !ieee->ht_info->bCurrentAMPDUEnable) { netdev_warn(ieee->dev, "reject to ADDBA_RSP as some capability is not ready(%d, %d, %d)\n", ieee->current_network.qos_data.active, - ieee->pHTInfo->bCurrentHTSupport, - ieee->pHTInfo->bCurrentAMPDUEnable); + ieee->ht_info->bCurrentHTSupport, + ieee->ht_info->bCurrentAMPDUEnable); ReasonCode =3D DELBA_REASON_UNKNOWN_BA; goto OnADDBARsp_Reject; } @@ -413,11 +413,11 @@ int rtllib_rx_DELBA(struct rtllib_device *ieee, struc= t sk_buff *skb) } =20 if (!ieee->current_network.qos_data.active || - !ieee->pHTInfo->bCurrentHTSupport) { + !ieee->ht_info->bCurrentHTSupport) { netdev_warn(ieee->dev, "received DELBA while QOS or HT is not supported(%d, %d)\n", ieee->current_network. qos_data.active, - ieee->pHTInfo->bCurrentHTSupport); + ieee->ht_info->bCurrentHTSupport); return -1; } =20 diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 2c4c1cb4cbed..fe30a291e64c 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -69,48 +69,48 @@ static u8 LINKSYS_MARVELL_4400N[3] =3D {0x00, 0x14, 0xa= 4}; =20 void HTUpdateDefaultSetting(struct rtllib_device *ieee) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - pHTInfo->bRegShortGI20MHz =3D 1; - pHTInfo->bRegShortGI40MHz =3D 1; + ht_info->bRegShortGI20MHz =3D 1; + ht_info->bRegShortGI40MHz =3D 1; =20 - pHTInfo->bRegBW40MHz =3D 1; + ht_info->bRegBW40MHz =3D 1; =20 - if (pHTInfo->bRegBW40MHz) - pHTInfo->bRegSuppCCK =3D 1; + if (ht_info->bRegBW40MHz) + ht_info->bRegSuppCCK =3D 1; else - pHTInfo->bRegSuppCCK =3D true; + ht_info->bRegSuppCCK =3D true; =20 - pHTInfo->nAMSDU_MaxSize =3D 7935UL; - pHTInfo->bAMSDU_Support =3D 0; + ht_info->nAMSDU_MaxSize =3D 7935UL; + ht_info->bAMSDU_Support =3D 0; =20 - pHTInfo->bAMPDUEnable =3D 1; - pHTInfo->AMPDU_Factor =3D 2; - pHTInfo->MPDU_Density =3D 0; + ht_info->bAMPDUEnable =3D 1; + ht_info->AMPDU_Factor =3D 2; + ht_info->MPDU_Density =3D 0; =20 - pHTInfo->self_mimo_ps =3D 3; - if (pHTInfo->self_mimo_ps =3D=3D 2) - pHTInfo->self_mimo_ps =3D 3; + ht_info->self_mimo_ps =3D 3; + if (ht_info->self_mimo_ps =3D=3D 2) + ht_info->self_mimo_ps =3D 3; ieee->tx_dis_rate_fallback =3D 0; ieee->tx_use_drv_assinged_rate =3D 0; =20 ieee->bTxEnableFwCalcDur =3D 1; =20 - pHTInfo->reg_rt2rt_aggregation =3D 1; + ht_info->reg_rt2rt_aggregation =3D 1; =20 - pHTInfo->reg_rx_reorder_enable =3D 1; - pHTInfo->rx_reorder_win_size =3D 64; - pHTInfo->rx_reorder_pending_time =3D 30; + ht_info->reg_rx_reorder_enable =3D 1; + ht_info->rx_reorder_win_size =3D 64; + ht_info->rx_reorder_pending_time =3D 30; } =20 static u16 HTMcsToDataRate(struct rtllib_device *ieee, u8 nMcsRate) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - u8 is40MHz =3D (pHTInfo->bCurBW40MHz) ? 1 : 0; - u8 isShortGI =3D (pHTInfo->bCurBW40MHz) ? - ((pHTInfo->bCurShortGI40MHz) ? 1 : 0) : - ((pHTInfo->bCurShortGI20MHz) ? 1 : 0); + u8 is40MHz =3D (ht_info->bCurBW40MHz) ? 1 : 0; + u8 isShortGI =3D (ht_info->bCurBW40MHz) ? + ((ht_info->bCurShortGI40MHz) ? 1 : 0) : + ((ht_info->bCurShortGI20MHz) ? 1 : 0); return MCS_DATA_RATE[is40MHz][isShortGI][(nMcsRate & 0x7f)]; } =20 @@ -166,45 +166,45 @@ bool IsHTHalfNmodeAPs(struct rtllib_device *ieee) =20 static void HTIOTPeerDetermine(struct rtllib_device *ieee) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; struct rtllib_network *net =3D &ieee->current_network; =20 if (net->bssht.bd_rt2rt_aggregation) { - pHTInfo->IOTPeer =3D HT_IOT_PEER_REALTEK; + ht_info->IOTPeer =3D HT_IOT_PEER_REALTEK; if (net->bssht.rt2rt_ht_mode & RT_HT_CAP_USE_92SE) - pHTInfo->IOTPeer =3D HT_IOT_PEER_REALTEK_92SE; + ht_info->IOTPeer =3D HT_IOT_PEER_REALTEK_92SE; if (net->bssht.rt2rt_ht_mode & RT_HT_CAP_USE_SOFTAP) - pHTInfo->IOTPeer =3D HT_IOT_PEER_92U_SOFTAP; + ht_info->IOTPeer =3D HT_IOT_PEER_92U_SOFTAP; } else if (net->broadcom_cap_exist) { - pHTInfo->IOTPeer =3D HT_IOT_PEER_BROADCOM; + ht_info->IOTPeer =3D HT_IOT_PEER_BROADCOM; } else if (!memcmp(net->bssid, UNKNOWN_BORADCOM, 3) || !memcmp(net->bssid, LINKSYSWRT330_LINKSYSWRT300_BROADCOM, 3) || !memcmp(net->bssid, LINKSYSWRT350_LINKSYSWRT150_BROADCOM, 3)) { - pHTInfo->IOTPeer =3D HT_IOT_PEER_BROADCOM; + ht_info->IOTPeer =3D HT_IOT_PEER_BROADCOM; } else if ((memcmp(net->bssid, BELKINF5D8233V1_RALINK, 3) =3D=3D 0) || (memcmp(net->bssid, BELKINF5D82334V3_RALINK, 3) =3D=3D 0) || (memcmp(net->bssid, PCI_RALINK, 3) =3D=3D 0) || (memcmp(net->bssid, EDIMAX_RALINK, 3) =3D=3D 0) || (memcmp(net->bssid, AIRLINK_RALINK, 3) =3D=3D 0) || net->ralink_cap_exist) { - pHTInfo->IOTPeer =3D HT_IOT_PEER_RALINK; + ht_info->IOTPeer =3D HT_IOT_PEER_RALINK; } else if ((net->atheros_cap_exist) || (memcmp(net->bssid, DLINK_ATHEROS_1, 3) =3D=3D 0) || (memcmp(net->bssid, DLINK_ATHEROS_2, 3) =3D=3D 0)) { - pHTInfo->IOTPeer =3D HT_IOT_PEER_ATHEROS; + ht_info->IOTPeer =3D HT_IOT_PEER_ATHEROS; } else if ((memcmp(net->bssid, CISCO_BROADCOM, 3) =3D=3D 0) || net->cisco_cap_exist) { - pHTInfo->IOTPeer =3D HT_IOT_PEER_CISCO; + ht_info->IOTPeer =3D HT_IOT_PEER_CISCO; } else if ((memcmp(net->bssid, LINKSYS_MARVELL_4400N, 3) =3D=3D 0) || net->marvell_cap_exist) { - pHTInfo->IOTPeer =3D HT_IOT_PEER_MARVELL; + ht_info->IOTPeer =3D HT_IOT_PEER_MARVELL; } else if (net->airgo_cap_exist) { - pHTInfo->IOTPeer =3D HT_IOT_PEER_AIRGO; + ht_info->IOTPeer =3D HT_IOT_PEER_AIRGO; } else { - pHTInfo->IOTPeer =3D HT_IOT_PEER_UNKNOWN; + ht_info->IOTPeer =3D HT_IOT_PEER_UNKNOWN; } =20 - netdev_dbg(ieee->dev, "IOTPEER: %x\n", pHTInfo->IOTPeer); + netdev_dbg(ieee->dev, "IOTPEER: %x\n", ht_info->IOTPeer); } =20 static u8 HTIOTActIsDisableMCS14(struct rtllib_device *ieee, u8 *PeerMacAd= dr) @@ -233,7 +233,7 @@ static u8 HTIOTActIsMgntUseCCK6M(struct rtllib_device *= ieee, { u8 retValue =3D 0; =20 - if (ieee->pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) + if (ieee->ht_info->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) retValue =3D 1; =20 return retValue; @@ -243,40 +243,40 @@ static u8 HTIOTActIsCCDFsync(struct rtllib_device *ie= ee) { u8 retValue =3D 0; =20 - if (ieee->pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) + if (ieee->ht_info->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) retValue =3D 1; return retValue; } =20 static void HTIOTActDetermineRaFunc(struct rtllib_device *ieee, bool bPeer= Rx2ss) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - pHTInfo->iot_ra_func &=3D HT_IOT_RAFUNC_DISABLE_ALL; + ht_info->iot_ra_func &=3D HT_IOT_RAFUNC_DISABLE_ALL; =20 - if (pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_RALINK && !bPeerRx2ss) - pHTInfo->iot_ra_func |=3D HT_IOT_RAFUNC_PEER_1R; + if (ht_info->IOTPeer =3D=3D HT_IOT_PEER_RALINK && !bPeerRx2ss) + ht_info->iot_ra_func |=3D HT_IOT_RAFUNC_PEER_1R; =20 - if (pHTInfo->iot_action & HT_IOT_ACT_AMSDU_ENABLE) - pHTInfo->iot_ra_func |=3D HT_IOT_RAFUNC_TX_AMSDU; + if (ht_info->iot_action & HT_IOT_ACT_AMSDU_ENABLE) + ht_info->iot_ra_func |=3D HT_IOT_RAFUNC_TX_AMSDU; } =20 -void HTResetIOTSetting(struct rt_hi_throughput *pHTInfo) +void HTResetIOTSetting(struct rt_hi_throughput *ht_info) { - pHTInfo->iot_action =3D 0; - pHTInfo->IOTPeer =3D HT_IOT_PEER_UNKNOWN; - pHTInfo->iot_ra_func =3D 0; + ht_info->iot_action =3D 0; + ht_info->IOTPeer =3D HT_IOT_PEER_UNKNOWN; + ht_info->iot_ra_func =3D 0; } =20 void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, u8 *len, u8 IsEncrypt, bool bAssoc) { - struct rt_hi_throughput *pHT =3D ieee->pHTInfo; + struct rt_hi_throughput *pHT =3D ieee->ht_info; struct ht_capab_ele *pCapELE =3D NULL; =20 if (!posHTCap || !pHT) { netdev_warn(ieee->dev, - "%s(): posHTCap and pHTInfo are null\n", __func__); + "%s(): posHTCap and ht_info are null\n", __func__); return; } memset(posHTCap, 0, *len); @@ -352,7 +352,7 @@ void HTConstructCapabilityElement(struct rtllib_device = *ieee, u8 *posHTCap, void HTConstructInfoElement(struct rtllib_device *ieee, u8 *posHTInfo, u8 *len, u8 IsEncrypt) { - struct rt_hi_throughput *pHT =3D ieee->pHTInfo; + struct rt_hi_throughput *pHT =3D ieee->ht_info; struct ht_info_ele *pHTInfoEle =3D (struct ht_info_ele *)posHTInfo; =20 if (!posHTInfo || !pHTInfoEle) { @@ -509,7 +509,7 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, =20 void HTOnAssocRsp(struct rtllib_device *ieee) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; struct ht_capab_ele *pPeerHTCap =3D NULL; struct ht_info_ele *pPeerHTInfo =3D NULL; u16 nMaxAMSDUSize =3D 0; @@ -518,22 +518,22 @@ void HTOnAssocRsp(struct rtllib_device *ieee) static const u8 EWC11NHTCap[] =3D { 0x00, 0x90, 0x4c, 0x33 }; static const u8 EWC11NHTInfo[] =3D { 0x00, 0x90, 0x4c, 0x34 }; =20 - if (!pHTInfo->bCurrentHTSupport) { + if (!ht_info->bCurrentHTSupport) { netdev_warn(ieee->dev, "%s(): HT_DISABLE\n", __func__); return; } netdev_dbg(ieee->dev, "%s(): HT_ENABLE\n", __func__); =20 - if (!memcmp(pHTInfo->PeerHTCapBuf, EWC11NHTCap, sizeof(EWC11NHTCap))) - pPeerHTCap =3D (struct ht_capab_ele *)(&pHTInfo->PeerHTCapBuf[4]); + if (!memcmp(ht_info->PeerHTCapBuf, EWC11NHTCap, sizeof(EWC11NHTCap))) + pPeerHTCap =3D (struct ht_capab_ele *)(&ht_info->PeerHTCapBuf[4]); else - pPeerHTCap =3D (struct ht_capab_ele *)(pHTInfo->PeerHTCapBuf); + pPeerHTCap =3D (struct ht_capab_ele *)(ht_info->PeerHTCapBuf); =20 - if (!memcmp(pHTInfo->PeerHTInfoBuf, EWC11NHTInfo, sizeof(EWC11NHTInfo))) + if (!memcmp(ht_info->PeerHTInfoBuf, EWC11NHTInfo, sizeof(EWC11NHTInfo))) pPeerHTInfo =3D (struct ht_info_ele *) - (&pHTInfo->PeerHTInfoBuf[4]); + (&ht_info->PeerHTInfoBuf[4]); else - pPeerHTInfo =3D (struct ht_info_ele *)(pHTInfo->PeerHTInfoBuf); + pPeerHTInfo =3D (struct ht_info_ele *)(ht_info->PeerHTInfoBuf); =20 #ifdef VERBOSE_DEBUG print_hex_dump_bytes("%s: ", __func__, DUMP_PREFIX_NONE, @@ -541,63 +541,63 @@ void HTOnAssocRsp(struct rtllib_device *ieee) #endif HTSetConnectBwMode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), (enum ht_extchnl_offset)(pPeerHTInfo->ExtChlOffset)); - pHTInfo->cur_tx_bw40mhz =3D ((pPeerHTInfo->RecommemdedTxWidth =3D=3D 1) ? + ht_info->cur_tx_bw40mhz =3D ((pPeerHTInfo->RecommemdedTxWidth =3D=3D 1) ? true : false); =20 - pHTInfo->bCurShortGI20MHz =3D ((pHTInfo->bRegShortGI20MHz) ? + ht_info->bCurShortGI20MHz =3D ((ht_info->bRegShortGI20MHz) ? ((pPeerHTCap->ShortGI20Mhz =3D=3D 1) ? true : false) : false); - pHTInfo->bCurShortGI40MHz =3D ((pHTInfo->bRegShortGI40MHz) ? + ht_info->bCurShortGI40MHz =3D ((ht_info->bRegShortGI40MHz) ? ((pPeerHTCap->ShortGI40Mhz =3D=3D 1) ? true : false) : false); =20 - pHTInfo->bCurSuppCCK =3D ((pHTInfo->bRegSuppCCK) ? + ht_info->bCurSuppCCK =3D ((ht_info->bRegSuppCCK) ? ((pPeerHTCap->DssCCk =3D=3D 1) ? true : false) : false); =20 - pHTInfo->bCurrent_AMSDU_Support =3D pHTInfo->bAMSDU_Support; + ht_info->bCurrent_AMSDU_Support =3D ht_info->bAMSDU_Support; =20 nMaxAMSDUSize =3D (pPeerHTCap->MaxAMSDUSize =3D=3D 0) ? 3839 : 7935; =20 - if (pHTInfo->nAMSDU_MaxSize > nMaxAMSDUSize) - pHTInfo->nCurrent_AMSDU_MaxSize =3D nMaxAMSDUSize; + if (ht_info->nAMSDU_MaxSize > nMaxAMSDUSize) + ht_info->nCurrent_AMSDU_MaxSize =3D nMaxAMSDUSize; else - pHTInfo->nCurrent_AMSDU_MaxSize =3D pHTInfo->nAMSDU_MaxSize; + ht_info->nCurrent_AMSDU_MaxSize =3D ht_info->nAMSDU_MaxSize; =20 - pHTInfo->bCurrentAMPDUEnable =3D pHTInfo->bAMPDUEnable; + ht_info->bCurrentAMPDUEnable =3D ht_info->bAMPDUEnable; if (ieee->rtllib_ap_sec_type && (ieee->rtllib_ap_sec_type(ieee) & (SEC_ALG_WEP | SEC_ALG_TKIP))) { - if ((pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_ATHEROS) || - (pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_UNKNOWN)) - pHTInfo->bCurrentAMPDUEnable =3D false; + if ((ht_info->IOTPeer =3D=3D HT_IOT_PEER_ATHEROS) || + (ht_info->IOTPeer =3D=3D HT_IOT_PEER_UNKNOWN)) + ht_info->bCurrentAMPDUEnable =3D false; } =20 - if (!pHTInfo->reg_rt2rt_aggregation) { - if (pHTInfo->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor) - pHTInfo->CurrentAMPDUFactor =3D + if (!ht_info->reg_rt2rt_aggregation) { + if (ht_info->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor) + ht_info->CurrentAMPDUFactor =3D pPeerHTCap->MaxRxAMPDUFactor; else - pHTInfo->CurrentAMPDUFactor =3D pHTInfo->AMPDU_Factor; + ht_info->CurrentAMPDUFactor =3D ht_info->AMPDU_Factor; =20 } else { if (ieee->current_network.bssht.bd_rt2rt_aggregation) { if (ieee->pairwise_key_type !=3D KEY_TYPE_NA) - pHTInfo->CurrentAMPDUFactor =3D + ht_info->CurrentAMPDUFactor =3D pPeerHTCap->MaxRxAMPDUFactor; else - pHTInfo->CurrentAMPDUFactor =3D HT_AGG_SIZE_64K; + ht_info->CurrentAMPDUFactor =3D HT_AGG_SIZE_64K; } else { - pHTInfo->CurrentAMPDUFactor =3D min_t(u32, pPeerHTCap->MaxRxAMPDUFactor, + ht_info->CurrentAMPDUFactor =3D min_t(u32, pPeerHTCap->MaxRxAMPDUFactor, HT_AGG_SIZE_32K); } } - pHTInfo->current_mpdu_density =3D max_t(u8, pHTInfo->MPDU_Density, + ht_info->current_mpdu_density =3D max_t(u8, ht_info->MPDU_Density, pPeerHTCap->MPDUDensity); - if (pHTInfo->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { - pHTInfo->bCurrentAMPDUEnable =3D false; - pHTInfo->ForcedAMSDUMode =3D HT_AGG_FORCE_ENABLE; + if (ht_info->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { + ht_info->bCurrentAMPDUEnable =3D false; + ht_info->ForcedAMSDUMode =3D HT_AGG_FORCE_ENABLE; } - pHTInfo->cur_rx_reorder_enable =3D pHTInfo->reg_rx_reorder_enable; + ht_info->cur_rx_reorder_enable =3D ht_info->reg_rx_reorder_enable; =20 if (pPeerHTCap->MCS[0] =3D=3D 0) pPeerHTCap->MCS[0] =3D 0xff; @@ -606,8 +606,8 @@ void HTOnAssocRsp(struct rtllib_device *ieee) =20 HTFilterMCSRate(ieee, pPeerHTCap->MCS, ieee->dot11ht_oper_rate_set); =20 - pHTInfo->peer_mimo_ps =3D pPeerHTCap->MimoPwrSave; - if (pHTInfo->peer_mimo_ps =3D=3D MIMO_PS_STATIC) + ht_info->peer_mimo_ps =3D pPeerHTCap->MimoPwrSave; + if (ht_info->peer_mimo_ps =3D=3D MIMO_PS_STATIC) pMcsFilter =3D MCS_FILTER_1SS; else pMcsFilter =3D MCS_FILTER_ALL; @@ -616,49 +616,49 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pMcsFilter); ieee->HTCurrentOperaRate =3D ieee->HTHighestOperaRate; =20 - pHTInfo->current_op_mode =3D pPeerHTInfo->OptMode; + ht_info->current_op_mode =3D pPeerHTInfo->OptMode; } =20 void HTInitializeHTInfo(struct rtllib_device *ieee) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - pHTInfo->bCurrentHTSupport =3D false; + ht_info->bCurrentHTSupport =3D false; =20 - pHTInfo->bCurBW40MHz =3D false; - pHTInfo->cur_tx_bw40mhz =3D false; + ht_info->bCurBW40MHz =3D false; + ht_info->cur_tx_bw40mhz =3D false; =20 - pHTInfo->bCurShortGI20MHz =3D false; - pHTInfo->bCurShortGI40MHz =3D false; - pHTInfo->forced_short_gi =3D false; + ht_info->bCurShortGI20MHz =3D false; + ht_info->bCurShortGI40MHz =3D false; + ht_info->forced_short_gi =3D false; =20 - pHTInfo->bCurSuppCCK =3D true; + ht_info->bCurSuppCCK =3D true; =20 - pHTInfo->bCurrent_AMSDU_Support =3D false; - pHTInfo->nCurrent_AMSDU_MaxSize =3D pHTInfo->nAMSDU_MaxSize; - pHTInfo->current_mpdu_density =3D pHTInfo->MPDU_Density; - pHTInfo->CurrentAMPDUFactor =3D pHTInfo->AMPDU_Factor; + ht_info->bCurrent_AMSDU_Support =3D false; + ht_info->nCurrent_AMSDU_MaxSize =3D ht_info->nAMSDU_MaxSize; + ht_info->current_mpdu_density =3D ht_info->MPDU_Density; + ht_info->CurrentAMPDUFactor =3D ht_info->AMPDU_Factor; =20 - memset((void *)(&pHTInfo->SelfHTCap), 0, - sizeof(pHTInfo->SelfHTCap)); - memset((void *)(&pHTInfo->SelfHTInfo), 0, - sizeof(pHTInfo->SelfHTInfo)); - memset((void *)(&pHTInfo->PeerHTCapBuf), 0, - sizeof(pHTInfo->PeerHTCapBuf)); - memset((void *)(&pHTInfo->PeerHTInfoBuf), 0, - sizeof(pHTInfo->PeerHTInfoBuf)); + memset((void *)(&ht_info->SelfHTCap), 0, + sizeof(ht_info->SelfHTCap)); + memset((void *)(&ht_info->SelfHTInfo), 0, + sizeof(ht_info->SelfHTInfo)); + memset((void *)(&ht_info->PeerHTCapBuf), 0, + sizeof(ht_info->PeerHTCapBuf)); + memset((void *)(&ht_info->PeerHTInfoBuf), 0, + sizeof(ht_info->PeerHTInfoBuf)); =20 - pHTInfo->sw_bw_in_progress =3D false; + ht_info->sw_bw_in_progress =3D false; =20 - pHTInfo->ePeerHTSpecVer =3D HT_SPEC_VER_IEEE; + ht_info->ePeerHTSpecVer =3D HT_SPEC_VER_IEEE; =20 - pHTInfo->current_rt2rt_aggregation =3D false; - pHTInfo->current_rt2rt_long_slot_time =3D false; - pHTInfo->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; + ht_info->current_rt2rt_aggregation =3D false; + ht_info->current_rt2rt_long_slot_time =3D false; + ht_info->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; =20 - pHTInfo->IOTPeer =3D 0; - pHTInfo->iot_action =3D 0; - pHTInfo->iot_ra_func =3D 0; + ht_info->IOTPeer =3D 0; + ht_info->iot_action =3D 0; + ht_info->iot_ra_func =3D 0; =20 { u8 *RegHTSuppRateSets =3D &ieee->reg_ht_supp_rate_set[0]; @@ -687,114 +687,114 @@ void HTInitializeBssDesc(struct bss_ht *pBssHT) void HTResetSelfAndSavePeerSetting(struct rtllib_device *ieee, struct rtllib_network *pNetwork) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; u8 bIOTAction =3D 0; =20 /* 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) { - pHTInfo->bCurrentHTSupport =3D true; - pHTInfo->ePeerHTSpecVer =3D pNetwork->bssht.bd_ht_spec_ver; + ht_info->bCurrentHTSupport =3D true; + ht_info->ePeerHTSpecVer =3D pNetwork->bssht.bd_ht_spec_ver; =20 if (pNetwork->bssht.bd_ht_cap_len > 0 && - pNetwork->bssht.bd_ht_cap_len <=3D sizeof(pHTInfo->PeerHTCapBuf)) - memcpy(pHTInfo->PeerHTCapBuf, + pNetwork->bssht.bd_ht_cap_len <=3D sizeof(ht_info->PeerHTCapBuf)) + memcpy(ht_info->PeerHTCapBuf, pNetwork->bssht.bd_ht_cap_buf, pNetwork->bssht.bd_ht_cap_len); =20 if (pNetwork->bssht.bd_ht_info_len > 0 && pNetwork->bssht.bd_ht_info_len <=3D - sizeof(pHTInfo->PeerHTInfoBuf)) - memcpy(pHTInfo->PeerHTInfoBuf, + sizeof(ht_info->PeerHTInfoBuf)) + memcpy(ht_info->PeerHTInfoBuf, pNetwork->bssht.bd_ht_info_buf, pNetwork->bssht.bd_ht_info_len); =20 - if (pHTInfo->reg_rt2rt_aggregation) { - pHTInfo->current_rt2rt_aggregation =3D + if (ht_info->reg_rt2rt_aggregation) { + ht_info->current_rt2rt_aggregation =3D pNetwork->bssht.bd_rt2rt_aggregation; - pHTInfo->current_rt2rt_long_slot_time =3D + ht_info->current_rt2rt_long_slot_time =3D pNetwork->bssht.bd_rt2rt_long_slot_time; - pHTInfo->RT2RT_HT_Mode =3D pNetwork->bssht.rt2rt_ht_mode; + ht_info->RT2RT_HT_Mode =3D pNetwork->bssht.rt2rt_ht_mode; } else { - pHTInfo->current_rt2rt_aggregation =3D false; - pHTInfo->current_rt2rt_long_slot_time =3D false; - pHTInfo->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; + ht_info->current_rt2rt_aggregation =3D false; + ht_info->current_rt2rt_long_slot_time =3D false; + ht_info->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; } =20 HTIOTPeerDetermine(ieee); =20 - pHTInfo->iot_action =3D 0; + ht_info->iot_action =3D 0; bIOTAction =3D HTIOTActIsDisableMCS14(ieee, pNetwork->bssid); if (bIOTAction) - pHTInfo->iot_action |=3D HT_IOT_ACT_DISABLE_MCS14; + ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_MCS14; =20 bIOTAction =3D HTIOTActIsDisableMCS15(ieee); if (bIOTAction) - pHTInfo->iot_action |=3D HT_IOT_ACT_DISABLE_MCS15; + ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_MCS15; =20 bIOTAction =3D HTIOTActIsDisableMCSTwoSpatialStream(ieee); if (bIOTAction) - pHTInfo->iot_action |=3D HT_IOT_ACT_DISABLE_ALL_2SS; + ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_ALL_2SS; =20 bIOTAction =3D HTIOTActIsDisableEDCATurbo(ieee, pNetwork->bssid); if (bIOTAction) - pHTInfo->iot_action |=3D HT_IOT_ACT_DISABLE_EDCA_TURBO; + ht_info->iot_action |=3D HT_IOT_ACT_DISABLE_EDCA_TURBO; =20 bIOTAction =3D HTIOTActIsMgntUseCCK6M(ieee, pNetwork); if (bIOTAction) - pHTInfo->iot_action |=3D HT_IOT_ACT_MGNT_USE_CCK_6M; + ht_info->iot_action |=3D HT_IOT_ACT_MGNT_USE_CCK_6M; bIOTAction =3D HTIOTActIsCCDFsync(ieee); if (bIOTAction) - pHTInfo->iot_action |=3D HT_IOT_ACT_CDD_FSYNC; + ht_info->iot_action |=3D HT_IOT_ACT_CDD_FSYNC; } else { - pHTInfo->bCurrentHTSupport =3D false; - pHTInfo->current_rt2rt_aggregation =3D false; - pHTInfo->current_rt2rt_long_slot_time =3D false; - pHTInfo->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; + ht_info->bCurrentHTSupport =3D false; + ht_info->current_rt2rt_aggregation =3D false; + ht_info->current_rt2rt_long_slot_time =3D false; + ht_info->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; =20 - pHTInfo->iot_action =3D 0; - pHTInfo->iot_ra_func =3D 0; + ht_info->iot_action =3D 0; + ht_info->iot_ra_func =3D 0; } } =20 void HT_update_self_and_peer_setting(struct rtllib_device *ieee, struct rtllib_network *pNetwork) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; struct ht_info_ele *pPeerHTInfo =3D (struct ht_info_ele *)pNetwork->bssht.bd_ht_info_buf; =20 - if (pHTInfo->bCurrentHTSupport) { + if (ht_info->bCurrentHTSupport) { if (pNetwork->bssht.bd_ht_info_len !=3D 0) - pHTInfo->current_op_mode =3D pPeerHTInfo->OptMode; + ht_info->current_op_mode =3D pPeerHTInfo->OptMode; } } EXPORT_SYMBOL(HT_update_self_and_peer_setting); =20 void HTUseDefaultSetting(struct rtllib_device *ieee) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - if (pHTInfo->enable_ht) { - pHTInfo->bCurrentHTSupport =3D true; - pHTInfo->bCurSuppCCK =3D pHTInfo->bRegSuppCCK; + if (ht_info->enable_ht) { + ht_info->bCurrentHTSupport =3D true; + ht_info->bCurSuppCCK =3D ht_info->bRegSuppCCK; =20 - pHTInfo->bCurBW40MHz =3D pHTInfo->bRegBW40MHz; - pHTInfo->bCurShortGI20MHz =3D pHTInfo->bRegShortGI20MHz; + ht_info->bCurBW40MHz =3D ht_info->bRegBW40MHz; + ht_info->bCurShortGI20MHz =3D ht_info->bRegShortGI20MHz; =20 - pHTInfo->bCurShortGI40MHz =3D pHTInfo->bRegShortGI40MHz; + ht_info->bCurShortGI40MHz =3D ht_info->bRegShortGI40MHz; =20 if (ieee->iw_mode =3D=3D IW_MODE_ADHOC) ieee->current_network.qos_data.active =3D ieee->current_network.qos_data.supported; - pHTInfo->bCurrent_AMSDU_Support =3D pHTInfo->bAMSDU_Support; - pHTInfo->nCurrent_AMSDU_MaxSize =3D pHTInfo->nAMSDU_MaxSize; + ht_info->bCurrent_AMSDU_Support =3D ht_info->bAMSDU_Support; + ht_info->nCurrent_AMSDU_MaxSize =3D ht_info->nAMSDU_MaxSize; =20 - pHTInfo->bCurrentAMPDUEnable =3D pHTInfo->bAMPDUEnable; - pHTInfo->CurrentAMPDUFactor =3D pHTInfo->AMPDU_Factor; + ht_info->bCurrentAMPDUEnable =3D ht_info->bAMPDUEnable; + ht_info->CurrentAMPDUFactor =3D ht_info->AMPDU_Factor; =20 - pHTInfo->current_mpdu_density =3D pHTInfo->current_mpdu_density; + ht_info->current_mpdu_density =3D ht_info->current_mpdu_density; =20 HTFilterMCSRate(ieee, ieee->reg_dot11tx_ht_oper_rate_set, ieee->dot11ht_oper_rate_set); @@ -804,13 +804,13 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) ieee->HTCurrentOperaRate =3D ieee->HTHighestOperaRate; =20 } else { - pHTInfo->bCurrentHTSupport =3D false; + ht_info->bCurrentHTSupport =3D false; } } =20 u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame) { - if (ieee->pHTInfo->bCurrentHTSupport) { + if (ieee->ht_info->bCurrentHTSupport) { if ((IsQoSDataFrame(pFrame) && Frame_Order(pFrame)) =3D=3D 1) { netdev_dbg(ieee->dev, "HT CONTROL FILED EXIST!!\n"); return true; @@ -821,13 +821,13 @@ u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame) =20 static void HTSetConnectBwModeCallback(struct rtllib_device *ieee) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - if (pHTInfo->bCurBW40MHz) { - if (pHTInfo->CurSTAExtChnlOffset =3D=3D HT_EXTCHNL_OFFSET_UPPER) + if (ht_info->bCurBW40MHz) { + if (ht_info->CurSTAExtChnlOffset =3D=3D HT_EXTCHNL_OFFSET_UPPER) ieee->set_chan(ieee->dev, ieee->current_network.channel + 2); - else if (pHTInfo->CurSTAExtChnlOffset =3D=3D + else if (ht_info->CurSTAExtChnlOffset =3D=3D HT_EXTCHNL_OFFSET_LOWER) ieee->set_chan(ieee->dev, ieee->current_network.channel - 2); @@ -836,29 +836,29 @@ static void HTSetConnectBwModeCallback(struct rtllib_= device *ieee) ieee->current_network.channel); =20 ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20_40, - pHTInfo->CurSTAExtChnlOffset); + ht_info->CurSTAExtChnlOffset); } else { ieee->set_chan(ieee->dev, ieee->current_network.channel); ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); } =20 - pHTInfo->sw_bw_in_progress =3D false; + ht_info->sw_bw_in_progress =3D false; } =20 void HTSetConnectBwMode(struct rtllib_device *ieee, enum ht_channel_width bandwidth, enum ht_extchnl_offset Offset) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 - if (!pHTInfo->bRegBW40MHz) + if (!ht_info->bRegBW40MHz) return; =20 if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) bandwidth =3D HT_CHANNEL_WIDTH_20; =20 - if (pHTInfo->sw_bw_in_progress) { + if (ht_info->sw_bw_in_progress) { pr_info("%s: sw_bw_in_progress!!\n", __func__); return; } @@ -868,21 +868,21 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, Offset =3D HT_EXTCHNL_OFFSET_NO_EXT; if (Offset =3D=3D HT_EXTCHNL_OFFSET_UPPER || Offset =3D=3D HT_EXTCHNL_OFFSET_LOWER) { - pHTInfo->bCurBW40MHz =3D true; - pHTInfo->CurSTAExtChnlOffset =3D Offset; + ht_info->bCurBW40MHz =3D true; + ht_info->CurSTAExtChnlOffset =3D Offset; } else { - pHTInfo->bCurBW40MHz =3D false; - pHTInfo->CurSTAExtChnlOffset =3D HT_EXTCHNL_OFFSET_NO_EXT; + ht_info->bCurBW40MHz =3D false; + ht_info->CurSTAExtChnlOffset =3D HT_EXTCHNL_OFFSET_NO_EXT; } } else { - pHTInfo->bCurBW40MHz =3D false; - pHTInfo->CurSTAExtChnlOffset =3D HT_EXTCHNL_OFFSET_NO_EXT; + ht_info->bCurBW40MHz =3D false; + ht_info->CurSTAExtChnlOffset =3D HT_EXTCHNL_OFFSET_NO_EXT; } =20 - netdev_dbg(ieee->dev, "%s():pHTInfo->bCurBW40MHz:%x\n", __func__, - pHTInfo->bCurBW40MHz); + netdev_dbg(ieee->dev, "%s():ht_info->bCurBW40MHz:%x\n", __func__, + ht_info->bCurBW40MHz); =20 - pHTInfo->sw_bw_in_progress =3D true; + ht_info->sw_bw_in_progress =3D true; =20 HTSetConnectBwModeCallback(ieee); } diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 05c7e822f372..68c131afc2ba 100644 --- a/drivers/staging/rtl8192e/rtl819x_TSProc.c +++ b/drivers/staging/rtl8192e/rtl819x_TSProc.c @@ -83,7 +83,7 @@ static void RxPktPendingTimeout(struct timer_list *t) if (bPktInBuf && (pRxTs->rx_timeout_indicate_seq =3D=3D 0xffff)) { pRxTs->rx_timeout_indicate_seq =3D pRxTs->rx_indicate_seq; mod_timer(&pRxTs->rx_pkt_pending_timer, jiffies + - msecs_to_jiffies(ieee->pHTInfo->rx_reorder_pending_time) + msecs_to_jiffies(ieee->ht_info->rx_reorder_pending_time) ); } spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 9c81ca38f4b1..7119c9c5e1fe 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1432,7 +1432,7 @@ struct rtllib_device { RT_RF_CHANGE_SOURCE rf_off_reason; bool is_set_key; bool wx_set_enc; - struct rt_hi_throughput *pHTInfo; + struct rt_hi_throughput *ht_info; =20 spinlock_t reorder_spinlock; u8 reg_dot11ht_oper_rate_set[16]; @@ -2089,7 +2089,7 @@ u8 HTGetHighestMCSRate(struct rtllib_device *ieee, u8= *pMCSRateSet, extern u8 MCS_FILTER_ALL[]; extern u16 MCS_DATA_RATE[2][2][77]; u8 HTCCheck(struct rtllib_device *ieee, u8 *pFrame); -void HTResetIOTSetting(struct rt_hi_throughput *pHTInfo); +void HTResetIOTSetting(struct rt_hi_throughput *ht_info); bool IsHTHalfNmodeAPs(struct rtllib_device *ieee); u16 TxCountToDataRate(struct rtllib_device *ieee, u8 nDataRate); int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, struct sk_buff *skb); diff --git a/drivers/staging/rtl8192e/rtllib_module.c b/drivers/staging/rtl= 8192e/rtllib_module.c index ce8b73f437a3..d6a4d6b4ec57 100644 --- a/drivers/staging/rtl8192e/rtllib_module.c +++ b/drivers/staging/rtl8192e/rtllib_module.c @@ -125,8 +125,8 @@ struct net_device *alloc_rtllib(int sizeof_priv) if (err) goto free_crypt_info; =20 - ieee->pHTInfo =3D kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL); - if (!ieee->pHTInfo) + ieee->ht_info =3D kzalloc(sizeof(struct rt_hi_throughput), GFP_KERNEL); + if (!ieee->ht_info) goto free_softmac; =20 HTUpdateDefaultSetting(ieee); @@ -160,7 +160,7 @@ void free_rtllib(struct net_device *dev) struct rtllib_device *ieee =3D (struct rtllib_device *) netdev_priv_rsl(dev); =20 - kfree(ieee->pHTInfo); + kfree(ieee->ht_info); rtllib_softmac_free(ieee); =20 lib80211_crypt_info_free(&ieee->crypt_info); diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 75190c389ccf..6a0f5bbb99ef 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -567,9 +567,9 @@ static void RxReorderIndicatePacket(struct rtllib_devic= e *ieee, struct rtllib_rxb *prxb, struct rx_ts_record *pTS, u16 SeqNum) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; struct rx_reorder_entry *pReorderEntry =3D NULL; - u8 WinSize =3D pHTInfo->rx_reorder_win_size; + u8 WinSize =3D ht_info->rx_reorder_win_size; u16 WinEnd =3D 0; u8 index =3D 0; bool bMatchWinStart =3D false, bPktInBuf =3D false; @@ -591,7 +591,7 @@ static void RxReorderIndicatePacket(struct rtllib_devic= e *ieee, netdev_dbg(ieee->dev, "Packet Drop! IndicateSeq: %d, NewSeq: %d\n", pTS->rx_indicate_seq, SeqNum); - pHTInfo->rx_reorder_drop_counter++; + ht_info->rx_reorder_drop_counter++; { int i; =20 @@ -755,7 +755,7 @@ static void RxReorderIndicatePacket(struct rtllib_devic= e *ieee, netdev_dbg(ieee->dev, "%s(): SET rx timeout timer\n", __func__); pTS->rx_timeout_indicate_seq =3D pTS->rx_indicate_seq; mod_timer(&pTS->rx_pkt_pending_timer, jiffies + - msecs_to_jiffies(pHTInfo->rx_reorder_pending_time)); + msecs_to_jiffies(ht_info->rx_reorder_pending_time)); } spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); } @@ -924,7 +924,7 @@ static int rtllib_rx_check_duplicate(struct rtllib_devi= ce *ieee, sc =3D le16_to_cpu(hdr->seq_ctl); frag =3D WLAN_GET_SEQ_FRAG(sc); =20 - if (!ieee->pHTInfo->cur_rx_reorder_enable || + if (!ieee->ht_info->cur_rx_reorder_enable || !ieee->current_network.qos_data.active || !IsDataFrame(skb->data) || IsLegacyDataFrame(skb->data)) { @@ -1442,7 +1442,7 @@ static int rtllib_rx_InfraAdhoc(struct rtllib_device = *ieee, struct sk_buff *skb, } =20 /* Indicate packets to upper layer or Rx Reorder */ - if (!ieee->pHTInfo->cur_rx_reorder_enable || pTS =3D=3D NULL || bToOtherS= TA) + if (!ieee->ht_info->cur_rx_reorder_enable || pTS =3D=3D NULL || bToOtherS= TA) rtllib_rx_indicate_pkt_legacy(ieee, rx_stats, rxb, dst, src); else RxReorderIndicatePacket(ieee, rxb, pTS, SeqNum); diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 8b1d88061125..2552aa089700 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -176,10 +176,10 @@ u8 MgntQuery_TxRateExcludeCCKRates(struct rtllib_devi= ce *ieee) =20 static u8 MgntQuery_MgntFrameTxRate(struct rtllib_device *ieee) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; u8 rate; =20 - if (pHTInfo->iot_action & HT_IOT_ACT_MGNT_USE_CCK_6M) + if (ht_info->iot_action & HT_IOT_ACT_MGNT_USE_CCK_6M) rate =3D 0x0c; else rate =3D ieee->basic_rate & 0x7f; @@ -187,7 +187,7 @@ static u8 MgntQuery_MgntFrameTxRate(struct rtllib_devic= e *ieee) if (rate =3D=3D 0) { if (ieee->mode =3D=3D IEEE_A || ieee->mode =3D=3D IEEE_N_5G || - (ieee->mode =3D=3D IEEE_N_24G && !pHTInfo->bCurSuppCCK)) + (ieee->mode =3D=3D IEEE_N_24G && !ht_info->bCurSuppCCK)) rate =3D 0x0c; else rate =3D 0x02; @@ -829,7 +829,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_= device *ieee, u8 tmp_ht_cap_len =3D 0; u8 *tmp_ht_info_buf =3D NULL; u8 tmp_ht_info_len =3D 0; - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; u8 *tmp_generic_ie_buf =3D NULL; u8 tmp_generic_ie_len =3D 0; =20 @@ -843,7 +843,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_= device *ieee, =20 if ((ieee->current_network.mode =3D=3D IEEE_G) || (ieee->current_network.mode =3D=3D IEEE_N_24G && - ieee->pHTInfo->bCurSuppCCK)) { + ieee->ht_info->bCurSuppCCK)) { erp_len =3D 3; erpinfo_content =3D 0; if (ieee->current_network.buseprotection) @@ -854,20 +854,20 @@ static struct sk_buff *rtllib_probe_resp(struct rtlli= b_device *ieee, crypt =3D ieee->crypt_info.crypt[ieee->crypt_info.tx_keyidx]; encrypt =3D ieee->host_encrypt && crypt && crypt->ops && ((strcmp(crypt->ops->name, "R-WEP") =3D=3D 0 || wpa_ie_len)); - if (ieee->pHTInfo->bCurrentHTSupport) { - tmp_ht_cap_buf =3D (u8 *)&(ieee->pHTInfo->SelfHTCap); - tmp_ht_cap_len =3D sizeof(ieee->pHTInfo->SelfHTCap); - tmp_ht_info_buf =3D (u8 *)&(ieee->pHTInfo->SelfHTInfo); - tmp_ht_info_len =3D sizeof(ieee->pHTInfo->SelfHTInfo); + if (ieee->ht_info->bCurrentHTSupport) { + tmp_ht_cap_buf =3D (u8 *)&(ieee->ht_info->SelfHTCap); + tmp_ht_cap_len =3D sizeof(ieee->ht_info->SelfHTCap); + tmp_ht_info_buf =3D (u8 *)&(ieee->ht_info->SelfHTInfo); + tmp_ht_info_len =3D sizeof(ieee->ht_info->SelfHTInfo); HTConstructCapabilityElement(ieee, tmp_ht_cap_buf, &tmp_ht_cap_len, encrypt, false); HTConstructInfoElement(ieee, tmp_ht_info_buf, &tmp_ht_info_len, encrypt); =20 - if (pHTInfo->reg_rt2rt_aggregation) { - tmp_generic_ie_buf =3D ieee->pHTInfo->sz_rt2rt_agg_buf; + if (ht_info->reg_rt2rt_aggregation) { + tmp_generic_ie_buf =3D ieee->ht_info->sz_rt2rt_agg_buf; tmp_generic_ie_len =3D - sizeof(ieee->pHTInfo->sz_rt2rt_agg_buf); + sizeof(ieee->ht_info->sz_rt2rt_agg_buf); HTConstructRT2RTAggElement(ieee, tmp_generic_ie_buf, &tmp_generic_ie_len); } @@ -1179,19 +1179,19 @@ 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->enable_ht =3D 0; + ieee->ht_info->enable_ht =3D 0; ieee->mode =3D WIRELESS_MODE_G; } =20 - if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) { - ht_cap_buf =3D (u8 *)&(ieee->pHTInfo->SelfHTCap); - ht_cap_len =3D sizeof(ieee->pHTInfo->SelfHTCap); + if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) { + ht_cap_buf =3D (u8 *)&(ieee->ht_info->SelfHTCap); + ht_cap_len =3D sizeof(ieee->ht_info->SelfHTCap); HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len, encrypt, true); - if (ieee->pHTInfo->current_rt2rt_aggregation) { - realtek_ie_buf =3D ieee->pHTInfo->sz_rt2rt_agg_buf; + if (ieee->ht_info->current_rt2rt_aggregation) { + realtek_ie_buf =3D ieee->ht_info->sz_rt2rt_agg_buf; realtek_ie_len =3D - sizeof(ieee->pHTInfo->sz_rt2rt_agg_buf); + sizeof(ieee->ht_info->sz_rt2rt_agg_buf); HTConstructRT2RTAggElement(ieee, realtek_ie_buf, &realtek_ie_len); } @@ -1324,8 +1324,8 @@ rtllib_association_req(struct rtllib_network *beacon, memcpy(tag, osCcxVerNum.Octet, osCcxVerNum.Length); tag +=3D osCcxVerNum.Length; } - if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) { - if (ieee->pHTInfo->ePeerHTSpecVer !=3D HT_SPEC_VER_EWC) { + if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) { + if (ieee->ht_info->ePeerHTSpecVer !=3D HT_SPEC_VER_EWC) { tag =3D skb_put(skb, ht_cap_len); *tag++ =3D MFIE_TYPE_HT_CAP; *tag++ =3D ht_cap_len - 2; @@ -1358,8 +1358,8 @@ rtllib_association_req(struct rtllib_network *beacon, rtllib_TURBO_Info(ieee, &tag); } =20 - if (ieee->pHTInfo->bCurrentHTSupport && ieee->pHTInfo->enable_ht) { - if (ieee->pHTInfo->ePeerHTSpecVer =3D=3D HT_SPEC_VER_EWC) { + if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht) { + if (ieee->ht_info->ePeerHTSpecVer =3D=3D HT_SPEC_VER_EWC) { tag =3D skb_put(skb, ht_cap_len); *tag++ =3D MFIE_TYPE_GENERIC; *tag++ =3D ht_cap_len - 2; @@ -1367,7 +1367,7 @@ rtllib_association_req(struct rtllib_network *beacon, tag +=3D ht_cap_len - 2; } =20 - if (ieee->pHTInfo->current_rt2rt_aggregation) { + if (ieee->ht_info->current_rt2rt_aggregation) { tag =3D skb_put(skb, realtek_ie_len); *tag++ =3D MFIE_TYPE_GENERIC; *tag++ =3D realtek_ie_len - 2; @@ -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->enable_ht) { + if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->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->enable_ht); + ieee->ht_info->bCurrentHTSupport, + ieee->ht_info->enable_ht); memset(ieee->dot11ht_oper_rate_set, 0, 16); } ieee->link_detect_info.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->enable_ht, + ieee->ht_info->enable_ht, ieee->current_network.bssht.bd_support_ht, ieee->current_network.mode, ieee->current_network.flags); @@ -1693,7 +1693,7 @@ inline void rtllib_softmac_new_net(struct rtllib_devi= ce *ieee, !(ieee->softmac_features & IEEE_SOFTMAC_SCAN)) rtllib_stop_scan_syncro(ieee); =20 - HTResetIOTSetting(ieee->pHTInfo); + HTResetIOTSetting(ieee->ht_info); ieee->wmm_acm =3D 0; if (ieee->iw_mode =3D=3D IW_MODE_INFRA) { /* Join the network for the first time */ @@ -1703,7 +1703,7 @@ inline void rtllib_softmac_new_net(struct rtllib_devi= ce *ieee, HTResetSelfAndSavePeerSetting(ieee, &(ieee->current_network)); else - ieee->pHTInfo->bCurrentHTSupport =3D + ieee->ht_info->bCurrentHTSupport =3D false; =20 ieee->state =3D RTLLIB_ASSOCIATING; @@ -1893,7 +1893,7 @@ static inline u16 assoc_parse(struct rtllib_device *i= eee, struct sk_buff *skb, ((ieee->mode =3D=3D IEEE_G) && (ieee->current_network.mode =3D=3D IEEE_N_24G) && (ieee->AsocRetryCount++ < (RT_ASOC_RETRY_LIMIT-1)))) { - ieee->pHTInfo->iot_action |=3D HT_IOT_ACT_PURE_N_MODE; + ieee->ht_info->iot_action |=3D HT_IOT_ACT_PURE_N_MODE; } else { ieee->AsocRetryCount =3D 0; } @@ -2100,7 +2100,7 @@ static void rtllib_sta_wakeup(struct rtllib_device *i= eee, short nl) { if (ieee->sta_sleep =3D=3D LPS_IS_WAKE) { if (nl) { - if (ieee->pHTInfo->iot_action & + if (ieee->ht_info->iot_action & HT_IOT_ACT_NULL_DATA_POWER_SAVING) { ieee->ack_tx_to_ieee =3D 1; rtllib_sta_ps_send_null_frame(ieee, 0); @@ -2116,7 +2116,7 @@ static void rtllib_sta_wakeup(struct rtllib_device *i= eee, short nl) if (ieee->sta_sleep =3D=3D LPS_IS_SLEEP) ieee->sta_wake_up(ieee->dev); if (nl) { - if (ieee->pHTInfo->iot_action & + if (ieee->ht_info->iot_action & HT_IOT_ACT_NULL_DATA_POWER_SAVING) { ieee->ack_tx_to_ieee =3D 1; rtllib_sta_ps_send_null_frame(ieee, 0); @@ -2151,7 +2151,7 @@ void rtllib_ps_tx_ack(struct rtllib_device *ieee, sho= rt success) =20 if ((ieee->sta_sleep =3D=3D LPS_IS_WAKE) && !success) { spin_lock_irqsave(&ieee->mgmt_tx_lock, flags2); - if (ieee->pHTInfo->iot_action & + if (ieee->ht_info->iot_action & HT_IOT_ACT_NULL_DATA_POWER_SAVING) rtllib_sta_ps_send_null_frame(ieee, 0); else @@ -2235,10 +2235,10 @@ rtllib_rx_assoc_resp(struct rtllib_device *ieee, st= ruct sk_buff *skb, kfree(network); return 1; } - memcpy(ieee->pHTInfo->PeerHTCapBuf, + memcpy(ieee->ht_info->PeerHTCapBuf, network->bssht.bd_ht_cap_buf, network->bssht.bd_ht_cap_len); - memcpy(ieee->pHTInfo->PeerHTInfoBuf, + memcpy(ieee->ht_info->PeerHTInfoBuf, network->bssht.bd_ht_info_buf, network->bssht.bd_ht_info_len); if (ieee->handle_assoc_response !=3D NULL) @@ -2295,7 +2295,7 @@ static void rtllib_rx_auth_resp(struct rtllib_device = *ieee, struct sk_buff *skb) if (ieee->open_wep || !challenge) { ieee->state =3D RTLLIB_ASSOCIATING_AUTHENTICATED; ieee->softmac_stats.rx_auth_rs_ok++; - if (!(ieee->pHTInfo->iot_action & HT_IOT_ACT_PURE_N_MODE)) { + if (!(ieee->ht_info->iot_action & HT_IOT_ACT_PURE_N_MODE)) { if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) { if (IsHTHalfNmodeAPs(ieee)) { bSupportNmode =3D true; @@ -2669,7 +2669,7 @@ static void rtllib_start_ibss_wq(void *data) if ((ieee->mode =3D=3D IEEE_N_24G) || (ieee->mode =3D=3D IEEE_N_5G)) HTUseDefaultSetting(ieee); else - ieee->pHTInfo->bCurrentHTSupport =3D false; + ieee->ht_info->bCurrentHTSupport =3D false; =20 ieee->SetHwRegHandler(ieee->dev, HW_VAR_MEDIA_STATUS, (u8 *)(&ieee->state)); diff --git a/drivers/staging/rtl8192e/rtllib_softmac_wx.c b/drivers/staging= /rtl8192e/rtllib_softmac_wx.c index e02e7d9566b2..63edf68c0b49 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac_wx.c +++ b/drivers/staging/rtl8192e/rtllib_softmac_wx.c @@ -359,11 +359,11 @@ 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->enable_ht && - ieee->pHTInfo->bCurBW40MHz) { + if (ieee->ht_info->bCurrentHTSupport && ieee->ht_info->enable_ht && + ieee->ht_info->bCurBW40MHz) { b40M =3D 1; - chan_offset =3D ieee->pHTInfo->CurSTAExtChnlOffset; - bandwidth =3D (enum ht_channel_width)ieee->pHTInfo->bCurBW40MHz; + chan_offset =3D ieee->ht_info->CurSTAExtChnlOffset; + bandwidth =3D (enum ht_channel_width)ieee->ht_info->bCurBW40MHz; ieee->SetBWModeHandler(ieee->dev, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); } diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 8b01cfe03381..9ab8ee46ef66 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -266,14 +266,14 @@ static void rtllib_tx_query_agg_cap(struct rtllib_dev= ice *ieee, struct sk_buff *skb, struct cb_desc *tcb_desc) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; struct tx_ts_record *pTxTs =3D NULL; struct rtllib_hdr_1addr *hdr =3D (struct rtllib_hdr_1addr *)skb->data; =20 if (rtllib_act_scanning(ieee, false)) return; =20 - if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht) + if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht) return; if (!IsQoSDataFrame(skb->data)) return; @@ -283,12 +283,12 @@ static void rtllib_tx_query_agg_cap(struct rtllib_dev= ice *ieee, if (tcb_desc->bdhcp || ieee->CntAfterLink < 2) return; =20 - if (pHTInfo->iot_action & HT_IOT_ACT_TX_NO_AGGREGATION) + if (ht_info->iot_action & HT_IOT_ACT_TX_NO_AGGREGATION) return; =20 if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) return; - if (pHTInfo->bCurrentAMPDUEnable) { + if (ht_info->bCurrentAMPDUEnable) { if (!GetTs(ieee, (struct ts_common_info **)(&pTxTs), hdr->addr1, skb->priority, TX_DIR, true)) { netdev_info(ieee->dev, "%s: can't get TS\n", __func__); @@ -313,19 +313,19 @@ static void rtllib_tx_query_agg_cap(struct rtllib_dev= ice *ieee, } if (ieee->iw_mode =3D=3D IW_MODE_INFRA) { tcb_desc->bAMPDUEnable =3D true; - tcb_desc->ampdu_factor =3D pHTInfo->CurrentAMPDUFactor; - tcb_desc->ampdu_density =3D pHTInfo->current_mpdu_density; + tcb_desc->ampdu_factor =3D ht_info->CurrentAMPDUFactor; + tcb_desc->ampdu_density =3D ht_info->current_mpdu_density; } } FORCED_AGG_SETTING: - switch (pHTInfo->ForcedAMPDUMode) { + switch (ht_info->ForcedAMPDUMode) { case HT_AGG_AUTO: break; =20 case HT_AGG_FORCE_ENABLE: tcb_desc->bAMPDUEnable =3D true; - tcb_desc->ampdu_density =3D pHTInfo->forced_mpdu_density; - tcb_desc->ampdu_factor =3D pHTInfo->forced_ampdu_factor; + tcb_desc->ampdu_density =3D ht_info->forced_mpdu_density; + tcb_desc->ampdu_factor =3D ht_info->forced_ampdu_factor; break; =20 case HT_AGG_FORCE_DISABLE: @@ -350,32 +350,32 @@ static void rtllib_query_ShortPreambleMode(struct rtl= lib_device *ieee, static void rtllib_query_HTCapShortGI(struct rtllib_device *ieee, struct cb_desc *tcb_desc) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 tcb_desc->bUseShortGI =3D false; =20 - if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht) + if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht) return; =20 - if (pHTInfo->forced_short_gi) { + if (ht_info->forced_short_gi) { tcb_desc->bUseShortGI =3D true; return; } =20 - if (pHTInfo->bCurBW40MHz && pHTInfo->bCurShortGI40MHz) + if (ht_info->bCurBW40MHz && ht_info->bCurShortGI40MHz) tcb_desc->bUseShortGI =3D true; - else if (!pHTInfo->bCurBW40MHz && pHTInfo->bCurShortGI20MHz) + else if (!ht_info->bCurBW40MHz && ht_info->bCurShortGI20MHz) tcb_desc->bUseShortGI =3D true; } =20 static void rtllib_query_BandwidthMode(struct rtllib_device *ieee, struct cb_desc *tcb_desc) { - struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; + struct rt_hi_throughput *ht_info =3D ieee->ht_info; =20 tcb_desc->bPacketBW =3D false; =20 - if (!pHTInfo->bCurrentHTSupport || !pHTInfo->enable_ht) + if (!ht_info->bCurrentHTSupport || !ht_info->enable_ht) return; =20 if (tcb_desc->bMulticast || tcb_desc->bBroadcast) @@ -383,7 +383,7 @@ static void rtllib_query_BandwidthMode(struct rtllib_de= vice *ieee, =20 if ((tcb_desc->data_rate & 0x80) =3D=3D 0) return; - if (pHTInfo->bCurBW40MHz && pHTInfo->cur_tx_bw40mhz && + if (ht_info->bCurBW40MHz && ht_info->cur_tx_bw40mhz && !ieee->bandwidth_auto_switch.bforced_tx20Mhz) tcb_desc->bPacketBW =3D true; } @@ -392,7 +392,7 @@ static void rtllib_query_protectionmode(struct rtllib_d= evice *ieee, struct cb_desc *tcb_desc, struct sk_buff *skb) { - struct rt_hi_throughput *pHTInfo; + struct rt_hi_throughput *ht_info; =20 tcb_desc->bRTSSTBC =3D false; tcb_desc->bRTSUseShortGI =3D false; @@ -418,15 +418,15 @@ static void rtllib_query_protectionmode(struct rtllib= _device *ieee, return; } =20 - pHTInfo =3D ieee->pHTInfo; + ht_info =3D ieee->ht_info; =20 while (true) { - if (pHTInfo->iot_action & HT_IOT_ACT_FORCED_CTS2SELF) { + if (ht_info->iot_action & HT_IOT_ACT_FORCED_CTS2SELF) { tcb_desc->bCTSEnable =3D true; tcb_desc->rts_rate =3D MGN_24M; tcb_desc->bRTSEnable =3D true; break; - } else if (pHTInfo->iot_action & (HT_IOT_ACT_FORCED_RTS | + } else if (ht_info->iot_action & (HT_IOT_ACT_FORCED_RTS | HT_IOT_ACT_PURE_N_MODE)) { tcb_desc->bRTSEnable =3D true; tcb_desc->rts_rate =3D MGN_24M; @@ -438,12 +438,12 @@ static void rtllib_query_protectionmode(struct rtllib= _device *ieee, tcb_desc->rts_rate =3D MGN_24M; break; } - if (pHTInfo->bCurrentHTSupport && pHTInfo->enable_ht) { - u8 HTOpMode =3D pHTInfo->current_op_mode; + if (ht_info->bCurrentHTSupport && ht_info->enable_ht) { + u8 HTOpMode =3D ht_info->current_op_mode; =20 - if ((pHTInfo->bCurBW40MHz && (HTOpMode =3D=3D 2 || + if ((ht_info->bCurBW40MHz && (HTOpMode =3D=3D 2 || HTOpMode =3D=3D 3)) || - (!pHTInfo->bCurBW40MHz && HTOpMode =3D=3D 3)) { + (!ht_info->bCurBW40MHz && HTOpMode =3D=3D 3)) { tcb_desc->rts_rate =3D MGN_24M; tcb_desc->bRTSEnable =3D true; break; @@ -882,7 +882,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struc= t net_device *dev) tcb_desc->priority =3D skb->priority; =20 if (ether_type =3D=3D ETH_P_PAE) { - if (ieee->pHTInfo->iot_action & + if (ieee->ht_info->iot_action & HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate =3D MgntQuery_TxRateExcludeCCKRates(ieee); @@ -906,7 +906,7 @@ static int rtllib_xmit_inter(struct sk_buff *skb, struc= t net_device *dev) tcb_desc->data_rate =3D rtllib_current_rate(ieee); =20 if (bdhcp) { - if (ieee->pHTInfo->iot_action & + if (ieee->ht_info->iot_action & HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate =3D MgntQuery_TxRateExcludeCCKRates(ieee); --=20 2.37.3