From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi0-f41.google.com ([209.85.218.41]:35760 "EHLO mail-oi0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751013AbcFDTYi (ORCPT ); Sat, 4 Jun 2016 15:24:38 -0400 Received: by mail-oi0-f41.google.com with SMTP id w184so173749128oiw.2 for ; Sat, 04 Jun 2016 12:24:37 -0700 (PDT) Subject: Re: FAILED: patch "[PATCH] rtlwifi: Fix logic error in enter/exit power-save mode" failed to apply to 3.14-stable tree To: gregkh@linuxfoundation.org, stable@vger.kernel.org References: <1465066486252225@kroah.com> From: Larry Finger Message-ID: <57532AF3.4090109@lwfinger.net> Date: Sat, 4 Jun 2016 14:24:35 -0500 MIME-Version: 1.0 In-Reply-To: <1465066486252225@kroah.com> Content-Type: multipart/mixed; boundary="------------040509020205080201050008" Sender: stable-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --------------040509020205080201050008 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit On 06/04/2016 01:54 PM, gregkh@linuxfoundation.org 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 . Greg, The fixed patch for V3.14 is attached. The original commit ID is 873ffe154ae074c46ed2d72dbd9a2a99f06f55b4. Thanks, Larry --------------040509020205080201050008 Content-Type: text/x-patch; name="0001-PATCH-rtlwifi-Fix-logic-error-in-enter-.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-PATCH-rtlwifi-Fix-logic-error-in-enter-.patch" >>>From 873ffe154ae074c46ed2d72dbd9a2a99f06f55b4 Mon Sep 17 00:00:00 2001 From: wang yanqing 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") Signed-off-by: Wang YanQing CC: Stable [3.10+] Acked-by: Larry Finger Signed-off-by: Kalle Valo --- drivers/net/wireless/rtlwifi/base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c index 93bb384..0484de7 100644 --- a/drivers/net/wireless/rtlwifi/base.c +++ b/drivers/net/wireless/rtlwifi/base.c @@ -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); -- 2.1.4 --------------040509020205080201050008--