From patchwork Mon May 2 06:11:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang YanQing X-Patchwork-Id: 617375 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 3qyvN05B7Tz9t6Z for ; Mon, 2 May 2016 16:21:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=BHqOrXAF; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752770AbcEBGVk (ORCPT ); Mon, 2 May 2016 02:21:40 -0400 Received: from mail-pa0-f67.google.com ([209.85.220.67]:33406 "EHLO mail-pa0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751113AbcEBGVg (ORCPT ); Mon, 2 May 2016 02:21:36 -0400 Received: by mail-pa0-f67.google.com with SMTP id gh9so219879pac.0; Sun, 01 May 2016 23:21:35 -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=Q9FHkoTGi2oTkCWCo0uMAsG152g7CTElHqeC5gepDeU=; b=BHqOrXAFqrXS0pGOdPcLi4M6V5daxkyPbu7iF0TH665O/hLjpKz02OTHn4FYD8YFle an/PQvA+lrLe3fwKacNn5b3rYfd+HJ7BZiGJSHhsF3L83ZeppGVzYmlGDo4Vn06RyIhJ 3nybeq7yVXtbFZe49tS1Vafrk54XNrVXF3ety1UTLELNCufJSDi9tRN7xe/EXMdx2Dk3 c/TOh+jTTy2sbVENB/bag2Z56/dAezjw/i7ospSsoBqQOPaOHfHM49Ez8iIjJ1woDKP7 YWN4dVZ1HzE7ExUZ9WlBbJ7liFPjT3K7XyQqQ7bmL4np3fIxZUpt4STxOXjwih/0XnWe Inzg== 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=Q9FHkoTGi2oTkCWCo0uMAsG152g7CTElHqeC5gepDeU=; b=aRbI62z3FgKpRSrF8UzzfI93Bk3CupwXXHggTQEW93CvMDEu+032bYRF8n23aN0GOh yV+pzVGqTBvDCvRwFkAcWQPCbZJFZDbuuKz7c5PNlI0zZDEKhUtRD/xnEtWJzXqCkzFO QLkUlbbpjkOPim65OFP8ARy5f/SbmspiNyyvXY3cUngI3FvGSQIoXmEUPM5Vbl34Gu8J l3ab+y4HWMehRTJu5FHL86SAK+9riQ4xX+XX5m6XAmeNAia871EaFusT+wI6Fp0RYATK pIzO1F/XKSCZ93Q95gP/SFlJcpRk+r+Cp1z+r4ggZz02fm/5luwJigSlDZNboZ0CJhDS 4Rcg== X-Gm-Message-State: AOPr4FX5NDLpEyELkjNdyVSg//UF7GmNocrUb6m5DJ+NcN7IBj0MutdEnwq7RijDQVSLow== X-Received: by 10.66.27.164 with SMTP id u4mr48506762pag.112.1462170095373; Sun, 01 May 2016 23:21:35 -0700 (PDT) Received: from udknight.localhost ([218.66.137.165]) by smtp.gmail.com with ESMTPSA id h1sm41925018pfh.49.2016.05.01.23.21.34 (version=TLS1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 01 May 2016 23:21:34 -0700 (PDT) Received: from udknight.localhost (udknight.com [127.0.0.1]) by udknight.localhost (8.14.4/8.14.4) with ESMTP id u426B7UR013075; Mon, 2 May 2016 14:11:07 +0800 Received: (from root@localhost) by udknight.localhost (8.14.4/8.14.4/Submit) id u426B2E0013071; Mon, 2 May 2016 14:11:02 +0800 Date: Mon, 2 May 2016 14:11:02 +0800 From: Wang YanQing To: Larry.Finger@lwfinger.net Cc: chaoming_li@realsil.com.cn, kvalo@codeaurora.org, linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] rtlwifi:rtl_lps_enter: fix double check cnt_after_linked Message-ID: <20160502061102.GB12832@udknight> Mail-Followup-To: Wang YanQing , Larry.Finger@lwfinger.net, chaoming_li@realsil.com.cn, kvalo@codeaurora.org, 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 We have checked cnt_after_linked in below code: " /*sleep after linked 10s, to let DHCP and 4-way handshake ok enough!! */ if (mac->cnt_after_linked < 5) return; " So the second check isn't necessary. This patch delete second check code. Signed-off-by: Wang YanQing --- drivers/net/wireless/realtek/rtlwifi/ps.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/ps.c b/drivers/net/wireless/realtek/rtlwifi/ps.c index b69321d..9d73581c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/ps.c +++ b/drivers/net/wireless/realtek/rtlwifi/ps.c @@ -443,14 +443,11 @@ void rtl_lps_enter(struct ieee80211_hw *hw) spin_lock_irqsave(&rtlpriv->locks.lps_lock, flag); - /* Idle for a while if we connect to AP a while ago. */ - if (mac->cnt_after_linked >= 2) { - if (ppsc->dot11_psmode == EACTIVE) { - RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, - "Enter 802.11 power save mode...\n"); + if (ppsc->dot11_psmode == EACTIVE) { + RT_TRACE(rtlpriv, COMP_POWER, DBG_LOUD, + "Enter 802.11 power save mode...\n"); - rtl_lps_set_psmode(hw, EAUTOPS); - } + rtl_lps_set_psmode(hw, EAUTOPS); } spin_unlock_irqrestore(&rtlpriv->locks.lps_lock, flag);