Skip to contentSkip to conversation

FAILED: patch "[PATCH] rtlwifi: Fix logic error in enter/exit power-save mode" failed to apply to 3.14-stable tree

PATCH [email protected] 2 participants 3 messages Jun 4, 2016

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 3.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

Quoted 1 line

From 873ffe154ae074c46ed2d72dbd9a2a99f06f55b4 Mon Sep 17 00:00:00 2001

From: wang yanqing <[email protected]>
Date: Tue, 3 May 2016 00:38:36 +0800
Subject: [PATCH] rtlwifi: Fix logic error in enter/exit power-save mode

In commit a269913c52ad ("rtlwifi: Rework rtl_lps_leave() and rtl_lps_enter() to use work queue"), the tests for enter/exit power-save mode were inverted. With this change applied, the wifi connection becomes much more stable.

Fixes a269913c52ad ("rtlwifi: Rework rtl_lps_leave() and rtl_lps_enter() to use work queue")
CC Stable <[email protected]> [3.10+]
drivers/net/wireless/realtek/rtlwifi/base.c +2 -2
index c74eb139bfa1..264466f59c57 100644
@@ -1660,9 +1660,9 @@ void rtl_watchdog_wq_callback(void *data)
 		if (((rtlpriv->link_info.num_rx_inperiod +
 		      rtlpriv->link_info.num_tx_inperiod) > 8) ||
 		    (rtlpriv->link_info.num_rx_inperiod > 2))
-			rtl_lps_enter(hw);
-		else
 			rtl_lps_leave(hw);
+		else
+			rtl_lps_enter(hw);
 	}
 
 	rtlpriv->link_info.num_rx_inperiod = 0;
Acked-by
#1 lore raw
Quoted 5 lines · On 06/04/2016 01:54 PM, [email protected] wrote:

The patch below does not apply to the 3.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Greg,

The fixed patch for V3.14 is attached. The original commit ID is 873ffe154ae074c46ed2d72dbd9a2a99f06f55b4.

Thanks,

Larry

Quoted 1 line
Quoted 1 line

From 873ffe154ae074c46ed2d72dbd9a2a99f06f55b4 Mon Sep 17 00:00:00 2001

From: wang yanqing <[email protected]>
Date: Tue, 3 May 2016 00:38:36 +0800
Subject: [PATCH] rtlwifi: Fix logic error in enter/exit power-save mode

In commit a269913c52ad ("rtlwifi: Rework rtl_lps_leave() and rtl_lps_enter() to use work queue"), the tests for enter/exit power-save mode were inverted. With this change applied, the wifi connection becomes much more stable.

Fixes a269913c52ad ("rtlwifi: Rework rtl_lps_leave() and rtl_lps_enter() to use work queue")
CC Stable <[email protected]> [3.10+]
---
 drivers/net/wireless/rtlwifi/base.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/wireless/rtlwifi/base.c +2 -2
index 93bb384..0484de7 100644
@@ -1401,9 +1401,9 @@ void rtl_watchdog_wq_callback(void *data)
 		if (((rtlpriv->link_info.num_rx_inperiod +
 		      rtlpriv->link_info.num_tx_inperiod) > 8) ||
 		    (rtlpriv->link_info.num_rx_inperiod > 2))
-			rtlpriv->enter_ps = true;
-		else
 			rtlpriv->enter_ps = false;
+		else
+			rtlpriv->enter_ps = true;
 
 		/* LeisurePS only work in infra mode. */
 		schedule_work(&rtlpriv->works.lps_change_work);
Signature · 1 line
2.1.4
author maintainer
#2 lore raw
Quoted 11 lines · Larry Finger
Quoted 5 lines · On 06/04/2016 01:54 PM, [email protected] wrote:

The patch below does not apply to the 3.14-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Greg,

The fixed patch for V3.14 is attached. The original commit ID is 873ffe154ae074c46ed2d72dbd9a2a99f06f55b4.

Thanks, now applied.

greg k-h