From nobody Mon Apr 13 14:27:10 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9FC21C4332F for ; Sun, 13 Nov 2022 04:36:01 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235148AbiKMEf6 (ORCPT ); Sat, 12 Nov 2022 23:35:58 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235040AbiKMEfj (ORCPT ); Sat, 12 Nov 2022 23:35:39 -0500 Received: from mail-wr1-x436.google.com (mail-wr1-x436.google.com [IPv6:2a00:1450:4864:20::436]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4572C13CD1 for ; Sat, 12 Nov 2022 20:35:38 -0800 (PST) Received: by mail-wr1-x436.google.com with SMTP id d9so6928583wrm.13 for ; Sat, 12 Nov 2022 20:35:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=yRX3eE2HdBt1z4bDSGuk1t5Mi99j8zw3bmMFn1kRYTI=; b=o8B9MRnRo0c+D/p5/V2igXjad+/H43wBAqZl4DvpsS1tLELu0k/VZweMBjzyB8cFUS nvFqH2mXgZx90QDm9aAk3HVztOOqQ4UpBCgTZHZKYjpWxQgXcyPJOk8Nwpuj3dzTNq1G mrwW+BxfmQKioNJ4I/oIpFjjt7CPFiNJ0DZ2J5WFmZ81TDqZmbd+KycrfJP3Vy4rd8LQ e0etKRlLGTW/xAMH9zU3UDPMql8TWq4o8mSr09+iwXj8qeCrHTwoN7IlhiOL8hYLQieb 0PLBl+jTF6oQ8E/LaVsUwpPjbBuRKIuVtX+0VuN/d9DS/xm3j6VNQRO6agvpu7IHUcGZ VPzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=yRX3eE2HdBt1z4bDSGuk1t5Mi99j8zw3bmMFn1kRYTI=; b=fJlfUyXkuXqsKmdCiFPYc9rEYkDUZqru7rtvArRut0UA9ZWR47I4/0cDswxIpCy1t+ lLnLkWBBLtZWpG4139di0O87/kyMQ/1M303ucSoDxNwoICvvMpAIv57H71yhwzeuoU36 tFTufZGi+OePVMa2+r/MmM6U3HA9Tq2FjvDbAQarL89qfvwadhbgstNkY9ZpDplZ4Hi+ FvaCQ68sBk7yFGTmPKurBaL04TLufNN0cSkUcnEGXHcgY+tsDwiVEjhUh73uifX5wBxH IZyF2SrfeHbb9VTRuJ+evTc7QwMVP4GpmTCHGkN0UoGwhjJND865FU+xeLxjozBTFX7g swhA== X-Gm-Message-State: ANoB5pk6FSqjQTV3ww2PbD/N7REDsnrVzJHNEq5jyonvAEDcyOi2sTAP pGQ5lMulpobvWv92Wzf0uVM= X-Google-Smtp-Source: AA0mqf6UyJZqxT8k8dUMA4zxqkvN6GbWy+RKukJ8ScYNp+wyVpMwX5ZlqGzBtyCPX2K5S1z42jNfBA== X-Received: by 2002:adf:dcc3:0:b0:235:14dc:5e14 with SMTP id x3-20020adfdcc3000000b0023514dc5e14mr4749909wrm.252.1668314136691; Sat, 12 Nov 2022 20:35:36 -0800 (PST) Received: from matrix-ESPRIMO-P710 (p54a07888.dip0.t-ipconnect.de. [84.160.120.136]) by smtp.gmail.com with ESMTPSA id w12-20020a05600c474c00b003b435c41103sm17880764wmo.0.2022.11.12.20.35.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 12 Nov 2022 20:35:36 -0800 (PST) Date: Sun, 13 Nov 2022 05:35:34 +0100 From: Philipp Hortmann To: Greg Kroah-Hartman , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 04/10] staging: rtl8192e: Rename pPSC Message-ID: <47ded8a906e55d6f09b51cd8f2dfb78b7b92c1cc.1668313325.git.philipp.g.hortmann@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Rename variable pPSC to psc to avoid CamelCase which is not accepted by checkpatch. Signed-off-by: Philipp Hortmann --- .../staging/rtl8192e/rtl8192e/r8192E_phy.c | 14 +++---- drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 16 ++++---- drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 32 ++++++++-------- drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 10 ++--- drivers/staging/rtl8192e/rtllib.h | 10 ++--- drivers/staging/rtl8192e/rtllib_softmac.c | 38 +++++++++---------- 6 files changed, 60 insertions(+), 60 deletions(-) diff --git a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c b/drivers/stagi= ng/rtl8192e/rtl8192e/r8192E_phy.c index b14497423cbf..c357adf95a3d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c +++ b/drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c @@ -1303,7 +1303,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, enum rt_rf_power_state rf_power_state) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); bool bResult =3D true; u8 i =3D 0, QueueID =3D 0; @@ -1318,7 +1318,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, switch (rf_power_state) { case rf_on: if ((priv->rtllib->rf_power_state =3D=3D rf_off) && - RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) { + RT_IN_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC)) { bool rtstatus; u32 InitilizeCount =3D 3; =20 @@ -1335,7 +1335,7 @@ static bool _rtl92e_set_rf_power_state(struct net_dev= ice *dev, return false; } =20 - RT_CLEAR_PS_LEVEL(pPSC, + RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); } else { rtl92e_writeb(dev, ANAPAR, 0x37); @@ -1399,11 +1399,11 @@ static bool _rtl92e_set_rf_power_state(struct net_d= evice *dev, break; } =20 - if (pPSC->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && - !RT_IN_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC)) { + if (psc->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC && + !RT_IN_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC)) { rtl92e_disable_nic(dev); - RT_SET_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); - } else if (!(pPSC->RegRfPsLevel & + RT_SET_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); + } else if (!(psc->RegRfPsLevel & RT_RF_OFF_LEVL_HALT_NIC)) { rtl92e_set_rf_off(dev); } diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging= /rtl8192e/rtl8192e/rtl_core.c index d5eec6d6b644..144bc7c9abd5 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c @@ -682,7 +682,7 @@ void rtl92e_set_wireless_mode(struct net_device *dev, u= 8 wireless_mode) static int _rtl92e_sta_up(struct net_device *dev, bool is_silent_reset) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); bool init_status; =20 @@ -700,7 +700,7 @@ static int _rtl92e_sta_up(struct net_device *dev, bool = is_silent_reset) return -1; } =20 - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); + RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); priv->bfirst_init =3D false; =20 if (priv->polling_timer_on =3D=3D 0) @@ -819,10 +819,10 @@ static void _rtl92e_init_priv_handler(struct net_devi= ce *dev) static void _rtl92e_init_priv_constant(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; =20 - pPSC->reg_max_lps_awake_intvl =3D 5; + psc->reg_max_lps_awake_intvl =3D 5; } =20 static void _rtl92e_init_priv_variable(struct net_device *dev) @@ -1271,7 +1271,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) enum reset_type ResetType =3D RESET_TYPE_NORESET; static u8 check_reset_cnt; unsigned long flags; - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); bool bBusyTraffic =3D false; bool bHigherBusyTraffic =3D false; @@ -1389,7 +1389,7 @@ static void _rtl92e_watchdog_wq_cb(void *data) =20 spin_lock_irqsave(&priv->tx_lock, flags); if ((check_reset_cnt++ >=3D 3) && (!ieee->is_roaming) && - (!priv->rf_change_in_progress) && (!pPSC->bSwRfProcessing)) { + (!priv->rf_change_in_progress) && (!psc->bSwRfProcessing)) { ResetType =3D _rtl92e_if_check_reset(dev); check_reset_cnt =3D 3; } @@ -2421,7 +2421,7 @@ bool rtl92e_enable_nic(struct net_device *dev) { bool init_status =3D true; struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); =20 if (!priv->up) { @@ -2437,7 +2437,7 @@ bool rtl92e_enable_nic(struct net_device *dev) priv->bdisable_nic =3D false; return false; } - RT_CLEAR_PS_LEVEL(pPSC, RT_RF_OFF_LEVL_HALT_NIC); + RT_CLEAR_PS_LEVEL(psc, RT_RF_OFF_LEVL_HALT_NIC); priv->bfirst_init =3D false; =20 rtl92e_irq_enable(dev); diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_ps.c index 8a6b7f58ebfd..ef4f736ce325 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_ps.c @@ -100,27 +100,27 @@ void rtl92e_enter_sleep(struct net_device *dev, u64 t= ime) static void _rtl92e_ps_update_rf_state(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; =20 - pPSC->bSwRfProcessing =3D true; - rtl92e_set_rf_state(dev, pPSC->eInactivePowerState, RF_CHANGE_BY_IPS); + psc->bSwRfProcessing =3D true; + rtl92e_set_rf_state(dev, psc->eInactivePowerState, RF_CHANGE_BY_IPS); =20 - pPSC->bSwRfProcessing =3D false; + psc->bSwRfProcessing =3D false; } =20 void rtl92e_ips_enter(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; enum rt_rf_power_state rt_state; =20 rt_state =3D priv->rtllib->rf_power_state; - if (rt_state =3D=3D rf_on && !pPSC->bSwRfProcessing && + if (rt_state =3D=3D rf_on && !psc->bSwRfProcessing && (priv->rtllib->state !=3D RTLLIB_LINKED) && (priv->rtllib->iw_mode !=3D IW_MODE_MASTER)) { - pPSC->eInactivePowerState =3D rf_off; + psc->eInactivePowerState =3D rf_off; _rtl92e_ps_update_rf_state(dev); } } @@ -128,14 +128,14 @@ void rtl92e_ips_enter(struct net_device *dev) void rtl92e_ips_leave(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; enum rt_rf_power_state rt_state; =20 rt_state =3D priv->rtllib->rf_power_state; - if (rt_state !=3D rf_on && !pPSC->bSwRfProcessing && + if (rt_state !=3D rf_on && !psc->bSwRfProcessing && priv->rtllib->rf_off_reason <=3D RF_CHANGE_BY_IPS) { - pPSC->eInactivePowerState =3D rf_on; + psc->eInactivePowerState =3D rf_on; _rtl92e_ps_update_rf_state(dev); } } @@ -206,7 +206,7 @@ static bool _rtl92e_ps_set_mode(struct net_device *dev,= u8 rtPsMode) void rtl92e_leisure_ps_enter(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; =20 if (!((priv->rtllib->iw_mode =3D=3D IW_MODE_INFRA) && @@ -215,8 +215,8 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) (priv->rtllib->iw_mode =3D=3D IW_MODE_MASTER)) return; =20 - if (pPSC->bLeisurePs) { - if (pPSC->LpsIdleCount >=3D RT_CHECK_FOR_HANG_PERIOD) { + if (psc->bLeisurePs) { + if (psc->LpsIdleCount >=3D RT_CHECK_FOR_HANG_PERIOD) { =20 if (priv->rtllib->ps =3D=3D RTLLIB_PS_DISABLED) { if (priv->rtllib->SetFwCmdHandler) @@ -225,17 +225,17 @@ void rtl92e_leisure_ps_enter(struct net_device *dev) RTLLIB_PS_UNICAST); } } else - pPSC->LpsIdleCount++; + psc->LpsIdleCount++; } } =20 void rtl92e_leisure_ps_leave(struct net_device *dev) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) &priv->rtllib->pwr_save_ctrl; =20 - if (pPSC->bLeisurePs) { + if (psc->bLeisurePs) { if (priv->rtllib->ps !=3D RTLLIB_PS_DISABLED) { _rtl92e_ps_set_mode(dev, RTLLIB_PS_DISABLED); if (priv->rtllib->SetFwCmdHandler) diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c b/drivers/staging/r= tl8192e/rtl8192e/rtl_wx.c index d68f8f5902c8..b200d53c8e3d 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_wx.c @@ -159,7 +159,7 @@ static int _rtl92e_wx_adapter_power_status(struct net_d= evice *dev, union iwreq_data *wrqu, char *extra) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); struct rtllib_device *ieee =3D priv->rtllib; =20 @@ -167,13 +167,13 @@ static int _rtl92e_wx_adapter_power_status(struct net= _device *dev, =20 if (*extra || priv->force_lps) { priv->ps_force =3D false; - pPSC->bLeisurePs =3D true; + psc->bLeisurePs =3D true; } else { if (priv->rtllib->state =3D=3D RTLLIB_LINKED) rtl92e_leisure_ps_leave(dev); =20 priv->ps_force =3D true; - pPSC->bLeisurePs =3D false; + psc->bLeisurePs =3D false; ieee->ps =3D *extra; } =20 @@ -188,7 +188,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net= _device *dev, char *extra) { struct r8192_priv *priv =3D rtllib_priv(dev); - struct rt_pwr_save_ctrl *pPSC =3D (struct rt_pwr_save_ctrl *) + struct rt_pwr_save_ctrl *psc =3D (struct rt_pwr_save_ctrl *) (&priv->rtllib->pwr_save_ctrl); =20 mutex_lock(&priv->wx_mutex); @@ -196,7 +196,7 @@ static int _rtl92e_wx_set_lps_awake_interval(struct net= _device *dev, netdev_info(dev, "%s(): set lps awake interval ! extra is %d\n", __func__, *extra); =20 - pPSC->reg_max_lps_awake_intvl =3D *extra; + psc->reg_max_lps_awake_intvl =3D *extra; mutex_unlock(&priv->wx_mutex); return 0; } diff --git a/drivers/staging/rtl8192e/rtllib.h b/drivers/staging/rtl8192e/r= tllib.h index 487aa337eafa..6b7b2c887c34 100644 --- a/drivers/staging/rtl8192e/rtllib.h +++ b/drivers/staging/rtl8192e/rtllib.h @@ -111,11 +111,11 @@ static inline void *netdev_priv_rsl(struct net_device= *dev) #define SUPPORT_CKIP_MIC 0x08 #define SUPPORT_CKIP_PK 0x10 #define RT_RF_OFF_LEVL_HALT_NIC BIT3 -#define RT_IN_PS_LEVEL(pPSC, _PS_FLAG) \ - ((pPSC->CurPsLevel & _PS_FLAG) ? true : false) -#define RT_CLEAR_PS_LEVEL(pPSC, _PS_FLAG) \ - (pPSC->CurPsLevel &=3D (~(_PS_FLAG))) -#define RT_SET_PS_LEVEL(pPSC, _PS_FLAG) (pPSC->CurPsLevel |=3D _PS_FLAG) +#define RT_IN_PS_LEVEL(psc, _PS_FLAG) \ + ((psc->CurPsLevel & _PS_FLAG) ? true : false) +#define RT_CLEAR_PS_LEVEL(psc, _PS_FLAG) \ + (psc->CurPsLevel &=3D (~(_PS_FLAG))) +#define RT_SET_PS_LEVEL(psc, _PS_FLAG) (psc->CurPsLevel |=3D _PS_FLAG) =20 /* defined for skb cb field */ /* At most 28 byte */ diff --git a/drivers/staging/rtl8192e/rtllib_softmac.c b/drivers/staging/rt= l8192e/rtllib_softmac.c index 09cc3b3068cc..ee4173a6ade0 100644 --- a/drivers/staging/rtl8192e/rtllib_softmac.c +++ b/drivers/staging/rtl8192e/rtllib_softmac.c @@ -1504,7 +1504,7 @@ static void rtllib_associate_complete_wq(void *data) container_of_work_rsl(data, struct rtllib_device, associate_complete_wq); - struct rt_pwr_save_ctrl *pPSC =3D &ieee->pwr_save_ctrl; + struct rt_pwr_save_ctrl *psc =3D &ieee->pwr_save_ctrl; =20 netdev_info(ieee->dev, "Associated successfully with %pM\n", ieee->current_network.bssid); @@ -1542,7 +1542,7 @@ static void rtllib_associate_complete_wq(void *data) ieee->LinkDetectInfo.NumRecvBcnInPeriod =3D 1; ieee->LinkDetectInfo.NumRecvDataInPeriod =3D 1; } - pPSC->LpsIdleCount =3D 0; + psc->LpsIdleCount =3D 0; ieee->link_change(ieee->dev); =20 if (ieee->is_silent_reset) { @@ -1960,7 +1960,7 @@ static short rtllib_sta_ps_sleep(struct rtllib_device= *ieee, u64 *time) { int timeout; u8 dtim; - struct rt_pwr_save_ctrl *pPSC =3D &ieee->pwr_save_ctrl; + struct rt_pwr_save_ctrl *psc =3D &ieee->pwr_save_ctrl; =20 if (ieee->LPSDelayCnt) { ieee->LPSDelayCnt--; @@ -1990,21 +1990,21 @@ static short rtllib_sta_ps_sleep(struct rtllib_devi= ce *ieee, u64 *time) =20 if (time) { if (ieee->bAwakePktSent) { - pPSC->LPSAwakeIntvl =3D 1; + psc->LPSAwakeIntvl =3D 1; } else { u8 MaxPeriod =3D 1; =20 - if (pPSC->LPSAwakeIntvl =3D=3D 0) - pPSC->LPSAwakeIntvl =3D 1; - if (pPSC->reg_max_lps_awake_intvl =3D=3D 0) + if (psc->LPSAwakeIntvl =3D=3D 0) + psc->LPSAwakeIntvl =3D 1; + if (psc->reg_max_lps_awake_intvl =3D=3D 0) MaxPeriod =3D 1; - else if (pPSC->reg_max_lps_awake_intvl =3D=3D 0xFF) + else if (psc->reg_max_lps_awake_intvl =3D=3D 0xFF) MaxPeriod =3D ieee->current_network.dtim_period; else - MaxPeriod =3D pPSC->reg_max_lps_awake_intvl; - pPSC->LPSAwakeIntvl =3D (pPSC->LPSAwakeIntvl >=3D + MaxPeriod =3D psc->reg_max_lps_awake_intvl; + psc->LPSAwakeIntvl =3D (psc->LPSAwakeIntvl >=3D MaxPeriod) ? MaxPeriod : - (pPSC->LPSAwakeIntvl + 1); + (psc->LPSAwakeIntvl + 1); } { u8 LPSAwakeIntvl_tmp =3D 0; @@ -2012,23 +2012,23 @@ static short rtllib_sta_ps_sleep(struct rtllib_devi= ce *ieee, u64 *time) u8 count =3D ieee->current_network.tim.tim_count; =20 if (count =3D=3D 0) { - if (pPSC->LPSAwakeIntvl > period) + if (psc->LPSAwakeIntvl > period) LPSAwakeIntvl_tmp =3D period + - (pPSC->LPSAwakeIntvl - + (psc->LPSAwakeIntvl - period) - - ((pPSC->LPSAwakeIntvl-period) % + ((psc->LPSAwakeIntvl-period) % period); else - LPSAwakeIntvl_tmp =3D pPSC->LPSAwakeIntvl; + LPSAwakeIntvl_tmp =3D psc->LPSAwakeIntvl; =20 } else { - if (pPSC->LPSAwakeIntvl > + if (psc->LPSAwakeIntvl > ieee->current_network.tim.tim_count) LPSAwakeIntvl_tmp =3D count + - (pPSC->LPSAwakeIntvl - count) - - ((pPSC->LPSAwakeIntvl-count)%period); + (psc->LPSAwakeIntvl - count) - + ((psc->LPSAwakeIntvl-count)%period); else - LPSAwakeIntvl_tmp =3D pPSC->LPSAwakeIntvl; + LPSAwakeIntvl_tmp =3D psc->LPSAwakeIntvl; } =20 *time =3D ieee->current_network.last_dtim_sta_time --=20 2.37.3