From patchwork Sun Jan 6 00:02:51 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Edlinger X-Patchwork-Id: 1021028 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hotmail.de Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43XJd15KM9z9sCr for ; Sun, 6 Jan 2019 11:03:01 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726496AbfAFACz (ORCPT ); Sat, 5 Jan 2019 19:02:55 -0500 Received: from mail-oln040092066070.outbound.protection.outlook.com ([40.92.66.70]:28958 "EHLO EUR01-VE1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726363AbfAFACz (ORCPT ); Sat, 5 Jan 2019 19:02:55 -0500 Received: from HE1EUR01FT038.eop-EUR01.prod.protection.outlook.com (10.152.0.55) by HE1EUR01HT209.eop-EUR01.prod.protection.outlook.com (10.152.1.137) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13; Sun, 6 Jan 2019 00:02:51 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com (10.152.0.58) by HE1EUR01FT038.mail.protection.outlook.com (10.152.1.93) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.1471.13 via Frontend Transport; Sun, 6 Jan 2019 00:02:51 +0000 Received: from DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e]) by DB7PR07MB5353.eurprd07.prod.outlook.com ([fe80::e1f9:8635:f629:eb8e%4]) with mapi id 15.20.1516.010; Sun, 6 Jan 2019 00:02:51 +0000 From: Bernd Edlinger To: Ping-Ke Shih , Larry Finger , Kalle Valo , "David S. Miller" , "linux-wireless@vger.kernel.org" , "netdev@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Andrew Lunn Subject: [PATCH v3 4/4] rtlwifi: Don't clear num_rx_inperiod too early Thread-Topic: [PATCH v3 4/4] rtlwifi: Don't clear num_rx_inperiod too early Thread-Index: AQHUpVMqbKQKwAnOjEmtsNGk5fiqeA== Date: Sun, 6 Jan 2019 00:02:51 +0000 Message-ID: Accept-Language: en-US, en-GB, de-DE Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: AM6PR06CA0035.eurprd06.prod.outlook.com (2603:10a6:20b:14::48) To DB7PR07MB5353.eurprd07.prod.outlook.com (2603:10a6:10:6e::26) x-incomingtopheadermarker: OriginalChecksum:2378198F28BAB2A65EE50B50B44EC937AAD9A7F521B3F422C140E596023CDE17; UpperCasedChecksum:ABDB5120F5B50E2EA2483BFFBC0F3E29C95CAD2FE9FA7446C43744BA12E85C9C; SizeAsReceived:8771; Count:62 x-ms-exchange-messagesentrepresentingtype: 1 x-tmn: [+MX+zvCYfG3n1VEtwC1upCCI+G0CSXF3] x-microsoft-original-message-id: <4565959f-d15e-500c-6f36-109b2aa29309@hotmail.de> x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; HE1EUR01HT209; 6:TTgMRVDapWAFqfaNlyqY+4wpnwRl39rdfdYVqmEhnZsrX/kcLcBxef1tOxD0iKqfNPrR3Y3VPmFkvGgRzxD7cnCh/Bx4EhtUOMaDf9atdXF6FKn2AjUgZn8cAcF7ReAfvCZTOSmB5OTolQMUKR60sPObk3db78BaYSA+WqS2JK2qeYSypSRqafcwaWUv9wZygmlUUq9zyY6sqWnGDpczmsefWL6NZt/fwnrFV4wKAex8n7q2IYj0m1Hgduh67NqUJcjCLvRrfI207Xq/Z6wHfqyg+LxYkuxVxlHce2El7NOBDp5feV8SqxhTcuWZiYzgTL6Ucva1VS34tvgwwkXItjE1jGEk+v3ZdcKySwosawTi4WakoxzaBSJK2jPgSo8yu/bxs+Ps246YbFBzjP0S+DTpKh0CphA6dM08IT8CehD0qHdajipZzFaBr/ZCe3MF3Pf9dovfRZLaTuMrztgy4A==; 5:8qRzTjs+i/Nu1qf4x29655rDIQy8/hhzMEMv9g6AljC0XygGl9YNNsP8RgbgVe/hZd7ZAYpC2u/R1q+/q5G2+4cAYB9mzSa7Flugg6Y4q5X8/279TckiYgbDPS/0VqX75q8czGuKFda9R5sAzBoFhuAsK8OwrnTgehmkgcJVbb8=; 7:MaAl4mdu18MXJcfbhsL9TZtTRJ7aIEf3xGceR76xD4UgbYFU3n9SQLxSvoUKdGVcKRtz2DxKNLPsGIY7mpavMTSMuLxQi1Ey9BCJ5DLG1oWNZWjUt+/LhD4+RtbnI2gwtlzjxrf7MaWZVl8XKrRU8Q== x-incomingheadercount: 62 x-eopattributedmessage: 0 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(201702061078)(5061506573)(5061507331)(1603103135)(2017031320274)(2017031323274)(2017031324274)(2017031322404)(1601125500)(1603101475)(1701031045); SRVR:HE1EUR01HT209; x-ms-traffictypediagnostic: HE1EUR01HT209: x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(4566010)(82015058); SRVR:HE1EUR01HT209; BCL:0; PCL:0; RULEID:; SRVR:HE1EUR01HT209; x-microsoft-antispam-message-info: gflcKgtxwmSv4689tBVnY6xeqHzlc81aYBEKr/8GP6A8S3amfo+m2YSa0aAi8Vev Content-ID: <49DADF5C48296D4B979FDD8951861E51@eurprd07.prod.outlook.com> MIME-Version: 1.0 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-Network-Message-Id: 98b28b9f-0f6b-4489-69f7-08d6736a4ca7 X-MS-Exchange-CrossTenant-rms-persistedconsumerorg: d4d70346-2c10-4f39-8c00-e767963926d9 X-MS-Exchange-CrossTenant-originalarrivaltime: 06 Jan 2019 00:02:50.4896 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Internet X-MS-Exchange-CrossTenant-id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1EUR01HT209 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org This patch moves the clearing of rtlpriv->link_info.num_rx_inperiod in rtl_watchdog_wq_callback a few lines down. This is necessary since it is still used in the "AP off" detection code block. Moved clearing of rtlpriv->link_info.num_rx_inperiod as well for consistency. Signed-off-by: Bernd Edlinger --- v2: Improved patch description. v3: Make the title fit in one line. --- drivers/net/wireless/realtek/rtlwifi/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index ef9b502..7aa68fe 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -2172,8 +2172,6 @@ void rtl_watchdog_wq_callback(void *data) ; } - rtlpriv->link_info.num_rx_inperiod = 0; - rtlpriv->link_info.num_tx_inperiod = 0; for (tid = 0; tid <= 7; tid++) rtlpriv->link_info.tidtx_inperiod[tid] = 0; @@ -2236,6 +2234,8 @@ void rtl_watchdog_wq_callback(void *data) rtlpriv->btcoexist.btc_info.in_4way = false; } + rtlpriv->link_info.num_rx_inperiod = 0; + rtlpriv->link_info.num_tx_inperiod = 0; rtlpriv->link_info.bcn_rx_inperiod = 0; /* <6> scan list */