From patchwork Mon May 2 16:38:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang YanQing X-Patchwork-Id: 617606 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3qz94H0nyPz9t5T for ; Tue, 3 May 2016 02:39:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Tb25r3qV; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754611AbcEBQjI (ORCPT ); Mon, 2 May 2016 12:39:08 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:32769 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754311AbcEBQjA (ORCPT ); Mon, 2 May 2016 12:39:00 -0400 Received: by mail-pa0-f67.google.com with SMTP id gh9so990815pac.0; Mon, 02 May 2016 09:39:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=date:from:to:cc:subject:message-id:mail-followup-to:mime-version :content-disposition:user-agent; bh=V0FdIxB5ORjuDOIqw4pWidwGd4tLZnWxyzvee3TMO0M=; b=Tb25r3qVM5/AZDbChrKHmJ8kwwiPg15ZK5sr8L2smgemd6bu6ETs4xpVE74xwNrJ1o yGiTfZJ/A5AEm84tjrNAFPCVpO0zR6UsrJo7KlwIa5q36JgK5OhcHHLFCEaiV7f321G9 BO5whLj8sfenluhNnM4j/IAmu2xG/lmqhiB9mYI3JbjbHcBoEs7da/YqwjKn7xGS7AVz CUyMsIBLIgPNa5MjDj0LRaL2ChadYUNnKx8x7TspAMuMX4u0cYCMmsYKX7z5q2Y1l+wV 4mWf6Zu+0ML+1dmAyfVS6JDZueCoOeqZzAIw6kxFa3Ey6FDdQpP+fmvzkeSuJopsmuK8 arow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:cc:subject:message-id :mail-followup-to:mime-version:content-disposition:user-agent; bh=V0FdIxB5ORjuDOIqw4pWidwGd4tLZnWxyzvee3TMO0M=; b=i8N3Oc5TweiUZ+H8Fth2ux1VFLVWfmZRDixp50L/gBAZXZLS1KUJRSrg47dT8lVC2T cDxnSG5c9Fe7I0NObVR/N2Zm06LSyOhYD4Mgn7llPm6MyGQcfZzleRZ6FQZuBJWSnPLA gYlEn9sZ4jef9uC1oh++3KX+llcwBqA8UEQ1oLjOym+TkJ3yCIizOoda3ZqTcP7aybf1 TIY3fl994HndCbly+T/sYgGJDqxa9g8SbDveFsO0Kn7aNJ0d1+YKQP3P7ktFyRWkFlNa oX7ck2JbP2/pTfn83z/Fp5O2/GFIcrlGbJNGjgR3puJrbgtsc7vQwVnTnkNlA3Z/8rDy 5YpQ== X-Gm-Message-State: AOPr4FXhWINxgKS15N61G7WdCyJjsdXdHP9x6BjTouorJioS1C04OJB5XTkNJd4RFjDSvg== X-Received: by 10.66.248.6 with SMTP id yi6mr35357592pac.86.1462207139492; Mon, 02 May 2016 09:38:59 -0700 (PDT) Received: from udknight.localhost ([218.66.137.165]) by smtp.gmail.com with ESMTPSA id 184sm46612004pfd.43.2016.05.02.09.38.58 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 02 May 2016 09:38:59 -0700 (PDT) Received: from udknight.localhost (udknight.com [127.0.0.1]) by udknight.localhost (8.14.4/8.14.4) with ESMTP id u42GcofP011112; Tue, 3 May 2016 00:38:50 +0800 Received: (from root@localhost) by udknight.localhost (8.14.4/8.14.4/Submit) id u42GcaKH011108; Tue, 3 May 2016 00:38:36 +0800 Date: Tue, 3 May 2016 00:38:36 +0800 From: Wang YanQing To: Larry.Finger@lwfinger.net Cc: kvalo@codeaurora.org, chaoming_li@realsil.com.cn, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] rtlwifi: Fix logic error in enter/exit power-save mode Message-ID: <20160502163835.GA10925@udknight> Mail-Followup-To: Wang YanQing , Larry.Finger@lwfinger.net, kvalo@codeaurora.org, chaoming_li@realsil.com.cn, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.22 (2013-10-16) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- Hi, Larry! Because commit a269913c52ad is the first commit bring this problem, so maybe use above commit message is ok, right? And stable kernels 3.10-3.18 don't have commit fd09ff958777, but have a269913c52ad. Thanks for suggestion concerning to good subject and commit message writing, it is harder than coding sometimes:) Changes: v1-v2: 1: Fix subject and commit message. 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 c74eb13..264466f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -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;