From nobody Thu Apr 2 13:37:01 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 917C5C07E9D for ; Sat, 24 Sep 2022 22:03:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234004AbiIXWDS (ORCPT ); Sat, 24 Sep 2022 18:03:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229669AbiIXWDN (ORCPT ); Sat, 24 Sep 2022 18:03:13 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5E0D33350 for ; Sat, 24 Sep 2022 15:03:10 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id 13so7168764ejn.3 for ; Sat, 24 Sep 2022 15:03:10 -0700 (PDT) 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; bh=RWP+wPM99hQVxgyz83xLNtYO23yw8YqASQDEQXbGrw4=; b=ZDQU8Xz7zJzUjzZXw6hZsiR6gkl61F+r4yCIleou4af4W1fiV1xEHleHi+1W8W4Uqc nVc63IM5euec58gVrw+oCOLPt6f8hA+fK2TdgkNgCmCj2t5BSK+4+AZgEIepg33lG+7R REB6AMqfnHcIzKG5vcQeeUaJKhUVTeu1MhagSzO7pMyxZi+8wQSVHuaFXwbT+5n9X+R3 JM+PBi2OHxvko+q6pENK8yCeR53qj0WVuBAxEYLHj6JBp5CJZxZJjgW5wNKywN3yAOhz POCH++pt2NS+0yQQn22DHohKWAj7EYmiP2Sq4Nr6wJvTHLyO/KjJsS1Xqe7LCJ1oC/qi DZig== 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; bh=RWP+wPM99hQVxgyz83xLNtYO23yw8YqASQDEQXbGrw4=; b=JfSSRjtQglZfpOlMgYXIi0ScYNOFIFKqqBC7aAtyuLXsW9fVYYpkxJbxOnLTDUqgjg 8c/XwNXJrY3LtEUp3T1qFnCS/7/sGE94lt10b5iEMGsxV2wOXFvalyGw4PyX1TNryABm 8mOgKqfdAUMDB/icFMo03b/At7qoo7mHAcluUgiR3TpNJ+oUWgaAonvnk44gxOd/Tvyr xXBoO70Kq+digbpmdyylbG+YRB03ZRCTaJh4fKxPvjKjrLN9nmlXOuFZ05PS6arlSP8x 3fPk0uiqixmC7LxYd2ZW45VREV1mzOJDQy0O9gB2kiqgSMwd+urOnI1p3K/TuLio3Lph 9/qA== X-Gm-Message-State: ACrzQf1rSyDa9fGDrlVZNfKj/sKVUgY3qp6LF8y+ldzvVilVMpP0CrL1 Dm3PjeTmI1fSZHaC0xuqi7E= X-Google-Smtp-Source: AMsMyM632cg6jU8oHCPWqGfofWarR90yzcqMqEUh0JEkV+OvjQXJjFgIaa2Gk385GOlqiIESEYZa1Q== X-Received: by 2002:a17:906:cc17:b0:781:d78b:e2d3 with SMTP id ml23-20020a170906cc1700b00781d78be2d3mr12787214ejb.83.1664056990082; Sat, 24 Sep 2022 15:03:10 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id y17-20020a056402171100b00456f2dbb379sm2219657edu.62.2022.09.24.15.03.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:03:09 -0700 (PDT) Date: Sun, 25 Sep 2022 00:03:07 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/10] staging: rtl8192e: Rename eRFPowerState, eRfOff and eRfOn Message-ID: <52c676bbaf1f894e30971c5c409b4bcb71c8ef7e.1664055213.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 eRFPowerState to rf_power_state, eRfOff to rf_off and eRfOn to rf_on to avoid CamelCase which is not accepted by checkpatch. Omit the upfront "e" as no RFPowerState, RfOff and RfOn exist and it makes the variables unnecessary long. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +++---- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 26 +++++++++---------- .../staging/rtl8192e/rtl8192e/r8192E_phy.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 4 +-- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 26 +++++++++---------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 8 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_pm.c | 4 +-- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 18 ++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 12 ++++----- drivers/staging/rtl8192e/rtllib.h | 6 ++--- drivers/staging/rtl8192e/rtllib_softmac.c | 6 ++--- 11 files changed, 61 insertions(+), 61 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 5832ccdb4e50..cb8b5fd7ab86 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -625,7 +625,7 @@ bool rtl92e_start_adapter(struct net_device *dev) priv->pFirmware->status =3D FW_STATUS_0_INIT; =20 if (priv->RegRfOff) - priv->rtllib->eRFPowerState =3D eRfOff; + priv->rtllib->rf_power_state =3D rf_off; =20 ulRegRead =3D rtl92e_readl(dev, CPU_GEN); if (priv->pFirmware->status =3D=3D FW_STATUS_0_INIT) @@ -757,13 +757,13 @@ bool rtl92e_start_adapter(struct net_device *dev) rtl92e_writeb(dev, 0x87, 0x0); =20 if (priv->RegRfOff) { - rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_SW); + rtl92e_set_rf_state(dev, rf_off, RF_CHANGE_BY_SW); } else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) { - rtl92e_set_rf_state(dev, eRfOff, priv->rtllib->RfOffReason); + rtl92e_set_rf_state(dev, rf_off, priv->rtllib->RfOffReason); } else if (priv->rtllib->RfOffReason >=3D RF_CHANGE_BY_IPS) { - rtl92e_set_rf_state(dev, eRfOff, priv->rtllib->RfOffReason); + rtl92e_set_rf_state(dev, rf_off, priv->rtllib->RfOffReason); } else { - priv->rtllib->eRFPowerState =3D eRfOn; + priv->rtllib->rf_power_state =3D rf_on; priv->rtllib->RfOffReason =3D 0; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index d1c4d44bfc87..c81907d31af8 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -200,7 +200,7 @@ void rtl92e_set_rf_reg(struct net_device *dev, enum rf9= 0_radio_path eRFPath, =20 if (!rtl92e_is_legal_rf_path(dev, eRFPath)) return; - if (priv->rtllib->eRFPowerState !=3D eRfOn && !priv->being_init_adapter) + if (priv->rtllib->rf_power_state !=3D rf_on && !priv->being_init_adapter) return; =20 if (priv->Rf_Mode =3D=3D RF_OP_By_FW) { @@ -237,7 +237,7 @@ u32 rtl92e_get_rf_reg(struct net_device *dev, enum rf90= _radio_path eRFPath, =20 if (!rtl92e_is_legal_rf_path(dev, eRFPath)) return 0; - if (priv->rtllib->eRFPowerState !=3D eRfOn && !priv->being_init_adapter) + if (priv->rtllib->rf_power_state !=3D rf_on && !priv->being_init_adapter) return 0; mutex_lock(&priv->rf_mutex); if (priv->Rf_Mode =3D=3D RF_OP_By_FW) { @@ -1301,7 +1301,7 @@ void rtl92e_set_rf_off(struct net_device *dev) } =20 static bool _rtl92e_set_rf_power_state(struct net_device *dev, - enum rt_rf_power_state eRFPowerState) + 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 *) @@ -1316,9 +1316,9 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, =20 switch (priv->rf_chip) { case RF_8256: - switch (eRFPowerState) { - case eRfOn: - if ((priv->rtllib->eRFPowerState =3D=3D eRfOff) && + 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)) { bool rtstatus; u32 InitilizeCount =3D 3; @@ -1364,7 +1364,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, break; =20 case eRfSleep: - if (priv->rtllib->eRFPowerState =3D=3D eRfOff) + if (priv->rtllib->rf_power_state =3D=3D rf_off) break; =20 =20 @@ -1386,7 +1386,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, rtl92e_set_rf_off(dev); break; =20 - case eRfOff: + case rf_off: for (QueueID =3D 0, i =3D 0; QueueID < MAX_TX_QUEUE; ) { ring =3D &priv->tx_ring[QueueID]; =20 @@ -1418,7 +1418,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, bResult =3D false; netdev_warn(dev, "%s(): Unknown state requested: 0x%X.\n", - __func__, eRFPowerState); + __func__, rf_power_state); break; } =20 @@ -1430,7 +1430,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, } =20 if (bResult) { - priv->rtllib->eRFPowerState =3D eRFPowerState; + priv->rtllib->rf_power_state =3D rf_power_state; =20 switch (priv->rf_chip) { case RF_8256: @@ -1447,18 +1447,18 @@ static bool _rtl92e_set_rf_power_state(struct net_d= evice *dev, } =20 bool rtl92e_set_rf_power_state(struct net_device *dev, - enum rt_rf_power_state eRFPowerState) + enum rt_rf_power_state rf_power_state) { struct r8192_priv *priv =3D rtllib_priv(dev); =20 bool bResult =3D false; =20 - if (eRFPowerState =3D=3D priv->rtllib->eRFPowerState && + if (rf_power_state =3D=3D priv->rtllib->rf_power_state && priv->bHwRfOffAction =3D=3D 0) { return bResult; } =20 - bResult =3D _rtl92e_set_rf_power_state(dev, eRFPowerState); + bResult =3D _rtl92e_set_rf_power_state(dev, rf_power_state); return bResult; } =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.h index 7f2a24b72e52..e89c9ac90989 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h @@ -82,7 +82,7 @@ void rtl92e_init_gain(struct net_device *dev, u8 Operatio= n); void rtl92e_set_rf_off(struct net_device *dev); =20 bool rtl92e_set_rf_power_state(struct net_device *dev, - enum rt_rf_power_state eRFPowerState); + enum rt_rf_power_state rf_power_state); =20 void rtl92e_scan_op_backup(struct net_device *dev, u8 Operation); =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 8dba8606bda1..5faf17d8d536 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -80,9 +80,9 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u= 8 KeyIndex, struct r8192_priv *priv =3D (struct r8192_priv *)rtllib_priv(dev); enum rt_rf_power_state rt_state; =20 - rt_state =3D priv->rtllib->eRFPowerState; + rt_state =3D priv->rtllib->rf_power_state; if (priv->rtllib->PowerSaveControl.bInactivePs) { - if (rt_state =3D=3D eRfOff) { + if (rt_state =3D=3D rf_off) { if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) { netdev_warn(dev, "%s(): RF is OFF.\n", __func__); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 671fe547639b..8954d1e4534c 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -166,10 +166,10 @@ bool rtl92e_set_rf_state(struct net_device *dev, } } =20 - rt_state =3D priv->rtllib->eRFPowerState; + rt_state =3D priv->rtllib->rf_power_state; =20 switch (state_to_set) { - case eRfOn: + case rf_on: priv->rtllib->RfOffReason &=3D (~change_source); =20 if ((change_source =3D=3D RF_CHANGE_BY_HW) && priv->hw_radio_off) @@ -179,13 +179,13 @@ bool rtl92e_set_rf_state(struct net_device *dev, priv->rtllib->RfOffReason =3D 0; action_allowed =3D true; =20 - if (rt_state =3D=3D eRfOff && + if (rt_state =3D=3D rf_off && change_source >=3D RF_CHANGE_BY_HW) connect_by_ssid =3D true; } break; =20 - case eRfOff: + case rf_off: =20 if ((priv->rtllib->iw_mode =3D=3D IW_MODE_INFRA) || (priv->rtllib->iw_mode =3D=3D IW_MODE_ADHOC)) { @@ -216,7 +216,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, =20 if (action_allowed) { rtl92e_set_rf_power_state(dev, state_to_set); - if (state_to_set =3D=3D eRfOn) { + if (state_to_set =3D=3D rf_on) { if (connect_by_ssid && priv->blinked_ingpio) { schedule_delayed_work( &ieee->associate_procedure_wq, 0); @@ -892,7 +892,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->rtllib->PowerSaveControl.bFwCtrlLPS =3D false; priv->rtllib->LPSDelayCnt =3D 0; priv->rtllib->sta_sleep =3D LPS_IS_WAKE; - priv->rtllib->eRFPowerState =3D eRfOn; + priv->rtllib->rf_power_state =3D rf_on; =20 priv->rtllib->current_network.beacon_interval =3D DEFAULT_BEACONINTERVAL; priv->rtllib->iw_mode =3D IW_MODE_INFRA; @@ -1114,12 +1114,12 @@ static enum reset_type _rtl92e_if_check_reset(struc= t net_device *dev) enum reset_type RxResetType =3D RESET_TYPE_NORESET; enum rt_rf_power_state rfState; =20 - rfState =3D priv->rtllib->eRFPowerState; + rfState =3D priv->rtllib->rf_power_state; =20 - if (rfState =3D=3D eRfOn) + if (rfState =3D=3D rf_on) TxResetType =3D _rtl92e_tx_check_stuck(dev); =20 - if (rfState =3D=3D eRfOn && + if (rfState =3D=3D rf_on && (priv->rtllib->iw_mode =3D=3D IW_MODE_INFRA) && (priv->rtllib->state =3D=3D RTLLIB_LINKED)) RxResetType =3D _rtl92e_rx_check_stuck(dev); @@ -1307,7 +1307,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) if (!rtllib_act_scanning(priv->rtllib, false)) { if ((ieee->iw_mode =3D=3D IW_MODE_INFRA) && (ieee->state =3D=3D RTLLIB_NOLINK) && - (ieee->eRFPowerState =3D=3D eRfOn) && !ieee->is_set_key && + (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 IPS_CALLBACK_NONE) && @@ -1370,7 +1370,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) priv->check_roaming_cnt =3D 0; =20 if (priv->check_roaming_cnt > 0) { - if (ieee->eRFPowerState =3D=3D eRfOff) + if (ieee->rf_power_state =3D=3D rf_off) netdev_info(dev, "%s(): RF is off\n", __func__); =20 netdev_info(dev, @@ -1507,7 +1507,7 @@ static void _rtl92e_hard_data_xmit(struct sk_buff *sk= b, struct net_device *dev, MAX_DEV_ADDR_SIZE); u8 queue_index =3D tcb_desc->queue_index; =20 - if ((priv->rtllib->eRFPowerState =3D=3D eRfOff) || !priv->up || + if ((priv->rtllib->rf_power_state =3D=3D rf_off) || !priv->up || priv->bResetInProgress) { kfree_skb(skb); return; @@ -1540,7 +1540,7 @@ static int _rtl92e_hard_start_xmit(struct sk_buff *sk= b, struct net_device *dev) u8 queue_index =3D tcb_desc->queue_index; =20 if (queue_index !=3D TXCMD_QUEUE) { - if ((priv->rtllib->eRFPowerState =3D=3D eRfOff) || + if ((priv->rtllib->rf_power_state =3D=3D rf_off) || !priv->up || priv->bResetInProgress) { kfree_skb(skb); return 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 6d09b71d4993..92bf4bac31f1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -648,7 +648,7 @@ static void _rtl92e_dm_tx_power_tracking_callback_tssi(= struct net_device *dev) rtl92e_writeb(dev, FW_Busy_Flag, 0); return; } - if (priv->rtllib->eRFPowerState !=3D eRfOn) { + if (priv->rtllib->rf_power_state !=3D rf_on) { rtl92e_writeb(dev, Pw_Track_Flag, 0); rtl92e_writeb(dev, FW_Busy_Flag, 0); return; @@ -1684,13 +1684,13 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *dat= a) =20 tmp1byte =3D rtl92e_readb(dev, GPI); =20 - eRfPowerStateToSet =3D (tmp1byte&BIT1) ? eRfOn : eRfOff; + eRfPowerStateToSet =3D (tmp1byte&BIT1) ? rf_on : rf_off; =20 - if (priv->hw_radio_off && (eRfPowerStateToSet =3D=3D eRfOn)) { + if (priv->hw_radio_off && (eRfPowerStateToSet =3D=3D rf_on)) { netdev_info(dev, "gpiochangeRF - HW Radio ON\n"); priv->hw_radio_off =3D false; bActuallySet =3D true; - } else if (!priv->hw_radio_off && (eRfPowerStateToSet =3D=3D eRfOff)) { + } else if (!priv->hw_radio_off && (eRfPowerStateToSet =3D=3D rf_off)) { netdev_info(dev, "gpiochangeRF - HW Radio OFF\n"); priv->hw_radio_off =3D true; bActuallySet =3D true; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_pm.c index ced00de89114..82b45c61ac75 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_pm.c @@ -32,7 +32,7 @@ int rtl92e_suspend(struct device *dev_d) netif_device_detach(dev); =20 if (!priv->rtllib->bSupportRemoteWakeUp) { - rtl92e_set_rf_state(dev, eRfOff, RF_CHANGE_BY_INIT); + rtl92e_set_rf_state(dev, rf_off, RF_CHANGE_BY_INIT); ulRegRead =3D rtl92e_readl(dev, CPU_GEN); ulRegRead |=3D CPU_GEN_SYSTEM_RESET; rtl92e_writel(dev, CPU_GEN, ulRegRead); @@ -83,7 +83,7 @@ int rtl92e_resume(struct device *dev_d) dev->netdev_ops->ndo_open(dev); =20 if (!priv->rtllib->bSupportRemoteWakeUp) - rtl92e_set_rf_state(dev, eRfOn, RF_CHANGE_BY_INIT); + rtl92e_set_rf_state(dev, rf_on, RF_CHANGE_BY_INIT); =20 out: return 0; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index d752bbc310d1..b43454320606 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -51,7 +51,7 @@ void rtl92e_hw_wakeup(struct net_device *dev) return; } spin_unlock_irqrestore(&priv->rf_ps_lock, flags); - rtl92e_set_rf_state(dev, eRfOn, RF_CHANGE_BY_PS); + rtl92e_set_rf_state(dev, rf_on, RF_CHANGE_BY_PS); } =20 void rtl92e_hw_wakeup_wq(void *data) @@ -117,11 +117,11 @@ void rtl92e_ips_enter(struct net_device *dev) enum rt_rf_power_state rt_state; =20 if (pPSC->bInactivePs) { - rt_state =3D priv->rtllib->eRFPowerState; - if (rt_state =3D=3D eRfOn && !pPSC->bSwRfProcessing && + rt_state =3D priv->rtllib->rf_power_state; + if (rt_state =3D=3D rf_on && !pPSC->bSwRfProcessing && (priv->rtllib->state !=3D RTLLIB_LINKED) && (priv->rtllib->iw_mode !=3D IW_MODE_MASTER)) { - pPSC->eInactivePowerState =3D eRfOff; + pPSC->eInactivePowerState =3D rf_off; priv->isRFOff =3D true; priv->bInPowerSaveMode =3D true; _rtl92e_ps_update_rf_state(dev); @@ -137,10 +137,10 @@ void rtl92e_ips_leave(struct net_device *dev) enum rt_rf_power_state rt_state; =20 if (pPSC->bInactivePs) { - rt_state =3D priv->rtllib->eRFPowerState; - if (rt_state !=3D eRfOn && !pPSC->bSwRfProcessing && + rt_state =3D priv->rtllib->rf_power_state; + if (rt_state !=3D rf_on && !pPSC->bSwRfProcessing && priv->rtllib->RfOffReason <=3D RF_CHANGE_BY_IPS) { - pPSC->eInactivePowerState =3D eRfOn; + pPSC->eInactivePowerState =3D rf_on; priv->bInPowerSaveMode =3D false; _rtl92e_ps_update_rf_state(dev); } @@ -164,10 +164,10 @@ void rtl92e_rtllib_ips_leave_wq(struct net_device *de= v) struct r8192_priv *priv =3D (struct r8192_priv *)rtllib_priv(dev); enum rt_rf_power_state rt_state; =20 - rt_state =3D priv->rtllib->eRFPowerState; + rt_state =3D priv->rtllib->rf_power_state; =20 if (priv->rtllib->PowerSaveControl.bInactivePs) { - if (rt_state =3D=3D eRfOff) { + if (rt_state =3D=3D rf_off) { if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) { netdev_warn(dev, "%s(): RF is OFF.\n", __func__); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index bfb963768fc3..4c9ff1b1dfe1 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -248,12 +248,12 @@ static int _rtl92e_wx_set_mode(struct net_device *dev, =20 if (priv->hw_radio_off) return 0; - rt_state =3D priv->rtllib->eRFPowerState; + 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) { if (priv->rtllib->PowerSaveControl.bInactivePs) { - if (rt_state =3D=3D eRfOff) { + if (rt_state =3D=3D rf_off) { if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) { netdev_warn(dev, "%s(): RF is OFF.\n", @@ -392,7 +392,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, __func__); return 0; } - rt_state =3D priv->rtllib->eRFPowerState; + rt_state =3D priv->rtllib->rf_power_state; if (!priv->up) return -ENETDOWN; if (priv->rtllib->LinkDetectInfo.bBusyTraffic =3D=3D true) @@ -415,7 +415,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, =20 if (priv->rtllib->state !=3D RTLLIB_LINKED) { if (priv->rtllib->PowerSaveControl.bInactivePs) { - if (rt_state =3D=3D eRfOff) { + if (rt_state =3D=3D rf_off) { if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) { netdev_warn(dev, "%s(): RF is OFF.\n", @@ -433,7 +433,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, priv->rtllib->LedControlHandler(dev, LED_CTL_SITE_SURVEY); =20 - if (priv->rtllib->eRFPowerState !=3D eRfOff) { + if (priv->rtllib->rf_power_state !=3D rf_off) { priv->rtllib->actscanning =3D true; =20 if (ieee->ScanOperationBackupHandler) @@ -487,7 +487,7 @@ static int _rtl92e_wx_set_essid(struct net_device *dev, =20 if (priv->hw_radio_off) { netdev_info(dev, - "=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s():hw radio off,or Rf state is eRfOf= f, return\n", + "=3D=3D=3D=3D=3D=3D=3D=3D=3D>%s():hw radio off,or Rf state is rf_of= f, return\n", __func__); return 0; } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index b4b606f552fb..6b5c5962ae14 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1244,9 +1244,9 @@ enum ips_callback_function { }; =20 enum rt_rf_power_state { - eRfOn, + rf_on, eRfSleep, - eRfOff + rf_off }; =20 struct rt_pwr_save_ctrl { @@ -1434,7 +1434,7 @@ struct rtllib_device { bool FirstIe_InScan; bool be_scan_inprogress; bool beinretry; - enum rt_rf_power_state eRFPowerState; + enum rt_rf_power_state rf_power_state; RT_RF_CHANGE_SOURCE RfOffReason; bool is_set_key; bool wx_set_enc; diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index e4f5f4ecf4d0..9a5dd031d3ff 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -586,9 +586,9 @@ static void rtllib_softmac_scan_wq(void *data) =20 mutex_lock(&ieee->scan_mutex); =20 - if (ieee->eRFPowerState =3D=3D eRfOff) { + if (ieee->rf_power_state =3D=3D rf_off) { netdev_info(ieee->dev, - "=3D=3D=3D=3D=3D=3D>%s():rf state is eRfOff, return\n", + "=3D=3D=3D=3D=3D=3D>%s():rf state is rf_off, return\n", __func__); goto out1; } @@ -1585,7 +1585,7 @@ static void rtllib_associate_procedure_wq(void *data) =20 rtllib_stop_scan(ieee); HTSetConnectBwMode(ieee, HT_CHANNEL_WIDTH_20, HT_EXTCHNL_OFFSET_NO_EXT); - if (ieee->eRFPowerState =3D=3D eRfOff) { + if (ieee->rf_power_state =3D=3D rf_off) { if (ieee->rtllib_ips_leave_wq !=3D NULL) ieee->rtllib_ips_leave_wq(ieee->dev); mutex_unlock(&ieee->wx_mutex); --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 71D97C07E9D for ; Sat, 24 Sep 2022 22:03:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234014AbiIXWDf (ORCPT ); Sat, 24 Sep 2022 18:03:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51756 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234018AbiIXWD1 (ORCPT ); Sat, 24 Sep 2022 18:03:27 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F3583386AE for ; Sat, 24 Sep 2022 15:03:19 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id z13so7143021ejp.6 for ; Sat, 24 Sep 2022 15:03:19 -0700 (PDT) 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; bh=cUeH3XmhsuVxox+WBK0EztC3Vn4IiIlYe/BsguLKMHs=; b=gKBMNAlNq3Gi7IwncL+Ps63cJySgz67Aktgne9qw8BKsUp3UBvc4QeP5aGUo8Bi4Xr lN1cgGV4d0pV4XDQ1exkMpIfz3g/dvUsgKTn0swyCuc2MlNl9NUM5qdPiiitlUjMcRxw rBlV7lqyLB5i+id1TWoPkn859gxI687U/1TT49eaFA8cyPTtD6aT0X4AqKBQ8uAZE73t w9BynRNOfYVja4jSIUZOeTq8Hvr9CyaduRNNVXlzIg4zWzlLpV/W8vsE+5pnCLKyAXsD lvJVY9J9ZrYqcrOPyufOc4qUuR0Ly0dLQ0MhwH0t8Y48gEyMtx2/0N/HUih3pkvn/QUO x+tw== 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; bh=cUeH3XmhsuVxox+WBK0EztC3Vn4IiIlYe/BsguLKMHs=; b=ZsyDNzwLEubrBjUFY/zo9AMbCG1524ZdpppFOiJ7DDU1KpVe3VXGzEov9DGAs1lP5w 7jJyoDPBGNdC7X9mEjSav2NbNAEMf72JDJpwYmB49YBLjfzKXywLPeaTbwdhweEieukt 9nsX31df5ovr2HdjSKqYdg3Y5IrQQj2A/lPRUL0zjiDu3/dRIbA1oWC1062+RC/vy+AP eZx89o2fJkL7ZOn2X2c4+sYRyBilFf4tmYxNiWlKaWjMwEfI251x/wufyDIZhqMswcbQ fbtTR7n78/tSr3gWBp2MUFvThem1ed2MshszQtGJKoubvYnttlFoQjEKKXgrweUq4OYy UGww== X-Gm-Message-State: ACrzQf2OiIflYYyond16YQL/ywM3oxjF5Kd1sRC10z/VJjw0s3FeMVH6 sZbHHcA4phcjUmymy47oyYY= X-Google-Smtp-Source: AMsMyM6JmiDDITrLR3FWvlnQMtesj2GEBMqXXK/832ldINi7QpgcQaeeY1a3Zla8se+EZdOc0HRzyA== X-Received: by 2002:a17:907:3e28:b0:782:81d:a4f9 with SMTP id hp40-20020a1709073e2800b00782081da4f9mr12409527ejc.558.1664056998352; Sat, 24 Sep 2022 15:03:18 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id r10-20020a17090609ca00b0073cb0801104sm6021615eje.147.2022.09.24.15.03.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:03:17 -0700 (PDT) Date: Sun, 25 Sep 2022 00:03:16 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 02/10] staging: rtl8192e: Rename eRfSleep, eRfPowerStateToSet and RfOffReason Message-ID: <58e21e5cf86270edae93162db2395e6348c9c424.1664055213.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 eRfSleep to rf_sleep, eRfPowerStateToSet to rf_power_state_to_set and RfOffReason to rf_off_reason to avoid CamelCase which is not accepted by checkpatch. Omit the upfront "e" as no RfSleep and RfPowerStateToSet exist and it makes the variables unnecessary long. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +++++----- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 4 ++-- drivers/staging/rtl8192e/rtllib.h | 4 ++-- 8 files changed, 27 insertions(+), 27 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index cb8b5fd7ab86..bd2696cdaccd 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -758,13 +758,13 @@ bool rtl92e_start_adapter(struct net_device *dev) =20 if (priv->RegRfOff) { rtl92e_set_rf_state(dev, rf_off, RF_CHANGE_BY_SW); - } else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) { - rtl92e_set_rf_state(dev, rf_off, priv->rtllib->RfOffReason); - } else if (priv->rtllib->RfOffReason >=3D RF_CHANGE_BY_IPS) { - rtl92e_set_rf_state(dev, rf_off, priv->rtllib->RfOffReason); + } else if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_PS) { + rtl92e_set_rf_state(dev, rf_off, priv->rtllib->rf_off_reason); + } else if (priv->rtllib->rf_off_reason >=3D RF_CHANGE_BY_IPS) { + rtl92e_set_rf_state(dev, rf_off, priv->rtllib->rf_off_reason); } else { priv->rtllib->rf_power_state =3D rf_on; - priv->rtllib->RfOffReason =3D 0; + priv->rtllib->rf_off_reason =3D 0; } =20 if (priv->rtllib->FwRWRF) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index c81907d31af8..594db05b6558 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1363,7 +1363,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, =20 break; =20 - case eRfSleep: + case rf_sleep: if (priv->rtllib->rf_power_state =3D=3D rf_off) break; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 5faf17d8d536..4226bbaaca44 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -83,7 +83,7 @@ void rtl92e_set_key(struct net_device *dev, u8 EntryNo, u= 8 KeyIndex, rt_state =3D priv->rtllib->rf_power_state; if (priv->rtllib->PowerSaveControl.bInactivePs) { if (rt_state =3D=3D rf_off) { - if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) { + if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { netdev_warn(dev, "%s(): RF is OFF.\n", __func__); return; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 8954d1e4534c..52b25df99642 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -170,13 +170,13 @@ bool rtl92e_set_rf_state(struct net_device *dev, =20 switch (state_to_set) { case rf_on: - priv->rtllib->RfOffReason &=3D (~change_source); + priv->rtllib->rf_off_reason &=3D (~change_source); =20 if ((change_source =3D=3D RF_CHANGE_BY_HW) && priv->hw_radio_off) priv->hw_radio_off =3D false; =20 - if (!priv->rtllib->RfOffReason) { - priv->rtllib->RfOffReason =3D 0; + if (!priv->rtllib->rf_off_reason) { + priv->rtllib->rf_off_reason =3D 0; action_allowed =3D true; =20 if (rt_state =3D=3D rf_off && @@ -189,7 +189,7 @@ bool rtl92e_set_rf_state(struct net_device *dev, =20 if ((priv->rtllib->iw_mode =3D=3D IW_MODE_INFRA) || (priv->rtllib->iw_mode =3D=3D IW_MODE_ADHOC)) { - if ((priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) || + if ((priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) || (change_source > RF_CHANGE_BY_IPS)) { if (ieee->state =3D=3D RTLLIB_LINKED) priv->blinked_ingpio =3D true; @@ -201,12 +201,12 @@ bool rtl92e_set_rf_state(struct net_device *dev, } if ((change_source =3D=3D RF_CHANGE_BY_HW) && !priv->hw_radio_off) priv->hw_radio_off =3D true; - priv->rtllib->RfOffReason |=3D change_source; + priv->rtllib->rf_off_reason |=3D change_source; action_allowed =3D true; break; =20 - case eRfSleep: - priv->rtllib->RfOffReason |=3D change_source; + case rf_sleep: + priv->rtllib->rf_off_reason |=3D change_source; action_allowed =3D true; break; =20 @@ -882,7 +882,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) priv->RegRfOff =3D false; priv->isRFOff =3D false; priv->bInPowerSaveMode =3D false; - priv->rtllib->RfOffReason =3D 0; + priv->rtllib->rf_off_reason =3D 0; priv->rf_change_in_progress =3D false; priv->bHwRfOffAction =3D 0; priv->SetRFPowerStateInProgress =3D false; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 92bf4bac31f1..a4bffc081857 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1665,7 +1665,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) struct r8192_priv, gpio_change_rf_wq); struct net_device *dev =3D priv->rtllib->dev; u8 tmp1byte; - enum rt_rf_power_state eRfPowerStateToSet; + enum rt_rf_power_state rf_power_state_to_set; bool bActuallySet =3D false; char *argv[3]; static const char RadioPowerPath[] =3D "/etc/acpi/events/RadioPower.sh"; @@ -1684,13 +1684,13 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *dat= a) =20 tmp1byte =3D rtl92e_readb(dev, GPI); =20 - eRfPowerStateToSet =3D (tmp1byte&BIT1) ? rf_on : rf_off; + rf_power_state_to_set =3D (tmp1byte&BIT1) ? rf_on : rf_off; =20 - if (priv->hw_radio_off && (eRfPowerStateToSet =3D=3D rf_on)) { + if (priv->hw_radio_off && (rf_power_state_to_set =3D=3D rf_on)) { netdev_info(dev, "gpiochangeRF - HW Radio ON\n"); priv->hw_radio_off =3D false; bActuallySet =3D true; - } else if (!priv->hw_radio_off && (eRfPowerStateToSet =3D=3D rf_off)) { + } else if (!priv->hw_radio_off && (rf_power_state_to_set =3D=3D rf_off)) { netdev_info(dev, "gpiochangeRF - HW Radio OFF\n"); priv->hw_radio_off =3D true; bActuallySet =3D true; @@ -1699,7 +1699,7 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) if (bActuallySet) { mdelay(1000); priv->bHwRfOffAction =3D 1; - rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW); + rtl92e_set_rf_state(dev, rf_power_state_to_set, RF_CHANGE_BY_HW); if (priv->hw_radio_off) argv[1] =3D "RFOFF"; else diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index b43454320606..8c00b111ddb2 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -26,7 +26,7 @@ static void _rtl92e_hw_sleep(struct net_device *dev) return; } spin_unlock_irqrestore(&priv->rf_ps_lock, flags); - rtl92e_set_rf_state(dev, eRfSleep, RF_CHANGE_BY_PS); + rtl92e_set_rf_state(dev, rf_sleep, RF_CHANGE_BY_PS); } =20 void rtl92e_hw_sleep_wq(void *data) @@ -139,7 +139,7 @@ void rtl92e_ips_leave(struct net_device *dev) if (pPSC->bInactivePs) { rt_state =3D priv->rtllib->rf_power_state; if (rt_state !=3D rf_on && !pPSC->bSwRfProcessing && - priv->rtllib->RfOffReason <=3D RF_CHANGE_BY_IPS) { + priv->rtllib->rf_off_reason <=3D RF_CHANGE_BY_IPS) { pPSC->eInactivePowerState =3D rf_on; priv->bInPowerSaveMode =3D false; _rtl92e_ps_update_rf_state(dev); @@ -168,7 +168,7 @@ void rtl92e_rtllib_ips_leave_wq(struct net_device *dev) =20 if (priv->rtllib->PowerSaveControl.bInactivePs) { if (rt_state =3D=3D rf_off) { - if (priv->rtllib->RfOffReason > RF_CHANGE_BY_IPS) { + if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { netdev_warn(dev, "%s(): RF is OFF.\n", __func__); return; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index 4c9ff1b1dfe1..4920cb49e381 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -254,7 +254,7 @@ static int _rtl92e_wx_set_mode(struct net_device *dev, ieee->bNetPromiscuousMode) { if (priv->rtllib->PowerSaveControl.bInactivePs) { if (rt_state =3D=3D rf_off) { - if (priv->rtllib->RfOffReason > + if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { netdev_warn(dev, "%s(): RF is OFF.\n", __func__); @@ -416,7 +416,7 @@ static int _rtl92e_wx_set_scan(struct net_device *dev, if (priv->rtllib->state !=3D RTLLIB_LINKED) { if (priv->rtllib->PowerSaveControl.bInactivePs) { if (rt_state =3D=3D rf_off) { - if (priv->rtllib->RfOffReason > + if (priv->rtllib->rf_off_reason > RF_CHANGE_BY_IPS) { netdev_warn(dev, "%s(): RF is OFF.\n", __func__); diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 6b5c5962ae14..f7c786c8117e 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -1245,7 +1245,7 @@ enum ips_callback_function { =20 enum rt_rf_power_state { rf_on, - eRfSleep, + rf_sleep, rf_off }; =20 @@ -1435,7 +1435,7 @@ struct rtllib_device { bool be_scan_inprogress; bool beinretry; enum rt_rf_power_state rf_power_state; - RT_RF_CHANGE_SOURCE RfOffReason; + RT_RF_CHANGE_SOURCE rf_off_reason; bool is_set_key; bool wx_set_enc; struct rt_hi_throughput *pHTInfo; --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 1BF56C07E9D for ; Sat, 24 Sep 2022 22:03:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230201AbiIXWDm (ORCPT ); Sat, 24 Sep 2022 18:03:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51776 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234039AbiIXWDb (ORCPT ); Sat, 24 Sep 2022 18:03:31 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7001533350 for ; Sat, 24 Sep 2022 15:03:28 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id 13so7169506ejn.3 for ; Sat, 24 Sep 2022 15:03:28 -0700 (PDT) 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; bh=2vbRnOhD8TPYnS7wkqyA/FaN1lEvknTEkNYcBwkBWSw=; b=lyabth+2ha6CI/abNAc0A4hmmYmtoIj9qZeycWPA6WTN8GPMch3AIIeBePGKAWY3uE vYUst9GsmyMzTIwDLv7PdBWHz4Qt+EFDNVwhpN0Qre/vaM9Xu5UxcsOKNRLGNxjUmFj8 U6F4mDW1fzy2JtzS91Jm9mpBnr0uNH8AXKpAvyWQQcykRsPphCCyvoz+leFzaYuVkmi0 2ChoaYV7q/JKYjRI49OrgDgdQO9b063QrlAmOtuUgkCZbuwXVpd/NJdGOBZZu7On61PX 1G/Qi7TpxopspgiquyKl5k7pD4D3B9XVAOOY5LvAzBTFq7bf9FydYiZljs8kx6phqSUO JEPQ== 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; bh=2vbRnOhD8TPYnS7wkqyA/FaN1lEvknTEkNYcBwkBWSw=; b=UjlhQkQyG4ouNnTs0KGrO61333fDYSOgtiXFfzD8c1vzgyVmz7jlG3FewieUaVQloN GyPy1cyQcxXa7kPQskgExDY4DNNK39egpxZz363HSnGJS7PT29NtQYPx0nZNzZCWST2D UfLNMAFOL5td1qebfiNR4Dlo3Tzqn0VjaHbf1Giqa0aUKOA+VOtb+I4JXyXpgDGdmV8u fintvijG41YIOCVMgF//DFXKd5noiM8IwSwF9XH4pC0/4RtpH7wCSttM9uinZFF+z0TR cTsUk2kxA2/fvTponBN+TdYMbHYWPT7j5t0yA+UXOv1B0JyClC3QaHpEXtTpoRnF8Qwh VppQ== X-Gm-Message-State: ACrzQf0w/jP9ruX+m9ZZNw7Agw2Df1I3SvJEAVcMLNYOqWvamK5n5NEi RpdDq4w880+HfiwgfsatmetLEWC8bog= X-Google-Smtp-Source: AMsMyM75+lCEo4sIZEtqv3OQJGS+riGN/VQQDAADNF5SBwOIs7cNPV2yiT7jUVqGWs8gqmsNCerDNw== X-Received: by 2002:a17:907:75e7:b0:77a:2378:91bb with SMTP id jz7-20020a17090775e700b0077a237891bbmr12425293ejc.329.1664057008012; Sat, 24 Sep 2022 15:03:28 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id i21-20020aa7c9d5000000b00452878cba5bsm8114026edt.97.2022.09.24.15.03.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:03:26 -0700 (PDT) Date: Sun, 25 Sep 2022 00:03:24 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 03/10] staging: rtl8192e: Rename dot11Cur..., bCurTxBW40MHz and bCurrentRT2... Message-ID: <97c4f62da9a98b0ddcdaafae68182e3eb47f9a17.1664055213.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 dot11CurrentPreambleMode to dot11_current_preamble_mode, bCurTxBW40MHz to cur_tx_bw40mhz and bCurrentRT2RTLongSlotTime to current_rt2rt_long_slot_time to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 6 +++--- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 14 +++++++------- drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 4 ++-- drivers/staging/rtl8192e/rtl819x_HT.h | 4 ++-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 12 ++++++------ drivers/staging/rtl8192e/rtllib_tx.c | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index bd2696cdaccd..7391d7cb7a58 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -822,7 +822,7 @@ static void _rtl92e_net_update(struct net_device *dev) =20 net =3D &priv->rtllib->current_network; rtl92e_config_rate(dev, &rate_config); - priv->dot11CurrentPreambleMode =3D PREAMBLE_AUTO; + priv->dot11_current_preamble_mode =3D PREAMBLE_AUTO; priv->basic_rate =3D rate_config &=3D 0x15f; rtl92e_writew(dev, BSSIDR, *(u16 *)net->bssid); rtl92e_writel(dev, BSSIDR + 2, *(u32 *)(net->bssid + 2)); @@ -1998,10 +1998,10 @@ void rtl92e_update_ratr_table(struct net_device *de= v) break; } ratr_value &=3D 0x0FFFFFFF; - if (ieee->pHTInfo->bCurTxBW40MHz && + if (ieee->pHTInfo->cur_tx_bw40mhz && ieee->pHTInfo->bCurShortGI40MHz) ratr_value |=3D 0x80000000; - else if (!ieee->pHTInfo->bCurTxBW40MHz && + else if (!ieee->pHTInfo->cur_tx_bw40mhz && ieee->pHTInfo->bCurShortGI20MHz) ratr_value |=3D 0x80000000; rtl92e_writel(dev, RATR0+rate_index*4, ratr_value); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index 52b25df99642..89bc989cffba 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -287,16 +287,16 @@ static void _rtl92e_update_cap(struct net_device *dev= , u16 cap) bool ShortPreamble; =20 if (cap & WLAN_CAPABILITY_SHORT_PREAMBLE) { - if (priv->dot11CurrentPreambleMode !=3D PREAMBLE_SHORT) { + if (priv->dot11_current_preamble_mode !=3D PREAMBLE_SHORT) { ShortPreamble =3D true; - priv->dot11CurrentPreambleMode =3D PREAMBLE_SHORT; + priv->dot11_current_preamble_mode =3D PREAMBLE_SHORT; priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE, (unsigned char *)&ShortPreamble); } } else { - if (priv->dot11CurrentPreambleMode !=3D PREAMBLE_LONG) { + if (priv->dot11_current_preamble_mode !=3D PREAMBLE_LONG) { ShortPreamble =3D false; - priv->dot11CurrentPreambleMode =3D PREAMBLE_LONG; + priv->dot11_current_preamble_mode =3D PREAMBLE_LONG; priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACK_PREAMBLE, (unsigned char *)&ShortPreamble); } @@ -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->bCurrentRT2RTLongSlotTime)) { + (!priv->rtllib->pHTInfo->current_rt2rt_long_slot_time)) { if (cur_slot_time !=3D SHORT_SLOT_TIME) { slot_time_val =3D SHORT_SLOT_TIME; priv->rtllib->SetHwRegHandler(dev, @@ -341,7 +341,7 @@ static void _rtl92e_update_beacon(void *data) =20 if (ieee->pHTInfo->bCurrentHTSupport) HT_update_self_and_peer_setting(ieee, net); - ieee->pHTInfo->bCurrentRT2RTLongSlotTime =3D net->bssht.bd_rt2rt_long_slo= t_time; + 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; _rtl92e_update_cap(dev, net->capability); } @@ -833,7 +833,7 @@ static void _rtl92e_init_priv_variable(struct net_devic= e *dev) u8 i; =20 priv->AcmMethod =3D eAcmWay2_SW; - priv->dot11CurrentPreambleMode =3D PREAMBLE_AUTO; + priv->dot11_current_preamble_mode =3D PREAMBLE_AUTO; priv->rtllib->status =3D 0; priv->polling_timer_on =3D 0; priv->up_first_time =3D 1; diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.h index 093887bcd463..7021f9c435d9 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.h +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.h @@ -430,7 +430,7 @@ struct r8192_priv { =20 u16 basic_rate; u8 short_preamble; - u8 dot11CurrentPreambleMode; + u8 dot11_current_preamble_mode; u8 slot_time; u16 SifsTime; =20 diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index a4bffc081857..2394faba3940 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -343,9 +343,9 @@ static void _rtl92e_dm_check_rate_adaptive(struct net_d= evice *dev) =20 if (priv->rtllib->state =3D=3D RTLLIB_LINKED) { =20 - bshort_gi_enabled =3D (pHTInfo->bCurTxBW40MHz && + bshort_gi_enabled =3D (pHTInfo->cur_tx_bw40mhz && pHTInfo->bCurShortGI40MHz) || - (!pHTInfo->bCurTxBW40MHz && + (!pHTInfo->cur_tx_bw40mhz && pHTInfo->bCurShortGI20MHz); =20 pra->upper_rssi_threshold_ratr =3D diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index ce13b41074a7..2ab04469ef4b 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -148,7 +148,7 @@ struct rt_hi_throughput { u8 PeerMimoPs; =20 enum ht_extchnl_offset CurSTAExtChnlOffset; - u8 bCurTxBW40MHz; + u8 cur_tx_bw40mhz; u8 PeerBandwidth; =20 u8 bSwBwInProgress; @@ -157,7 +157,7 @@ struct rt_hi_throughput { u8 bRegRT2RTAggregation; u8 RT2RT_HT_Mode; u8 bCurrentRT2RTAggregation; - u8 bCurrentRT2RTLongSlotTime; + u8 current_rt2rt_long_slot_time; u8 szRT2RTAggBuffer[10]; =20 u8 bRegRxReorderEnable; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 3b8efaf9b88c..1e1364c56163 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -543,7 +543,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) #endif HTSetConnectBwMode(ieee, (enum ht_channel_width)(pPeerHTCap->ChlWidth), (enum ht_extchnl_offset)(pPeerHTInfo->ExtChlOffset)); - pHTInfo->bCurTxBW40MHz =3D ((pPeerHTInfo->RecommemdedTxWidth =3D=3D 1) ? + pHTInfo->cur_tx_bw40mhz =3D ((pPeerHTInfo->RecommemdedTxWidth =3D=3D 1) ? true : false); =20 pHTInfo->bCurShortGI20MHz =3D ((pHTInfo->bRegShortGI20MHz) ? @@ -633,7 +633,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->bCurrentHTSupport =3D false; =20 pHTInfo->bCurBW40MHz =3D false; - pHTInfo->bCurTxBW40MHz =3D false; + pHTInfo->cur_tx_bw40mhz =3D false; =20 pHTInfo->bCurShortGI20MHz =3D false; pHTInfo->bCurShortGI40MHz =3D false; @@ -660,7 +660,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->ePeerHTSpecVer =3D HT_SPEC_VER_IEEE; =20 pHTInfo->bCurrentRT2RTAggregation =3D false; - pHTInfo->bCurrentRT2RTLongSlotTime =3D false; + pHTInfo->current_rt2rt_long_slot_time =3D false; pHTInfo->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; =20 pHTInfo->IOTPeer =3D 0; @@ -720,12 +720,12 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devi= ce *ieee, if (pHTInfo->bRegRT2RTAggregation) { pHTInfo->bCurrentRT2RTAggregation =3D pNetwork->bssht.bd_rt2rt_aggregation; - pHTInfo->bCurrentRT2RTLongSlotTime =3D + pHTInfo->current_rt2rt_long_slot_time =3D pNetwork->bssht.bd_rt2rt_long_slot_time; pHTInfo->RT2RT_HT_Mode =3D pNetwork->bssht.rt2rt_ht_mode; } else { pHTInfo->bCurrentRT2RTAggregation =3D false; - pHTInfo->bCurrentRT2RTLongSlotTime =3D false; + pHTInfo->current_rt2rt_long_slot_time =3D false; pHTInfo->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; } =20 @@ -757,7 +757,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device= *ieee, } else { pHTInfo->bCurrentHTSupport =3D false; pHTInfo->bCurrentRT2RTAggregation =3D false; - pHTInfo->bCurrentRT2RTLongSlotTime =3D false; + pHTInfo->current_rt2rt_long_slot_time =3D false; pHTInfo->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; =20 pHTInfo->IOTAction =3D 0; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 9da83531932f..595f9b92ac83 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -384,7 +384,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->bCurTxBW40MHz && + if (pHTInfo->bCurBW40MHz && pHTInfo->cur_tx_bw40mhz && !ieee->bandwidth_auto_switch.bforced_tx20Mhz) tcb_desc->bPacketBW =3D true; } --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 3ABC7C32771 for ; Sat, 24 Sep 2022 22:03:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234029AbiIXWDr (ORCPT ); Sat, 24 Sep 2022 18:03:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234013AbiIXWDf (ORCPT ); Sat, 24 Sep 2022 18:03:35 -0400 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [IPv6:2a00:1450:4864:20::630]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 90B853341B for ; Sat, 24 Sep 2022 15:03:34 -0700 (PDT) Received: by mail-ej1-x630.google.com with SMTP id 13so7169754ejn.3 for ; Sat, 24 Sep 2022 15:03:34 -0700 (PDT) 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; bh=d8vVA7LCY08FZzjgVfkFGePEn4Ti/pmsWV+H+LOB/hs=; b=CUofn/74M6UBh0jXziN+l2pkrNyqT2HGhwRNgj15PqIu3+OPXTyth766Jn0pnAgWBx ts6DnrCvTXZy8dDM0mgdplyr6VpYgfdVeMYg1qRXZ+jt1M0LXOEQNAeb5QOZrUgLV0u0 lSc7fZ+cXtmB+jeosdj7Hyvy1XYART5MBoM1BUIkh1va7hSjLZ1KdXYJhYKx7LYItjnp c3wjPBVfhW0htl+q2hx4ml62R2XtWpBVzUxA7H241fls0W2pq+xWtrc7Y0loam3N+86J WDpgjmafdCuBhvUH8iX9bsMt/FgNZQoLO7HlNtFrfmEDFjRoJRKbnko8uRBoOmlS1jt1 D7ag== 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; bh=d8vVA7LCY08FZzjgVfkFGePEn4Ti/pmsWV+H+LOB/hs=; b=sxh+c1P8UrSB0HZh0TaXFLxYUB7Y3DDNmZkx6EfXp8ILQxVKSvPOzsskX4lh3JWwcQ /IpbEqxPjYya/7T/H/P4XtE2jA7wnP5vETAmr4T8yVCA8NamtSutqmmkN4l2tLUO7FEb NDh47mMhbDxo8B5X/1Owiqzwlc38tuRhVQw+gGhZazWMhrrqrQ7Z4OJLIOb8Nc/eUlqE dMMEPg/tGPFx5C6F11nnkKUioQwpScOtOckuXcAVtQMjlDGHaDFGTDg9j12MZiYkYImi /D8K3IhFeM/vtANeoOoQacOEZCgWbryJEB0Ya4wCLNpe4hQSQCqvnAICrmmsBzd9q3Vb Cx1A== X-Gm-Message-State: ACrzQf1CroI3sjHS+WK1ikHHK+MlrNW/bYofBE0KOolPoZSfU3dgPgw6 oAOEnGWQmdoGuT/MhF24MbYxa712hZk= X-Google-Smtp-Source: AMsMyM7W6gJVOcB9zELJw6hUtNm5npgCZacQ83cm8u/w/EMA4h8TJWlTD31JW73GaWDV4LvilWwp/g== X-Received: by 2002:a17:907:b0e:b0:77a:d97d:9afc with SMTP id h14-20020a1709070b0e00b0077ad97d9afcmr12273390ejl.199.1664057014168; Sat, 24 Sep 2022 15:03:34 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id kv6-20020a17090778c600b0076f0ab594e9sm5952191ejc.73.2022.09.24.15.03.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:03:33 -0700 (PDT) Date: Sun, 25 Sep 2022 00:03:31 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Rename bSwBwInPro..., bRegRT2RTAg... and bCurrentRT... Message-ID: <868f9db0e29bd170129f90bdbcc14238a750c440.1664055213.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 bSwBwInProgress to sw_bw_in_progress, bRegRT2RTAggregation to reg_rt2rt_aggregation and bCurrentRT2RTAggregation to current_rt2rt_aggregation to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 24 +++++++++++------------ drivers/staging/rtl8192e/rtllib_softmac.c | 6 +++--- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 2ab04469ef4b..5399931786b8 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -151,12 +151,12 @@ struct rt_hi_throughput { u8 cur_tx_bw40mhz; u8 PeerBandwidth; =20 - u8 bSwBwInProgress; + u8 sw_bw_in_progress; u8 SwBwStep; =20 - u8 bRegRT2RTAggregation; + u8 reg_rt2rt_aggregation; u8 RT2RT_HT_Mode; - u8 bCurrentRT2RTAggregation; + u8 current_rt2rt_aggregation; u8 current_rt2rt_long_slot_time; u8 szRT2RTAggBuffer[10]; =20 diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 1e1364c56163..cde64b123ced 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -98,7 +98,7 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) =20 ieee->bTxEnableFwCalcDur =3D 1; =20 - pHTInfo->bRegRT2RTAggregation =3D 1; + pHTInfo->reg_rt2rt_aggregation =3D 1; =20 pHTInfo->bRegRxReorderEnable =3D 1; pHTInfo->RxReorderWinSize =3D 64; @@ -574,7 +574,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pHTInfo->bCurrentAMPDUEnable =3D false; } =20 - if (!pHTInfo->bRegRT2RTAggregation) { + if (!pHTInfo->reg_rt2rt_aggregation) { if (pHTInfo->AMPDU_Factor > pPeerHTCap->MaxRxAMPDUFactor) pHTInfo->CurrentAMPDUFactor =3D pPeerHTCap->MaxRxAMPDUFactor; @@ -655,11 +655,11 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) memset((void *)(&(pHTInfo->PeerHTInfoBuf)), 0, sizeof(pHTInfo->PeerHTInfoBuf)); =20 - pHTInfo->bSwBwInProgress =3D false; + pHTInfo->sw_bw_in_progress =3D false; =20 pHTInfo->ePeerHTSpecVer =3D HT_SPEC_VER_IEEE; =20 - pHTInfo->bCurrentRT2RTAggregation =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; =20 @@ -717,14 +717,14 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devi= ce *ieee, pNetwork->bssht.bd_ht_info_buf, pNetwork->bssht.bd_ht_info_len); =20 - if (pHTInfo->bRegRT2RTAggregation) { - pHTInfo->bCurrentRT2RTAggregation =3D + if (pHTInfo->reg_rt2rt_aggregation) { + pHTInfo->current_rt2rt_aggregation =3D pNetwork->bssht.bd_rt2rt_aggregation; pHTInfo->current_rt2rt_long_slot_time =3D pNetwork->bssht.bd_rt2rt_long_slot_time; pHTInfo->RT2RT_HT_Mode =3D pNetwork->bssht.rt2rt_ht_mode; } else { - pHTInfo->bCurrentRT2RTAggregation =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; } @@ -756,7 +756,7 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_device= *ieee, pHTInfo->IOTAction |=3D HT_IOT_ACT_CDD_FSYNC; } else { pHTInfo->bCurrentHTSupport =3D false; - pHTInfo->bCurrentRT2RTAggregation =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; =20 @@ -850,7 +850,7 @@ static void HTSetConnectBwModeCallback(struct rtllib_de= vice *ieee) HT_EXTCHNL_OFFSET_NO_EXT); } =20 - pHTInfo->bSwBwInProgress =3D false; + pHTInfo->sw_bw_in_progress =3D false; } =20 void HTSetConnectBwMode(struct rtllib_device *ieee, @@ -865,8 +865,8 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) Bandwidth =3D HT_CHANNEL_WIDTH_20; =20 - if (pHTInfo->bSwBwInProgress) { - pr_info("%s: bSwBwInProgress!!\n", __func__); + if (pHTInfo->sw_bw_in_progress) { + pr_info("%s: sw_bw_in_progress!!\n", __func__); return; } if (Bandwidth =3D=3D HT_CHANNEL_WIDTH_20_40) { @@ -889,7 +889,7 @@ void HTSetConnectBwMode(struct rtllib_device *ieee, netdev_dbg(ieee->dev, "%s():pHTInfo->bCurBW40MHz:%x\n", __func__, pHTInfo->bCurBW40MHz); =20 - pHTInfo->bSwBwInProgress =3D true; + pHTInfo->sw_bw_in_progress =3D true; =20 HTSetConnectBwModeCallback(ieee); } diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 9a5dd031d3ff..9d38c35ecf9d 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -865,7 +865,7 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_= device *ieee, HTConstructInfoElement(ieee, tmp_ht_info_buf, &tmp_ht_info_len, encrypt); =20 - if (pHTInfo->bRegRT2RTAggregation) { + if (pHTInfo->reg_rt2rt_aggregation) { tmp_generic_ie_buf =3D ieee->pHTInfo->szRT2RTAggBuffer; tmp_generic_ie_len =3D sizeof(ieee->pHTInfo->szRT2RTAggBuffer); @@ -1189,7 +1189,7 @@ rtllib_association_req(struct rtllib_network *beacon, ht_cap_len =3D sizeof(ieee->pHTInfo->SelfHTCap); HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len, encrypt, true); - if (ieee->pHTInfo->bCurrentRT2RTAggregation) { + if (ieee->pHTInfo->current_rt2rt_aggregation) { realtek_ie_buf =3D ieee->pHTInfo->szRT2RTAggBuffer; realtek_ie_len =3D sizeof(ieee->pHTInfo->szRT2RTAggBuffer); @@ -1368,7 +1368,7 @@ rtllib_association_req(struct rtllib_network *beacon, tag +=3D ht_cap_len - 2; } =20 - if (ieee->pHTInfo->bCurrentRT2RTAggregation) { + if (ieee->pHTInfo->current_rt2rt_aggregation) { tag =3D skb_put(skb, realtek_ie_len); *tag++ =3D MFIE_TYPE_GENERIC; *tag++ =3D realtek_ie_len - 2; --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 B6594C07E9D for ; Sat, 24 Sep 2022 22:04:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234078AbiIXWEF (ORCPT ); Sat, 24 Sep 2022 18:04:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234005AbiIXWDu (ORCPT ); Sat, 24 Sep 2022 18:03:50 -0400 Received: from mail-ed1-x536.google.com (mail-ed1-x536.google.com [IPv6:2a00:1450:4864:20::536]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F13A6459A1 for ; Sat, 24 Sep 2022 15:03:46 -0700 (PDT) Received: by mail-ed1-x536.google.com with SMTP id v2so3582833edc.7 for ; Sat, 24 Sep 2022 15:03:46 -0700 (PDT) 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; bh=dSJnz+umwC1fO28aulEVuk9aMWTo08d86Tw2gPXDo/0=; b=HLHhHSnMyHhtzYq39NNbRzQpg/WFo6A+npAtuDI4SFXpSXV0WsoZEwOiqiQ9f5LH3U mYcJFFc0Qf2/xHCG8sk5zs/pL2FcY3Z7o3zm45Z3R2YFEG67xGwjdrLapDqhHaLPk6rK 3eWpEu0qjqJrtgdVIYfJ+wOj1MxI6TSftHhnYlpaCvwT4uNuOnVu0Tcv2R6YlbocnWSk qK7TKzA0ddGtGE9bLrybL+egPmv915St9xMMoHmF2msXrH1nUEuDY4BsauxLCPQmCvr8 1Oh+UT2qfCaGc1b+M+easHUPAf4r/xKaip6zgXMr62n5ndcSxTiFW9oocGRL6p6ulHTc bVTg== 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; bh=dSJnz+umwC1fO28aulEVuk9aMWTo08d86Tw2gPXDo/0=; b=vx/5UeL++LtTG/qkjn2YBTVZtIPpjK428Dv5xnJlL4OaECBObyIofMuPN9gR+h/r2V KiEqhD/MM7BUdqeiVx8wcOFFYCrJVFgcQEPoMCWKfXB2Hr26PIm3P85JUNFYIIfgpARA uxrjfXFf5Fep3C+LcRGspS5kOzQc79mJwUr6os5fQXOd1YEo8JJ1bxIDvZZ6v+GgDzqt uUODbzz4w/9WuH8SEDL9eiYP6+uWM2vlRmlQ7dm2Z1dOJwZkQ6mMqrIGWfqf0aTiuvmd Av80RQY/Xwye2/1lU9IfY66R/aAurtKK95Da58FROFGqEIqxYxWPZnk6JRZdPaP+rETu eBsg== X-Gm-Message-State: ACrzQf1pJk2/l8rPBUoBuBrvov2lr+4Oh3VEJ51LDjfuP7dIQKBesq58 vPKh6yOeW5w3uwCgk7RHrQg= X-Google-Smtp-Source: AMsMyM47OdgdZnT91Qet95p4gB/C79m1RvSWY2YqGAm+MXpQQeRDSydwfz7iQMZkK57x/rRh/bQhXg== X-Received: by 2002:a50:9510:0:b0:453:dded:60e with SMTP id u16-20020a509510000000b00453dded060emr15306559eda.204.1664057025203; Sat, 24 Sep 2022 15:03:45 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id z24-20020a50cd18000000b00456e130b457sm2936547edi.59.2022.09.24.15.03.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:03:44 -0700 (PDT) Date: Sun, 25 Sep 2022 00:03:42 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 05/10] staging: rtl8192e: Rename szRT2RTAggBuffer, bRegRxRe... and bCurRxReo... 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 szRT2RTAggBuffer to sz_rt2rt_agg_buf, bRegRxReorderEnable to reg_rx_reorder_enable and bCurRxReorderEnable to cur_rx_reorder_enable to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtllib_rx.c | 4 ++-- drivers/staging/rtl8192e/rtllib_softmac.c | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 5399931786b8..2dd08f06fa9f 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -158,10 +158,10 @@ struct rt_hi_throughput { u8 RT2RT_HT_Mode; u8 current_rt2rt_aggregation; u8 current_rt2rt_long_slot_time; - u8 szRT2RTAggBuffer[10]; + u8 sz_rt2rt_agg_buf[10]; =20 - u8 bRegRxReorderEnable; - u8 bCurRxReorderEnable; + u8 reg_rx_reorder_enable; + u8 cur_rx_reorder_enable; u8 RxReorderWinSize; u8 RxReorderPendingTime; u16 RxReorderDropCounter; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index cde64b123ced..e8fcfa01204b 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -100,7 +100,7 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) =20 pHTInfo->reg_rt2rt_aggregation =3D 1; =20 - pHTInfo->bRegRxReorderEnable =3D 1; + pHTInfo->reg_rx_reorder_enable =3D 1; pHTInfo->RxReorderWinSize =3D 64; pHTInfo->RxReorderPendingTime =3D 30; } @@ -605,7 +605,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pHTInfo->ForcedAMSDUMode =3D HT_AGG_FORCE_ENABLE; pHTInfo->ForcedAMSDUMaxSize =3D 7935; } - pHTInfo->bCurRxReorderEnable =3D pHTInfo->bRegRxReorderEnable; + pHTInfo->cur_rx_reorder_enable =3D pHTInfo->reg_rx_reorder_enable; =20 if (pPeerHTCap->MCS[0] =3D=3D 0) pPeerHTCap->MCS[0] =3D 0xff; diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index abe5c153f74e..8ec8aa7d97d4 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -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->bCurRxReorderEnable || + if (!ieee->pHTInfo->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->bCurRxReorderEnable || pTS =3D=3D NULL || bToOtherSTA) + if (!ieee->pHTInfo->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 9d38c35ecf9d..4708aa9752ed 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -866,9 +866,9 @@ static struct sk_buff *rtllib_probe_resp(struct rtllib_= device *ieee, encrypt); =20 if (pHTInfo->reg_rt2rt_aggregation) { - tmp_generic_ie_buf =3D ieee->pHTInfo->szRT2RTAggBuffer; + tmp_generic_ie_buf =3D ieee->pHTInfo->sz_rt2rt_agg_buf; tmp_generic_ie_len =3D - sizeof(ieee->pHTInfo->szRT2RTAggBuffer); + sizeof(ieee->pHTInfo->sz_rt2rt_agg_buf); HTConstructRT2RTAggElement(ieee, tmp_generic_ie_buf, &tmp_generic_ie_len); } @@ -1190,9 +1190,9 @@ rtllib_association_req(struct rtllib_network *beacon, HTConstructCapabilityElement(ieee, ht_cap_buf, &ht_cap_len, encrypt, true); if (ieee->pHTInfo->current_rt2rt_aggregation) { - realtek_ie_buf =3D ieee->pHTInfo->szRT2RTAggBuffer; + realtek_ie_buf =3D ieee->pHTInfo->sz_rt2rt_agg_buf; realtek_ie_len =3D - sizeof(ieee->pHTInfo->szRT2RTAggBuffer); + sizeof(ieee->pHTInfo->sz_rt2rt_agg_buf); HTConstructRT2RTAggElement(ieee, realtek_ie_buf, &realtek_ie_len); } --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 8A3B0C32771 for ; Sat, 24 Sep 2022 22:04:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233959AbiIXWEN (ORCPT ); Sat, 24 Sep 2022 18:04:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52006 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234032AbiIXWD7 (ORCPT ); Sat, 24 Sep 2022 18:03:59 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3EED34BA6A for ; Sat, 24 Sep 2022 15:03:53 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id f20so4464400edf.6 for ; Sat, 24 Sep 2022 15:03:53 -0700 (PDT) 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; bh=eP06qnbCwxGVtciyiHBHP8FAxePB4HjgZ+xJDoorIoU=; b=K8w1XgAMjxjat1n8IG/jP6N000U9JPzKgvv3GitU6ECmkSsbyVMl2lfwA4+p+hGrfi e9d9M1KV5zPRVnS/k6Z7GVkkLZynn57tg40ILsdURjO+sBsgyk130Sff6p60agBYn8Oa 7EPhtqBgRgA17D6RRjqcvmRMhY74jAjb3u/Jkh2ja6ixXmYxQfH2AB8L0c8XqNW1p2OF jw5BRakkawk+yOBLm1tf9sFTqfxw3xOhnsHWBrvOLDLjrHm1s15PsGRDcK6rfnZH3j+y KopqdvEKiNHgyp7PH3xD5PllgXtgT6/629Hykwj/WuZxvr88elXhNeTzTxqX6zwobw43 jeyA== 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; bh=eP06qnbCwxGVtciyiHBHP8FAxePB4HjgZ+xJDoorIoU=; b=dnsvGZ78DxLIWZNxV6rUQ7S2cXxpjdiv2dOiEtO4wozIXIKYKJlcLORfJd97UVdokl YDEcH1t9oIZWPjX9LYsiqjoiTWmKjnA0gP0ufsz9nFpBxfBV+w5RnRHOhjXxfESRgNGR dQlOE2dnnbDn556dFUnQv0hv94gIwL+AvINYLKiPgQYjH9TKqexo6oDXske6Q4mwjNin WRKJ+OhFNnIINicM3I/hT8FUWV4zdcwEgfIijkeM5HFfYAvy3VVK9n9meyHHsv4+PNoD HzPUCGaZiTME+QhzuRRhZI5C3yR7UMJl0ImvfimmUlwu3Q/xqOOt1w3v0yuRoQYPNSz/ BEJQ== X-Gm-Message-State: ACrzQf0t5FTcYaENjZ00NIqDw3D2P8lg3P6CAKsOuRGTBxffuk/GKIKk CuThMQddEL2uoYLY/3T/2FTkFYPF9n0= X-Google-Smtp-Source: AMsMyM53mrQZtXzxgQuIoVb1KZPCMdFFLkBIqiP4IVJUTIo9wr2lyHC2bED28BhxfgagYrZq1acldg== X-Received: by 2002:a05:6402:f07:b0:450:bf95:59e9 with SMTP id i7-20020a0564020f0700b00450bf9559e9mr15265805eda.46.1664057031655; Sat, 24 Sep 2022 15:03:51 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id f10-20020a170906084a00b0073c80d008d5sm5882486ejd.122.2022.09.24.15.03.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:03:51 -0700 (PDT) Date: Sun, 25 Sep 2022 00:03:49 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 06/10] staging: rtl8192e: Rename RxRe...WinSize, RxReorder... and RxReorderDr... 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 RxReorderWinSize to rx_reorder_win_size, RxReorderPendingTime to rx_reorder_pending_time and RxReorderDropCounter to rx_reorder_drop_counter to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ++-- drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- drivers/staging/rtl8192e/rtllib_rx.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 2dd08f06fa9f..7380df65959b 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -162,9 +162,9 @@ struct rt_hi_throughput { =20 u8 reg_rx_reorder_enable; u8 cur_rx_reorder_enable; - u8 RxReorderWinSize; - u8 RxReorderPendingTime; - u16 RxReorderDropCounter; + u8 rx_reorder_win_size; + u8 rx_reorder_pending_time; + u16 rx_reorder_drop_counter; =20 u8 bIsPeerBcm; =20 diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index e8fcfa01204b..a7ccdee57a1b 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -101,8 +101,8 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) pHTInfo->reg_rt2rt_aggregation =3D 1; =20 pHTInfo->reg_rx_reorder_enable =3D 1; - pHTInfo->RxReorderWinSize =3D 64; - pHTInfo->RxReorderPendingTime =3D 30; + pHTInfo->rx_reorder_win_size =3D 64; + pHTInfo->rx_reorder_pending_time =3D 30; } =20 static u16 HTMcsToDataRate(struct rtllib_device *ieee, u8 nMcsRate) diff --git a/drivers/staging/rtl8192e/rtl819x_TSProc.c b/drivers/staging/rt= l8192e/rtl819x_TSProc.c index 34b00a76b6bd..05c7e822f372 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->RxReorderPendingTime) + msecs_to_jiffies(ieee->pHTInfo->rx_reorder_pending_time) ); } spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192= e/rtllib_rx.c index 8ec8aa7d97d4..46d75e925ee9 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c @@ -569,7 +569,7 @@ static void RxReorderIndicatePacket(struct rtllib_devic= e *ieee, { struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; struct rx_reorder_entry *pReorderEntry =3D NULL; - u8 WinSize =3D pHTInfo->RxReorderWinSize; + u8 WinSize =3D pHTInfo->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->RxReorderDropCounter++; + pHTInfo->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->RxReorderPendingTime)); + msecs_to_jiffies(pHTInfo->rx_reorder_pending_time)); } spin_unlock_irqrestore(&(ieee->reorder_spinlock), flags); } --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 516A9C07E9D for ; Sat, 24 Sep 2022 22:04:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234049AbiIXWEb (ORCPT ); Sat, 24 Sep 2022 18:04:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234023AbiIXWEH (ORCPT ); Sat, 24 Sep 2022 18:04:07 -0400 Received: from mail-ed1-x52f.google.com (mail-ed1-x52f.google.com [IPv6:2a00:1450:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E535532EF8 for ; Sat, 24 Sep 2022 15:04:00 -0700 (PDT) Received: by mail-ed1-x52f.google.com with SMTP id a41so4477791edf.4 for ; Sat, 24 Sep 2022 15:04:00 -0700 (PDT) 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; bh=iq1GBh/tdBvUDeAvwq2njyOnzoIpEC5Or1BTX3YZ5xM=; b=ZnPUoz8cMb+CdT44ri7FiPTk2b0i3XC9MvixBdVdrZUJW6nzg856ZKfDDCuqLitXUN aT6cA3BP56/DR+VupfOFwOqVwkCDBIS6Yh7KP9FrBy3ijTEme+nx0XWA5xDWyG80eZcl zbwbj8cVrMalXDF3i7KaXpoaveb2zwMEiQdr5JjWIOh7mQ1jLy2f6A+vSoLjMUvEDSEY BLG5qpJxrr+Ng1E5ty/X7N2M3ripO2pwzW/WFadZZDOfALSUApKszY7B4UwmirOy2C4q sSQmJi39PoUp05J23uUO3Frssy5AEP1lTQ+IASo3ShSrtuXwFaxV0+BCe3G8mxiwbYyZ 4Wdg== 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; bh=iq1GBh/tdBvUDeAvwq2njyOnzoIpEC5Or1BTX3YZ5xM=; b=TQF3/evPRWNg+U+Sp9Bn2NyhRdpL+pHLXJGFPcRSfJHwrNKfE33ArWiLtmWj4RG8y2 s9LLvbdTx5QbXNFWspRN3hZbvVj/mw267zETCTINP6fjjc/Qb8ytXlNBgl467M902Wfr rzJ2HYCGzPRQhV1Mj9J3vWsqIQK4Sc9MgrwtbvzfFKW0fkdFzBK7d5OZWx/YzarJ9/CU U832zte1W+pq+9/A7F/0cTEm34Kjx8aGjo9qyDllElbhrnK/g3hxgI85+tj5TIdYxH7w Pdv+RHhmsfOcWDudTIHlzUbygn847d45fPURkT6cX2cf1eXWNxc94ygOHsKTqYsMN5XX Hs3g== X-Gm-Message-State: ACrzQf0wRD+MyoVTjch1IiT25FkxL6414imj8ilofFbzGLCpmXFfDuGh 7ws+0jsbx60s18zjaskzFAtDafd5Leo= X-Google-Smtp-Source: AMsMyM5GDECHBtU/iAOMe4+jRClRIBhwPQce489aTFHYmSxGZ90if7eeBSt/IEvCwE29Ghy1sGKXOg== X-Received: by 2002:a05:6402:d47:b0:454:e621:3b3f with SMTP id ec7-20020a0564020d4700b00454e6213b3fmr15075254edb.5.1664057039362; Sat, 24 Sep 2022 15:03:59 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id o20-20020aa7dd54000000b0044e1b4bca41sm3844324edw.79.2022.09.24.15.03.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:03:58 -0700 (PDT) Date: Sun, 25 Sep 2022 00:03:56 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 07/10] staging: rtl8192e: Rename PeerMimoPs, IOTAction and IOTRaFunc Message-ID: <2a8ce7bff9a00fe44c057242cedb27ca91219137.1664055213.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 PeerMimoPs to peer_mimo_ps, IOTAction to iot_action and IOTRaFunc to iot_ra_func to avoid CamelCase which is not accepted by checkpatch. Added spaces around '&' as proposed by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- .../staging/rtl8192e/rtl8192e/r8192E_dev.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 2 +- drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 12 ++--- drivers/staging/rtl8192e/rtl819x_BAProc.c | 4 +- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +-- drivers/staging/rtl8192e/rtl819x_HTProc.c | 48 +++++++++---------- drivers/staging/rtl8192e/rtllib_softmac.c | 12 ++--- drivers/staging/rtl8192e/rtllib_tx.c | 10 ++-- 8 files changed, 48 insertions(+), 48 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_dev.c index 7391d7cb7a58..18e4e5d84878 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c @@ -1985,7 +1985,7 @@ void rtl92e_update_ratr_table(struct net_device *dev) break; case IEEE_N_24G: case IEEE_N_5G: - if (ieee->pHTInfo->PeerMimoPs =3D=3D 0) { + if (ieee->pHTInfo->peer_mimo_ps =3D=3D 0) { ratr_value &=3D 0x0007F007; } else { if (priv->rf_type =3D=3D RF_1T2R) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c b/drivers/staging/= rtl8192e/rtl8192e/rtl_cam.c index 4226bbaaca44..41faeb4b9b9b 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_cam.c @@ -42,7 +42,7 @@ void rtl92e_enable_hw_security_config(struct net_device *= dev) =20 =20 ieee->hwsec_active =3D 1; - if ((ieee->pHTInfo->IOTAction&HT_IOT_ACT_PURE_N_MODE) || !hwwep) { + if ((ieee->pHTInfo->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_dm.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_dm.c index 2394faba3940..3e46ac02c10e 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c @@ -1548,13 +1548,13 @@ 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->IOTAction & HT_IOT_ACT_DISABLE_EDCA_TURBO) + if (priv->rtllib->pHTInfo->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->IOTAction & HT_IOT_ACT_EDCA_BIAS_ON_RX) { + if (pHTInfo->iot_action & HT_IOT_ACT_EDCA_BIAS_ON_RX) { if (curTxOkCnt > 4*curRxOkCnt) { if (priv->bis_cur_rdlstate || !priv->bcurrent_turbo_EDCA) { @@ -1633,16 +1633,16 @@ static void _rtl92e_dm_cts_to_self(struct net_devic= e *dev) unsigned long curRxOkCnt =3D 0; =20 if (!priv->rtllib->bCTSToSelfEnable) { - pHTInfo->IOTAction &=3D ~HT_IOT_ACT_FORCED_CTS2SELF; + pHTInfo->iot_action &=3D ~HT_IOT_ACT_FORCED_CTS2SELF; return; } if (pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_BROADCOM) { curTxOkCnt =3D priv->stats.txbytesunicast - lastTxOkCnt; curRxOkCnt =3D priv->stats.rxbytesunicast - lastRxOkCnt; if (curRxOkCnt > 4*curTxOkCnt) - pHTInfo->IOTAction &=3D ~HT_IOT_ACT_FORCED_CTS2SELF; + pHTInfo->iot_action &=3D ~HT_IOT_ACT_FORCED_CTS2SELF; else - pHTInfo->IOTAction |=3D HT_IOT_ACT_FORCED_CTS2SELF; + pHTInfo->iot_action |=3D HT_IOT_ACT_FORCED_CTS2SELF; =20 lastTxOkCnt =3D priv->stats.txbytesunicast; lastRxOkCnt =3D priv->stats.rxbytesunicast; @@ -1997,7 +1997,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->IOTAction & HT_IOT_ACT_CDD_FSYNC)) { + (priv->rtllib->pHTInfo->iot_action & HT_IOT_ACT_CDD_FSYNC)) { u32 rate_bitmap; =20 for (rate_index =3D 0; rate_index <=3D 27; rate_index++) { diff --git a/drivers/staging/rtl8192e/rtl819x_BAProc.c b/drivers/staging/rt= l8192e/rtl819x_BAProc.c index 4c907fb16253..19d13b3fcecf 100644 --- a/drivers/staging/rtl8192e/rtl819x_BAProc.c +++ b/drivers/staging/rtl8192e/rtl819x_BAProc.c @@ -246,7 +246,7 @@ int rtllib_rx_ADDBAReq(struct rtllib_device *ieee, stru= ct sk_buff *skb) =20 if (!ieee->current_network.qos_data.active || !ieee->pHTInfo->bCurrentHTSupport || - (ieee->pHTInfo->IOTAction & HT_IOT_ACT_REJECT_ADDBA_REQ)) { + (ieee->pHTInfo->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", @@ -278,7 +278,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->IOTAction & HT_IOT_ACT_ALLOW_PEER_AGG_ONE_PKT)) + (ieee->pHTInfo->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; diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 7380df65959b..f656869523fa 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -145,7 +145,7 @@ struct rt_hi_throughput { u8 CurrentOpMode; =20 u8 SelfMimoPs; - u8 PeerMimoPs; + u8 peer_mimo_ps; =20 enum ht_extchnl_offset CurSTAExtChnlOffset; u8 cur_tx_bw40mhz; @@ -169,8 +169,8 @@ struct rt_hi_throughput { u8 bIsPeerBcm; =20 u8 IOTPeer; - u32 IOTAction; - u8 IOTRaFunc; + u32 iot_action; + u8 iot_ra_func; =20 u8 bWAIotBroadcom; u8 WAIotTH; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index a7ccdee57a1b..0f275b6333b2 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -254,20 +254,20 @@ static void HTIOTActDetermineRaFunc(struct rtllib_dev= ice *ieee, bool bPeerRx2ss) { struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; =20 - pHTInfo->IOTRaFunc &=3D HT_IOT_RAFUNC_DISABLE_ALL; + pHTInfo->iot_ra_func &=3D HT_IOT_RAFUNC_DISABLE_ALL; =20 if (pHTInfo->IOTPeer =3D=3D HT_IOT_PEER_RALINK && !bPeerRx2ss) - pHTInfo->IOTRaFunc |=3D HT_IOT_RAFUNC_PEER_1R; + pHTInfo->iot_ra_func |=3D HT_IOT_RAFUNC_PEER_1R; =20 - if (pHTInfo->IOTAction & HT_IOT_ACT_AMSDU_ENABLE) - pHTInfo->IOTRaFunc |=3D HT_IOT_RAFUNC_TX_AMSDU; + if (pHTInfo->iot_action & HT_IOT_ACT_AMSDU_ENABLE) + pHTInfo->iot_ra_func |=3D HT_IOT_RAFUNC_TX_AMSDU; } =20 void HTResetIOTSetting(struct rt_hi_throughput *pHTInfo) { - pHTInfo->IOTAction =3D 0; + pHTInfo->iot_action =3D 0; pHTInfo->IOTPeer =3D HT_IOT_PEER_UNKNOWN; - pHTInfo->IOTRaFunc =3D 0; + pHTInfo->iot_ra_func =3D 0; } =20 void HTConstructCapabilityElement(struct rtllib_device *ieee, u8 *posHTCap, @@ -332,16 +332,16 @@ void HTConstructCapabilityElement(struct rtllib_devic= e *ieee, u8 *posHTCap, pCapELE->ASCap =3D 0; =20 if (bAssoc) { - if (pHT->IOTAction & HT_IOT_ACT_DISABLE_MCS15) + if (pHT->iot_action & HT_IOT_ACT_DISABLE_MCS15) pCapELE->MCS[1] &=3D 0x7f; =20 - if (pHT->IOTAction & HT_IOT_ACT_DISABLE_MCS14) + if (pHT->iot_action & HT_IOT_ACT_DISABLE_MCS14) pCapELE->MCS[1] &=3D 0xbf; =20 - if (pHT->IOTAction & HT_IOT_ACT_DISABLE_ALL_2SS) + if (pHT->iot_action & HT_IOT_ACT_DISABLE_ALL_2SS) pCapELE->MCS[1] &=3D 0x00; =20 - if (pHT->IOTAction & HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI) + if (pHT->iot_action & HT_IOT_ACT_DISABLE_RX_40MHZ_SHORT_GI) pCapELE->ShortGI40Mhz =3D 0; =20 if (ieee->GetHalfNmodeSupportByAPsHandler(ieee->dev)) { @@ -600,7 +600,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) pHTInfo->CurrentMPDUDensity =3D pHTInfo->MPDU_Density; else pHTInfo->CurrentMPDUDensity =3D pPeerHTCap->MPDUDensity; - if (pHTInfo->IOTAction & HT_IOT_ACT_TX_USE_AMSDU_8K) { + if (pHTInfo->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { pHTInfo->bCurrentAMPDUEnable =3D false; pHTInfo->ForcedAMSDUMode =3D HT_AGG_FORCE_ENABLE; pHTInfo->ForcedAMSDUMaxSize =3D 7935; @@ -614,8 +614,8 @@ void HTOnAssocRsp(struct rtllib_device *ieee) =20 HTFilterMCSRate(ieee, pPeerHTCap->MCS, ieee->dot11HTOperationalRateSet); =20 - pHTInfo->PeerMimoPs =3D pPeerHTCap->MimoPwrSave; - if (pHTInfo->PeerMimoPs =3D=3D MIMO_PS_STATIC) + pHTInfo->peer_mimo_ps =3D pPeerHTCap->MimoPwrSave; + if (pHTInfo->peer_mimo_ps =3D=3D MIMO_PS_STATIC) pMcsFilter =3D MCS_FILTER_1SS; else pMcsFilter =3D MCS_FILTER_ALL; @@ -664,8 +664,8 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) pHTInfo->RT2RT_HT_Mode =3D (enum rt_ht_capability)0; =20 pHTInfo->IOTPeer =3D 0; - pHTInfo->IOTAction =3D 0; - pHTInfo->IOTRaFunc =3D 0; + pHTInfo->iot_action =3D 0; + pHTInfo->iot_ra_func =3D 0; =20 { u8 *RegHTSuppRateSets =3D &(ieee->RegHTSuppRateSet[0]); @@ -731,37 +731,37 @@ void HTResetSelfAndSavePeerSetting(struct rtllib_devi= ce *ieee, =20 HTIOTPeerDetermine(ieee); =20 - pHTInfo->IOTAction =3D 0; + pHTInfo->iot_action =3D 0; bIOTAction =3D HTIOTActIsDisableMCS14(ieee, pNetwork->bssid); if (bIOTAction) - pHTInfo->IOTAction |=3D HT_IOT_ACT_DISABLE_MCS14; + pHTInfo->iot_action |=3D HT_IOT_ACT_DISABLE_MCS14; =20 bIOTAction =3D HTIOTActIsDisableMCS15(ieee); if (bIOTAction) - pHTInfo->IOTAction |=3D HT_IOT_ACT_DISABLE_MCS15; + pHTInfo->iot_action |=3D HT_IOT_ACT_DISABLE_MCS15; =20 bIOTAction =3D HTIOTActIsDisableMCSTwoSpatialStream(ieee); if (bIOTAction) - pHTInfo->IOTAction |=3D HT_IOT_ACT_DISABLE_ALL_2SS; + pHTInfo->iot_action |=3D HT_IOT_ACT_DISABLE_ALL_2SS; =20 bIOTAction =3D HTIOTActIsDisableEDCATurbo(ieee, pNetwork->bssid); if (bIOTAction) - pHTInfo->IOTAction |=3D HT_IOT_ACT_DISABLE_EDCA_TURBO; + pHTInfo->iot_action |=3D HT_IOT_ACT_DISABLE_EDCA_TURBO; =20 bIOTAction =3D HTIOTActIsMgntUseCCK6M(ieee, pNetwork); if (bIOTAction) - pHTInfo->IOTAction |=3D HT_IOT_ACT_MGNT_USE_CCK_6M; + pHTInfo->iot_action |=3D HT_IOT_ACT_MGNT_USE_CCK_6M; bIOTAction =3D HTIOTActIsCCDFsync(ieee); if (bIOTAction) - pHTInfo->IOTAction |=3D HT_IOT_ACT_CDD_FSYNC; + pHTInfo->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; =20 - pHTInfo->IOTAction =3D 0; - pHTInfo->IOTRaFunc =3D 0; + pHTInfo->iot_action =3D 0; + pHTInfo->iot_ra_func =3D 0; } } =20 diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 4708aa9752ed..1a3ca3e57623 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -180,7 +180,7 @@ static u8 MgntQuery_MgntFrameTxRate(struct rtllib_devic= e *ieee) struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; u8 rate; =20 - if (pHTInfo->IOTAction & HT_IOT_ACT_MGNT_USE_CCK_6M) + if (pHTInfo->iot_action & HT_IOT_ACT_MGNT_USE_CCK_6M) rate =3D 0x0c; else rate =3D ieee->basic_rate & 0x7f; @@ -1894,7 +1894,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->IOTAction |=3D HT_IOT_ACT_PURE_N_MODE; + ieee->pHTInfo->iot_action |=3D HT_IOT_ACT_PURE_N_MODE; } else { ieee->AsocRetryCount =3D 0; } @@ -2101,7 +2101,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->IOTAction & + if (ieee->pHTInfo->iot_action & HT_IOT_ACT_NULL_DATA_POWER_SAVING) { ieee->ack_tx_to_ieee =3D 1; rtllib_sta_ps_send_null_frame(ieee, 0); @@ -2117,7 +2117,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->IOTAction & + if (ieee->pHTInfo->iot_action & HT_IOT_ACT_NULL_DATA_POWER_SAVING) { ieee->ack_tx_to_ieee =3D 1; rtllib_sta_ps_send_null_frame(ieee, 0); @@ -2152,7 +2152,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->IOTAction & + if (ieee->pHTInfo->iot_action & HT_IOT_ACT_NULL_DATA_POWER_SAVING) rtllib_sta_ps_send_null_frame(ieee, 0); else @@ -2296,7 +2296,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->IOTAction & HT_IOT_ACT_PURE_N_MODE)) { + if (!(ieee->pHTInfo->iot_action & HT_IOT_ACT_PURE_N_MODE)) { if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) { if (IsHTHalfNmodeAPs(ieee)) { bSupportNmode =3D true; diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 595f9b92ac83..5aad9263bed1 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -284,7 +284,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_devic= e *ieee, if (tcb_desc->bdhcp || ieee->CntAfterLink < 2) return; =20 - if (pHTInfo->IOTAction & HT_IOT_ACT_TX_NO_AGGREGATION) + if (pHTInfo->iot_action & HT_IOT_ACT_TX_NO_AGGREGATION) return; =20 if (!ieee->GetNmodeSupportBySecCfg(ieee->dev)) @@ -422,12 +422,12 @@ static void rtllib_query_protectionmode(struct rtllib= _device *ieee, pHTInfo =3D ieee->pHTInfo; =20 while (true) { - if (pHTInfo->IOTAction & HT_IOT_ACT_FORCED_CTS2SELF) { + if (pHTInfo->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->IOTAction & (HT_IOT_ACT_FORCED_RTS | + } else if (pHTInfo->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; @@ -885,7 +885,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->IOTAction & + if (ieee->pHTInfo->iot_action & HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate =3D MgntQuery_TxRateExcludeCCKRates(ieee); @@ -910,7 +910,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->IOTAction & + if (ieee->pHTInfo->iot_action & HT_IOT_ACT_WA_IOT_Broadcom) { tcb_desc->data_rate =3D MgntQuery_TxRateExcludeCCKRates(ieee); --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 9BD32C07E9D for ; Sat, 24 Sep 2022 22:04:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234086AbiIXWEe (ORCPT ); Sat, 24 Sep 2022 18:04:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234055AbiIXWEL (ORCPT ); Sat, 24 Sep 2022 18:04:11 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9252E3A16B for ; Sat, 24 Sep 2022 15:04:07 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id m3so4432232eda.12 for ; Sat, 24 Sep 2022 15:04:07 -0700 (PDT) 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; bh=mwmv7xOROMQWgRYRX1JJBkfjP0Il8vL4+C4wGKBb7jE=; b=fsp7GXaS3lZVimtv6FUR+M3KZzqf+JSaEkdQZ5HLgi7YWdtUanAaF9x0DIX5O0Bh8C bKRR7Yix/5BSckwpTYHhjwIdgf84d78ikTFd45xQ8X/s/DAdaoT7kdIaPXpIOgsHEfwc BrACQBfyk5D9kTJJXv7+xej/y/hVXFkXHOpCVdctYGtOrBcur4Zk+GW8/OV4wSR3AD5c pJWx6+xQFpuqGCMOOgO45598L+NEqYDyY2lfpKrbbRVbtoZb5kgOR6tvsXRDXbxpeTAb WPYoafQa/MWIz2KhEUhWf9klIbPbAktqrk84mv0rGcHmYmveXqX/3Jp58pzb6hWSwXY4 jR2w== 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; bh=mwmv7xOROMQWgRYRX1JJBkfjP0Il8vL4+C4wGKBb7jE=; b=RxUqeqeEGejv1Zx1EcNX5ys/6VCNrJA6P+7fe0CbZohT6IThIIO3WmjBpCJnPlqF4u haDkEiX2wwkoXIq6MDKEQWKxizYxuxmLVPaoQwOV55TrYAZ1D6udin1Oo/erqmwjRV+1 97h24gUGh60p4iLzOsUf33wb4cI1Y5u09SVDfqT94LHfFe3piYQQ5rP8e3qSGuBn5AKH uvxdm7oaLX8su69BXhWGOR6kPKmfhJT7CPaArbUMRZoFzn7Gpl/bgBFVoHpq5uyjiL4a urzJQIACyD4YmcbixHEcyWGy/yuWCc74i174/2OdUY534AmRgbz1V4pfghFie0T1oKyN XqBw== X-Gm-Message-State: ACrzQf3A8G61rfYCtwG1GFXfXMR+SsTZYH3TAwK8mw4M6AeafZ8X7tpj XCgmxKn4Ou0N+0uzGczyle0= X-Google-Smtp-Source: AMsMyM76avNymSbmgkL3qfd1Wgp72ASpep118M7tKa6MOdwayVER7Q3nXlcWjk1JBYHRWSpkU14vZg== X-Received: by 2002:a05:6402:518e:b0:452:49bc:179f with SMTP id q14-20020a056402518e00b0045249bc179fmr15295393edd.224.1664057045934; Sat, 24 Sep 2022 15:04:05 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id kx16-20020a170907775000b00780982d77d1sm5940013ejc.154.2022.09.24.15.04.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:04:05 -0700 (PDT) Date: Sun, 25 Sep 2022 00:04:03 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 08/10] staging: rtl8192e: Rename SelfMimoPs, CurrentOpMode and bForcedShortGI Message-ID: <4c59f62a95b9a77711284998b98fbc559b8db813.1664055213.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 SelfMimoPs to self_mimo_ps, CurrentOpMode to current_op_mode and bForcedShortGI to forced_short_gi to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 16 ++++++++-------- drivers/staging/rtl8192e/rtllib_tx.c | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index f656869523fa..6b3f280407a3 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -140,11 +140,11 @@ struct rt_hi_throughput { enum ht_aggre_mode ForcedAMSDUMode; u16 ForcedAMSDUMaxSize; =20 - u8 bForcedShortGI; + u8 forced_short_gi; =20 - u8 CurrentOpMode; + u8 current_op_mode; =20 - u8 SelfMimoPs; + u8 self_mimo_ps; u8 peer_mimo_ps; =20 enum ht_extchnl_offset CurSTAExtChnlOffset; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 0f275b6333b2..1ef5c04914af 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -90,9 +90,9 @@ void HTUpdateDefaultSetting(struct rtllib_device *ieee) pHTInfo->AMPDU_Factor =3D 2; pHTInfo->MPDU_Density =3D 0; =20 - pHTInfo->SelfMimoPs =3D 3; - if (pHTInfo->SelfMimoPs =3D=3D 2) - pHTInfo->SelfMimoPs =3D 3; + 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; =20 @@ -300,7 +300,7 @@ void HTConstructCapabilityElement(struct rtllib_device = *ieee, u8 *posHTCap, else pCapELE->ChlWidth =3D (pHT->bRegBW40MHz ? 1 : 0); =20 - pCapELE->MimoPwrSave =3D pHT->SelfMimoPs; + pCapELE->MimoPwrSave =3D pHT->self_mimo_ps; pCapELE->GreenField =3D 0; pCapELE->ShortGI20Mhz =3D 1; pCapELE->ShortGI40Mhz =3D 1; @@ -377,7 +377,7 @@ void HTConstructInfoElement(struct rtllib_device *ieee,= u8 *posHTInfo, pHTInfoEle->RIFS =3D 0; pHTInfoEle->PSMPAccessOnly =3D 0; pHTInfoEle->SrvIntGranularity =3D 0; - pHTInfoEle->OptMode =3D pHT->CurrentOpMode; + pHTInfoEle->OptMode =3D pHT->current_op_mode; pHTInfoEle->NonGFDevPresent =3D 0; pHTInfoEle->DualBeacon =3D 0; pHTInfoEle->SecondaryBeacon =3D 0; @@ -623,7 +623,7 @@ void HTOnAssocRsp(struct rtllib_device *ieee) ieee->dot11HTOperationalRateSet, pMcsFilter); ieee->HTCurrentOperaRate =3D ieee->HTHighestOperaRate; =20 - pHTInfo->CurrentOpMode =3D pPeerHTInfo->OptMode; + pHTInfo->current_op_mode =3D pPeerHTInfo->OptMode; } =20 void HTInitializeHTInfo(struct rtllib_device *ieee) @@ -637,7 +637,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) =20 pHTInfo->bCurShortGI20MHz =3D false; pHTInfo->bCurShortGI40MHz =3D false; - pHTInfo->bForcedShortGI =3D false; + pHTInfo->forced_short_gi =3D false; =20 pHTInfo->bCurSuppCCK =3D true; =20 @@ -774,7 +774,7 @@ void HT_update_self_and_peer_setting(struct rtllib_devi= ce *ieee, =20 if (pHTInfo->bCurrentHTSupport) { if (pNetwork->bssht.bd_ht_info_len !=3D 0) - pHTInfo->CurrentOpMode =3D pPeerHTInfo->OptMode; + pHTInfo->current_op_mode =3D pPeerHTInfo->OptMode; } } EXPORT_SYMBOL(HT_update_self_and_peer_setting); diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index 5aad9263bed1..c8a8fad35cb5 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -358,7 +358,7 @@ static void rtllib_query_HTCapShortGI(struct rtllib_dev= ice *ieee, if (!pHTInfo->bCurrentHTSupport || !pHTInfo->bEnableHT) return; =20 - if (pHTInfo->bForcedShortGI) { + if (pHTInfo->forced_short_gi) { tcb_desc->bUseShortGI =3D true; return; } @@ -440,7 +440,7 @@ static void rtllib_query_protectionmode(struct rtllib_d= evice *ieee, break; } if (pHTInfo->bCurrentHTSupport && pHTInfo->bEnableHT) { - u8 HTOpMode =3D pHTInfo->CurrentOpMode; + u8 HTOpMode =3D pHTInfo->current_op_mode; =20 if ((pHTInfo->bCurBW40MHz && (HTOpMode =3D=3D 2 || HTOpMode =3D=3D 3)) || --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 D7547C32771 for ; Sat, 24 Sep 2022 22:04:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234132AbiIXWEu (ORCPT ); Sat, 24 Sep 2022 18:04:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52950 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234102AbiIXWER (ORCPT ); Sat, 24 Sep 2022 18:04:17 -0400 Received: from mail-ed1-x530.google.com (mail-ed1-x530.google.com [IPv6:2a00:1450:4864:20::530]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 522604BA63 for ; Sat, 24 Sep 2022 15:04:15 -0700 (PDT) Received: by mail-ed1-x530.google.com with SMTP id m3so4432484eda.12 for ; Sat, 24 Sep 2022 15:04:15 -0700 (PDT) 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; bh=5ShNoZDO8ydETxB9mYC1OvRn1beeWW7Y5cevQl95GTY=; b=l68pO3oYHNtKxiJtZK4fTPCeEdDkQAenYaxtgNdGhWvmCatMbCbs44DEBqyz+eVWkN 0lCMYKKbLXb7/Nk41cpgSO/wYFT0Yvb6vYbhiaNPXMoqAcZdI0jat/o+3tScyCyMVSdM CNXTBz1ceyBmbdIYqMZZWztg7QYkEFcKg3dSOwTRK2ciZ+zbZpPWDhfn60GTMFlm/Lml KIiMPQqLXdROzAHg9VsA9B0oVDW2hI8b+IaoFHLlSdXzOOjZm0r4ymW1W4oOfiCl8sqz 5ReUgxAS047n806Kybk++8DhaTpw5PctqvXh3bB+uvWFYUOpkRtbagXcK0Us2o1fGRzX NTBQ== 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; bh=5ShNoZDO8ydETxB9mYC1OvRn1beeWW7Y5cevQl95GTY=; b=pr4PYXT/Cr0fdGrRIUmrLDtLCtslPxwH2fKYMKYMTsgDBxTbaRUsN08kaZFXVYkCC2 7FmA8Ou+ED691lspt3xyDZbS5HZxBGQ+ybcRw7MigFdW+6oSIssUW2DJNogr/uPkYF5z puRoFLLJuevpzWA/A/BPDROdWWsYiqHJ3Gsjmfx36uMeU/DfrCAfo/4VyTy9eTURXDOC aC0t5H/jXQUvfz9jLOfoKq09i5QNXh7b0ROT5OvgTKg6hHpjwCctWBB9Hrc0hqr3K1Lp RTeNvMlzxYQa0BbuCLfqn/2qhVE1dL86qjeGNPHm7E1rN6RiUeYgCeyJykeDWw3BaKHV QFkA== X-Gm-Message-State: ACrzQf1Jsbpwv6959fPCXuY276uhZjdKgDW+CHtejTGnJI1qIna1G68v sv3M7Xdg3thwkXwU0W14lpw= X-Google-Smtp-Source: AMsMyM6pF/ldjDvnbVpC4MmYH09KUzGKe08Tu6Fi70sjsrNC/Q3jYv1xOdJF/wCZrCFni8VCx7v9WQ== X-Received: by 2002:a05:6402:2690:b0:452:3a85:8b28 with SMTP id w16-20020a056402269000b004523a858b28mr14731102edd.158.1664057054680; Sat, 24 Sep 2022 15:04:14 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id ed6-20020a056402294600b0045722259584sm498468edb.86.2022.09.24.15.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:04:14 -0700 (PDT) Date: Sun, 25 Sep 2022 00:04:12 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 09/10] staging: rtl8192e: Rename CurrentMPDU..., ForcedAMPDU... and ForcedMPDU... Message-ID: <4fb37ad6dab9addccf99a41a861220840c123e9b.1664055213.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 CurrentMPDUDensity to current_mpdu_density, ForcedAMPDUFactor to forced_ampdu_factor and ForcedMPDUDensity to forced_mpdu_density to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HT.h | 6 +++--- drivers/staging/rtl8192e/rtl819x_HTProc.c | 8 ++++---- drivers/staging/rtl8192e/rtllib_tx.c | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 6b3f280407a3..3d5dc60d2912 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -131,11 +131,11 @@ struct rt_hi_throughput { u8 AMPDU_Factor; u8 CurrentAMPDUFactor; u8 MPDU_Density; - u8 CurrentMPDUDensity; + u8 current_mpdu_density; =20 enum ht_aggre_mode ForcedAMPDUMode; - u8 ForcedAMPDUFactor; - u8 ForcedMPDUDensity; + u8 forced_ampdu_factor; + u8 forced_mpdu_density; =20 enum ht_aggre_mode ForcedAMSDUMode; u16 ForcedAMSDUMaxSize; diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index 1ef5c04914af..a038a8c1504f 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -597,9 +597,9 @@ void HTOnAssocRsp(struct rtllib_device *ieee) } } if (pHTInfo->MPDU_Density > pPeerHTCap->MPDUDensity) - pHTInfo->CurrentMPDUDensity =3D pHTInfo->MPDU_Density; + pHTInfo->current_mpdu_density =3D pHTInfo->MPDU_Density; else - pHTInfo->CurrentMPDUDensity =3D pPeerHTCap->MPDUDensity; + pHTInfo->current_mpdu_density =3D pPeerHTCap->MPDUDensity; if (pHTInfo->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { pHTInfo->bCurrentAMPDUEnable =3D false; pHTInfo->ForcedAMSDUMode =3D HT_AGG_FORCE_ENABLE; @@ -643,7 +643,7 @@ void HTInitializeHTInfo(struct rtllib_device *ieee) =20 pHTInfo->bCurrent_AMSDU_Support =3D false; pHTInfo->nCurrent_AMSDU_MaxSize =3D pHTInfo->nAMSDU_MaxSize; - pHTInfo->CurrentMPDUDensity =3D pHTInfo->MPDU_Density; + pHTInfo->current_mpdu_density =3D pHTInfo->MPDU_Density; pHTInfo->CurrentAMPDUFactor =3D pHTInfo->AMPDU_Factor; =20 memset((void *)(&(pHTInfo->SelfHTCap)), 0, @@ -801,7 +801,7 @@ void HTUseDefaultSetting(struct rtllib_device *ieee) pHTInfo->bCurrentAMPDUEnable =3D pHTInfo->bAMPDUEnable; pHTInfo->CurrentAMPDUFactor =3D pHTInfo->AMPDU_Factor; =20 - pHTInfo->CurrentMPDUDensity =3D pHTInfo->CurrentMPDUDensity; + pHTInfo->current_mpdu_density =3D pHTInfo->current_mpdu_density; =20 HTFilterMCSRate(ieee, ieee->Regdot11TxHTOperationalRateSet, ieee->dot11HTOperationalRateSet); diff --git a/drivers/staging/rtl8192e/rtllib_tx.c b/drivers/staging/rtl8192= e/rtllib_tx.c index c8a8fad35cb5..e307020580a0 100644 --- a/drivers/staging/rtl8192e/rtllib_tx.c +++ b/drivers/staging/rtl8192e/rtllib_tx.c @@ -315,7 +315,7 @@ static void rtllib_tx_query_agg_cap(struct rtllib_devic= e *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->CurrentMPDUDensity; + tcb_desc->ampdu_density =3D pHTInfo->current_mpdu_density; } } FORCED_AGG_SETTING: @@ -325,8 +325,8 @@ static void rtllib_tx_query_agg_cap(struct rtllib_devic= e *ieee, =20 case HT_AGG_FORCE_ENABLE: tcb_desc->bAMPDUEnable =3D true; - tcb_desc->ampdu_density =3D pHTInfo->ForcedMPDUDensity; - tcb_desc->ampdu_factor =3D pHTInfo->ForcedAMPDUFactor; + tcb_desc->ampdu_density =3D pHTInfo->forced_mpdu_density; + tcb_desc->ampdu_factor =3D pHTInfo->forced_ampdu_factor; break; =20 case HT_AGG_FORCE_DISABLE: --=20 2.37.3 From nobody Thu Apr 2 13:37:01 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 B96C3C07E9D for ; Sat, 24 Sep 2022 22:05:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234048AbiIXWFC (ORCPT ); Sat, 24 Sep 2022 18:05:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52172 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234015AbiIXWE2 (ORCPT ); Sat, 24 Sep 2022 18:04:28 -0400 Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E644B4C600 for ; Sat, 24 Sep 2022 15:04:23 -0700 (PDT) Received: by mail-ed1-x532.google.com with SMTP id c30so3314755edn.2 for ; Sat, 24 Sep 2022 15:04:23 -0700 (PDT) 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; bh=5MWN7wULTG9J6qm7GHbwlY2627vVnidsrjKrrOkFmCY=; b=d6UuLG4UrhH8Ffcq1TAXSn4SJY9b89SbhMqve7sPhe6zDnRCtTNgmNpkP1MRZCqFJ1 cfAnjHggl5DaOBXKJgfFUxkiPM/0nn+OczYFy6hHy4cLD6AxXqbZmNPiKb4t/GM+g5J+ wUCgKlPol/cOZybTN+DHRXbi/+F/I7RUls98yJ7BeLRyeu4BxSuBU+QAA0yYV6LDz088 G+q7GQta75pi948Cm0ZSMKryduuIDbudGGwjICwy9TuLh28My/EyaDnZQHfya3oRJwbn yira2XZuZYbXN2T5Im1gPPvZyXp6dpXPUjD+M4dVzNj72jVk/qVeIVMBl1S2ZQmhXHaH 2Vwg== 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; bh=5MWN7wULTG9J6qm7GHbwlY2627vVnidsrjKrrOkFmCY=; b=EGGe9ubsviyrrVpsuKB/eO/0C5m/07klJlw7GO/OUTgEmqvJBMe6rzbTgTkyPUyT52 ythdCXWPq8WbAxDoQMcysX9YSxQaiVH3As5ZtvO7DX4HIIh8jzEbksLHAKow79qFAOL7 jJJY0vg1ZGJBdnu30mGkAnWxgh4YJMagrVIXpncGysXgXcHi0HZhhxPJhmQVMNbZU50O gMsFXCVKYycKY1l+N3liARQVS+4qE0QD4HY3Pjz3hwV7XM7LYsfFAdjE9xNdkY7iD2Uh Jkpur4lIkbtDfJFomCawNvsA1jSUztTNEzXKwbGU1DM9ROX4na51UnvrAACIuxlYLLkj AvpQ== X-Gm-Message-State: ACrzQf2kil95nLr+BOx8X9iU6yoCdalO5QlII28aLwJAYDWRi2Q4zU3i 0Mcz8naNJ8bodVlZelw285I= X-Google-Smtp-Source: AMsMyM5zYss1HirJsMob9TrryvOtli9I/6XCuwxRaPFR5YF5m5DtGfWzcktKSKaIOd3TxZd8KDhxrw== X-Received: by 2002:a50:ed05:0:b0:456:d6fe:d800 with SMTP id j5-20020a50ed05000000b00456d6fed800mr8215871eds.101.1664057062418; Sat, 24 Sep 2022 15:04:22 -0700 (PDT) Received: from matrix-ESPRIMO-P710 (p57ba2cf5.dip0.t-ipconnect.de. [87.186.44.245]) by smtp.gmail.com with ESMTPSA id v9-20020a170906858900b00773dbdd8205sm5846657ejx.168.2022.09.24.15.04.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 24 Sep 2022 15:04:21 -0700 (PDT) Date: Sun, 25 Sep 2022 00:04:19 +0200 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 10/10] staging: rtl8192e: Remove unused variables ForcedAMSDUMaxSize, ... Message-ID: <0f3e63030511f72dbadc0368fd5e2dbd3ff84e07.1664055213.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" Remove unused variables that are may just once written but never read ForcedAMSDUMaxSize, PeerBandwidth, SwBwStep, bIsPeerBcm and bAcceptAddbaReq to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann Reviewed-by: Dan Carpenter --- drivers/staging/rtl8192e/rtl819x_HT.h | 11 ----------- drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 ---- 2 files changed, 15 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl819x_HT.h b/drivers/staging/rtl819= 2e/rtl819x_HT.h index 3d5dc60d2912..76bc9c5a6d83 100644 --- a/drivers/staging/rtl8192e/rtl819x_HT.h +++ b/drivers/staging/rtl8192e/rtl819x_HT.h @@ -138,8 +138,6 @@ struct rt_hi_throughput { u8 forced_mpdu_density; =20 enum ht_aggre_mode ForcedAMSDUMode; - u16 ForcedAMSDUMaxSize; - u8 forced_short_gi; =20 u8 current_op_mode; @@ -149,11 +147,7 @@ struct rt_hi_throughput { =20 enum ht_extchnl_offset CurSTAExtChnlOffset; u8 cur_tx_bw40mhz; - u8 PeerBandwidth; - u8 sw_bw_in_progress; - u8 SwBwStep; - u8 reg_rt2rt_aggregation; u8 RT2RT_HT_Mode; u8 current_rt2rt_aggregation; @@ -165,17 +159,12 @@ struct rt_hi_throughput { u8 rx_reorder_win_size; u8 rx_reorder_pending_time; u16 rx_reorder_drop_counter; - - u8 bIsPeerBcm; - u8 IOTPeer; u32 iot_action; u8 iot_ra_func; =20 u8 bWAIotBroadcom; u8 WAIotTH; - - u8 bAcceptAddbaReq; } __packed; =20 struct bss_ht { diff --git a/drivers/staging/rtl8192e/rtl819x_HTProc.c b/drivers/staging/rt= l8192e/rtl819x_HTProc.c index a038a8c1504f..4a3bd49ce81a 100644 --- a/drivers/staging/rtl8192e/rtl819x_HTProc.c +++ b/drivers/staging/rtl8192e/rtl819x_HTProc.c @@ -70,9 +70,6 @@ static u8 LINKSYS_MARVELL_4400N[3] =3D {0x00, 0x14, 0xa4}; void HTUpdateDefaultSetting(struct rtllib_device *ieee) { struct rt_hi_throughput *pHTInfo =3D ieee->pHTInfo; - - pHTInfo->bAcceptAddbaReq =3D 1; - pHTInfo->bRegShortGI20MHz =3D 1; pHTInfo->bRegShortGI40MHz =3D 1; =20 @@ -603,7 +600,6 @@ void HTOnAssocRsp(struct rtllib_device *ieee) if (pHTInfo->iot_action & HT_IOT_ACT_TX_USE_AMSDU_8K) { pHTInfo->bCurrentAMPDUEnable =3D false; pHTInfo->ForcedAMSDUMode =3D HT_AGG_FORCE_ENABLE; - pHTInfo->ForcedAMSDUMaxSize =3D 7935; } pHTInfo->cur_rx_reorder_enable =3D pHTInfo->reg_rx_reorder_enable; =20 --=20 2.37.3