From nobody Mon Apr 6 03:10:46 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 77A4CECAAD3 for ; Sun, 11 Sep 2022 14:51:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229622AbiIKOvz (ORCPT ); Sun, 11 Sep 2022 10:51:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52592 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229543AbiIKOvn (ORCPT ); Sun, 11 Sep 2022 10:51:43 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FD342CCA9 for ; Sun, 11 Sep 2022 07:51:40 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJ6-000829-0j; Sun, 11 Sep 2022 16:51:36 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 1/9] staging: r8188eu: simplify the code to prevent scan blinking restart Date: Sun, 11 Sep 2022 16:51:14 +0200 Message-Id: <20220911145122.15444-2-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The code for scan blinking is wrapped into a big if clause to prevent restarting if scan blinking is already running. Revert the if condition and exit if scan blinking is running. This does not change the behaviour. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 47 +++++++++++++------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 5b7e12421d19..c934a1f1e119 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -261,30 +261,31 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv= , _FW_LINKED))) return; =20 - if (!pLed->bLedScanBlinkInProgress) { - if (IS_LED_WPS_BLINKING(pLed)) - return; - if (pLed->bLedNoLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); - pLed->bLedNoLinkBlinkInProgress =3D false; - } - if (pLed->bLedLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); - pLed->bLedLinkBlinkInProgress =3D false; - } - if (pLed->bLedBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); - pLed->bLedBlinkInProgress =3D false; - } - pLed->bLedScanBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_SCAN; - pLed->BlinkTimes =3D 24; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); + if (pLed->bLedScanBlinkInProgress) + return; + + if (IS_LED_WPS_BLINKING(pLed)) + return; + if (pLed->bLedNoLinkBlinkInProgress) { + cancel_delayed_work(&pLed->blink_work); + pLed->bLedNoLinkBlinkInProgress =3D false; + } + if (pLed->bLedLinkBlinkInProgress) { + cancel_delayed_work(&pLed->blink_work); + pLed->bLedLinkBlinkInProgress =3D false; } + if (pLed->bLedBlinkInProgress) { + cancel_delayed_work(&pLed->blink_work); + pLed->bLedBlinkInProgress =3D false; + } + pLed->bLedScanBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_SCAN; + pLed->BlinkTimes =3D 24; + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_SCAN_INTVL); break; case LED_CTL_TX: case LED_CTL_RX: --=20 2.30.2 From nobody Mon Apr 6 03:10:46 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 E9643C54EE9 for ; Sun, 11 Sep 2022 14:51:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229589AbiIKOvu (ORCPT ); Sun, 11 Sep 2022 10:51:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229541AbiIKOvn (ORCPT ); Sun, 11 Sep 2022 10:51:43 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 905CA2CCAF for ; Sun, 11 Sep 2022 07:51:40 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJ6-000829-SC; Sun, 11 Sep 2022 16:51:36 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 2/9] staging: r8188eu: cancel blink_work before scan blinking Date: Sun, 11 Sep 2022 16:51:15 +0200 Message-Id: <20220911145122.15444-3-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Cancel blink_work before we start scan blinking. Another worker will be scheduled after the state variables are updated. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index c934a1f1e119..30b17c304277 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -266,18 +266,18 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) =20 if (IS_LED_WPS_BLINKING(pLed)) return; - if (pLed->bLedNoLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); + + cancel_delayed_work(&pLed->blink_work); + + if (pLed->bLedNoLinkBlinkInProgress) pLed->bLedNoLinkBlinkInProgress =3D false; - } - if (pLed->bLedLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); + + if (pLed->bLedLinkBlinkInProgress) pLed->bLedLinkBlinkInProgress =3D false; - } - if (pLed->bLedBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); + + if (pLed->bLedBlinkInProgress) pLed->bLedBlinkInProgress =3D false; - } + pLed->bLedScanBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_SCAN; pLed->BlinkTimes =3D 24; --=20 2.30.2 From nobody Mon Apr 6 03:10:46 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 F1309ECAAD3 for ; Sun, 11 Sep 2022 14:51:54 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229601AbiIKOvw (ORCPT ); Sun, 11 Sep 2022 10:51:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52596 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229540AbiIKOvn (ORCPT ); Sun, 11 Sep 2022 10:51:43 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6132D2CCB7 for ; Sun, 11 Sep 2022 07:51:41 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJ7-000829-La; Sun, 11 Sep 2022 16:51:37 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 3/9] staging: r8188eu: update status before scan blinking Date: Sun, 11 Sep 2022 16:51:16 +0200 Message-Id: <20220911145122.15444-4-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Always update the status variables in rtw_led_control when we start scan blinking. The if statements are not necessary. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 30b17c304277..75328e6c9a8d 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -269,16 +269,11 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) =20 cancel_delayed_work(&pLed->blink_work); =20 - if (pLed->bLedNoLinkBlinkInProgress) - pLed->bLedNoLinkBlinkInProgress =3D false; - - if (pLed->bLedLinkBlinkInProgress) - pLed->bLedLinkBlinkInProgress =3D false; - - if (pLed->bLedBlinkInProgress) - pLed->bLedBlinkInProgress =3D false; - + pLed->bLedNoLinkBlinkInProgress =3D false; + pLed->bLedLinkBlinkInProgress =3D false; + pLed->bLedBlinkInProgress =3D false; pLed->bLedScanBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_SCAN; pLed->BlinkTimes =3D 24; if (pLed->bLedOn) --=20 2.30.2 From nobody Mon Apr 6 03:10:46 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 67A72ECAAD3 for ; Sun, 11 Sep 2022 14:52:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229631AbiIKOv6 (ORCPT ); Sun, 11 Sep 2022 10:51:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52610 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229546AbiIKOvo (ORCPT ); Sun, 11 Sep 2022 10:51:44 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E65F2CDC0 for ; Sun, 11 Sep 2022 07:51:41 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJ8-000829-CZ; Sun, 11 Sep 2022 16:51:38 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 4/9] staging: r8188eu: simplify the code to prevent tx/rx blinking restart Date: Sun, 11 Sep 2022 16:51:17 +0200 Message-Id: <20220911145122.15444-5-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The code for tx/rx blinking is wrapped into a big if clause to prevent restarting if tx/rx blinking is already running. Revert the if condition and exit if tx/rx blinking is running. This does not change the behaviour. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 39 +++++++++++++------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 75328e6c9a8d..a723f592e939 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -284,26 +284,27 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) break; case LED_CTL_TX: case LED_CTL_RX: - if (!pLed->bLedBlinkInProgress) { - if (pLed->CurrLedState =3D=3D LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLe= d)) - return; - if (pLed->bLedNoLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); - pLed->bLedNoLinkBlinkInProgress =3D false; - } - if (pLed->bLedLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); - pLed->bLedLinkBlinkInProgress =3D false; - } - pLed->bLedBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_TXRX; - pLed->BlinkTimes =3D 2; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_FASTER_INTVL); + if (pLed->bLedBlinkInProgress) + return; + + if (pLed->CurrLedState =3D=3D LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed= )) + return; + if (pLed->bLedNoLinkBlinkInProgress) { + cancel_delayed_work(&pLed->blink_work); + pLed->bLedNoLinkBlinkInProgress =3D false; + } + if (pLed->bLedLinkBlinkInProgress) { + cancel_delayed_work(&pLed->blink_work); + pLed->bLedLinkBlinkInProgress =3D false; } + pLed->bLedBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_TXRX; + pLed->BlinkTimes =3D 2; + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_FASTER_INTVL); break; case LED_CTL_START_WPS: /* wait until xinpin finish */ if (pLed->bLedWPSBlinkInProgress) --=20 2.30.2 From nobody Mon Apr 6 03:10:46 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 A20E1C6FA83 for ; Sun, 11 Sep 2022 14:52:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229643AbiIKOwA (ORCPT ); Sun, 11 Sep 2022 10:52:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229539AbiIKOvo (ORCPT ); Sun, 11 Sep 2022 10:51:44 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0EB052CDC2 for ; Sun, 11 Sep 2022 07:51:42 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJ9-000829-4B; Sun, 11 Sep 2022 16:51:39 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 5/9] staging: r8188eu: cancel blink_work before tx/rx blinking Date: Sun, 11 Sep 2022 16:51:18 +0200 Message-Id: <20220911145122.15444-6-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Cancel blink_work before we start tx/rx blinking. Another worker will be scheduled after the state variables are updated. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index a723f592e939..358dbbcd5c55 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -289,14 +289,14 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) =20 if (pLed->CurrLedState =3D=3D LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed= )) return; - if (pLed->bLedNoLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); + + cancel_delayed_work(&pLed->blink_work); + if (pLed->bLedNoLinkBlinkInProgress) pLed->bLedNoLinkBlinkInProgress =3D false; - } - if (pLed->bLedLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); + + if (pLed->bLedLinkBlinkInProgress) pLed->bLedLinkBlinkInProgress =3D false; - } + pLed->bLedBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_TXRX; pLed->BlinkTimes =3D 2; --=20 2.30.2 From nobody Mon Apr 6 03:10:46 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 DE4B6C54EE9 for ; Sun, 11 Sep 2022 14:52:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229660AbiIKOwD (ORCPT ); Sun, 11 Sep 2022 10:52:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229550AbiIKOvo (ORCPT ); Sun, 11 Sep 2022 10:51:44 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 779F6109D for ; Sun, 11 Sep 2022 07:51:43 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJ9-000829-Rt; Sun, 11 Sep 2022 16:51:39 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 6/9] staging: r8188eu: update status before scan blinking Date: Sun, 11 Sep 2022 16:51:19 +0200 Message-Id: <20220911145122.15444-7-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Always update the status variables in rtw_led_control when we start tx/rx blinking. The if statements are not necessary. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 358dbbcd5c55..270880050c64 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -291,13 +291,11 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) return; =20 cancel_delayed_work(&pLed->blink_work); - if (pLed->bLedNoLinkBlinkInProgress) - pLed->bLedNoLinkBlinkInProgress =3D false; - - if (pLed->bLedLinkBlinkInProgress) - pLed->bLedLinkBlinkInProgress =3D false; =20 + pLed->bLedNoLinkBlinkInProgress =3D false; + pLed->bLedLinkBlinkInProgress =3D false; pLed->bLedBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_TXRX; pLed->BlinkTimes =3D 2; if (pLed->bLedOn) --=20 2.30.2 From nobody Mon Apr 6 03:10:46 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 89DC8C54EE9 for ; Sun, 11 Sep 2022 14:52:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229702AbiIKOwH (ORCPT ); Sun, 11 Sep 2022 10:52:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52620 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229561AbiIKOvp (ORCPT ); Sun, 11 Sep 2022 10:51:45 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 707242CC8E for ; Sun, 11 Sep 2022 07:51:44 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJA-000829-Jf; Sun, 11 Sep 2022 16:51:40 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 7/9] staging: r8188eu: simplify the code to prevent link blinking restart Date: Sun, 11 Sep 2022 16:51:20 +0200 Message-Id: <20220911145122.15444-8-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The blinking code to signal that a link is up has the same big if clause around it as most other blink events. Revert this if condition and exit if we're already blinking to show that the link is up. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 37 +++++++++++++------------- 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 270880050c64..7cd6ed5385bb 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -237,25 +237,26 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) schedule_delayed_work(&pLed->blink_work, LED_BLINK_NO_LINK_INTVL); break; case LED_CTL_LINK: - if (!pLed->bLedLinkBlinkInProgress) { - if (pLed->CurrLedState =3D=3D LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLe= d)) - return; - if (pLed->bLedNoLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); - pLed->bLedNoLinkBlinkInProgress =3D false; - } - if (pLed->bLedBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); - pLed->bLedBlinkInProgress =3D false; - } - pLed->bLedLinkBlinkInProgress =3D true; - pLed->CurrLedState =3D LED_BLINK_NORMAL; - if (pLed->bLedOn) - pLed->BlinkingLedState =3D RTW_LED_OFF; - else - pLed->BlinkingLedState =3D RTW_LED_ON; - schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); + if (!pLed->bLedLinkBlinkInProgress) + return; + + if (pLed->CurrLedState =3D=3D LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed= )) + return; + if (pLed->bLedNoLinkBlinkInProgress) { + cancel_delayed_work(&pLed->blink_work); + pLed->bLedNoLinkBlinkInProgress =3D false; + } + if (pLed->bLedBlinkInProgress) { + cancel_delayed_work(&pLed->blink_work); + pLed->bLedBlinkInProgress =3D false; } + pLed->bLedLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_NORMAL; + if (pLed->bLedOn) + pLed->BlinkingLedState =3D RTW_LED_OFF; + else + pLed->BlinkingLedState =3D RTW_LED_ON; + schedule_delayed_work(&pLed->blink_work, LED_BLINK_LINK_INTVL); break; case LED_CTL_SITE_SURVEY: if ((pmlmepriv->LinkDetectInfo.bBusyTraffic) && (check_fwstate(pmlmepriv= , _FW_LINKED))) --=20 2.30.2 From nobody Mon Apr 6 03:10:46 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 D0E52ECAAD3 for ; Sun, 11 Sep 2022 14:52:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229728AbiIKOwK (ORCPT ); Sun, 11 Sep 2022 10:52:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229562AbiIKOvp (ORCPT ); Sun, 11 Sep 2022 10:51:45 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 120502CCA9 for ; Sun, 11 Sep 2022 07:51:44 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJB-000829-DB; Sun, 11 Sep 2022 16:51:41 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 8/9] staging: r8188eu: cancel blink_work before link blinking Date: Sun, 11 Sep 2022 16:51:21 +0200 Message-Id: <20220911145122.15444-9-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Cancel blink_work before we start link blinking. Another worker will be scheduled after the state variables are updated. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 7cd6ed5385bb..0881c81f4c74 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -242,14 +242,14 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) =20 if (pLed->CurrLedState =3D=3D LED_BLINK_SCAN || IS_LED_WPS_BLINKING(pLed= )) return; - if (pLed->bLedNoLinkBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); + + cancel_delayed_work(&pLed->blink_work); + if (pLed->bLedNoLinkBlinkInProgress) pLed->bLedNoLinkBlinkInProgress =3D false; - } - if (pLed->bLedBlinkInProgress) { - cancel_delayed_work(&pLed->blink_work); + + if (pLed->bLedBlinkInProgress) pLed->bLedBlinkInProgress =3D false; - } + pLed->bLedLinkBlinkInProgress =3D true; pLed->CurrLedState =3D LED_BLINK_NORMAL; if (pLed->bLedOn) --=20 2.30.2 From nobody Mon Apr 6 03:10:46 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 43E2DECAAD3 for ; Sun, 11 Sep 2022 14:52:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229731AbiIKOwN (ORCPT ); Sun, 11 Sep 2022 10:52:13 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52650 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229529AbiIKOvq (ORCPT ); Sun, 11 Sep 2022 10:51:46 -0400 Received: from viti.kaiser.cx (viti.kaiser.cx [IPv6:2a01:238:43fe:e600:cd0c:bd4a:7a3:8e9f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A8DB82CC8E for ; Sun, 11 Sep 2022 07:51:45 -0700 (PDT) Received: from ipservice-092-217-076-063.092.217.pools.vodafone-ip.de ([92.217.76.63] helo=martin-debian-2.paytec.ch) by viti.kaiser.cx with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.89) (envelope-from ) id 1oXOJC-000829-8r; Sun, 11 Sep 2022 16:51:42 +0200 From: Martin Kaiser To: Greg Kroah-Hartman Cc: Larry Finger , Phillip Potter , Michael Straube , Pavel Skripkin , linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, Martin Kaiser Subject: [PATCH 9/9] staging: r8188eu: update status before link blinking Date: Sun, 11 Sep 2022 16:51:22 +0200 Message-Id: <20220911145122.15444-10-martin@kaiser.cx> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220911145122.15444-1-martin@kaiser.cx> References: <20220911145122.15444-1-martin@kaiser.cx> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Always update the status variables in rtw_led_control when we start link blinking. The if statements are not necessary. Signed-off-by: Martin Kaiser Tested-by: Philipp Hortmann # Edimax N150 --- drivers/staging/r8188eu/core/rtw_led.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/staging/r8188eu/core/rtw_led.c b/drivers/staging/r8188= eu/core/rtw_led.c index 0881c81f4c74..98eebe3e4119 100644 --- a/drivers/staging/r8188eu/core/rtw_led.c +++ b/drivers/staging/r8188eu/core/rtw_led.c @@ -244,13 +244,11 @@ void rtw_led_control(struct adapter *padapter, enum L= ED_CTL_MODE LedAction) return; =20 cancel_delayed_work(&pLed->blink_work); - if (pLed->bLedNoLinkBlinkInProgress) - pLed->bLedNoLinkBlinkInProgress =3D false; - - if (pLed->bLedBlinkInProgress) - pLed->bLedBlinkInProgress =3D false; =20 + pLed->bLedNoLinkBlinkInProgress =3D false; + pLed->bLedBlinkInProgress =3D false; pLed->bLedLinkBlinkInProgress =3D true; + pLed->CurrLedState =3D LED_BLINK_NORMAL; if (pLed->bLedOn) pLed->BlinkingLedState =3D RTW_LED_OFF; --=20 2.30.2