From patchwork Sun Jun 18 16:12:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9794927 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id C0C90601C8 for ; Sun, 18 Jun 2017 16:13:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2FA727FA9 for ; Sun, 18 Jun 2017 16:13:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A7DAB27FB2; Sun, 18 Jun 2017 16:13:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5191727FA9 for ; Sun, 18 Jun 2017 16:13:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753258AbdFRQNP (ORCPT ); Sun, 18 Jun 2017 12:13:15 -0400 Received: from mail-oi0-f65.google.com ([209.85.218.65]:36858 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753111AbdFRQM6 (ORCPT ); Sun, 18 Jun 2017 12:12:58 -0400 Received: by mail-oi0-f65.google.com with SMTP id g14so7240129oib.3 for ; Sun, 18 Jun 2017 09:12:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=ED74PJt4Ou/zgMl+TRSHhnhXw6m9LBBMBQFptSoTWkk=; b=EdlHveNSrNoo3b/KJNtHnwh30vLCZztzEBQEKZTGPoqYLrKOrPJ4FTxE30eeGcTLEZ TrJFbjjWwmxRuZCHprRIVBjEpDIprs3VHytUJHJgUqS/rz3myMrp0W3CfTcwbJvPCfpk wi4bsYRAtx7m2MA00ur59WLMOdgV70OBbszMnk0LMcrkviJW1WxhsibP95nTPJisZQtN WhOTz/l7tPb8cK+8qGht28bePHfzsYwQb0U4veJOo2PJoFOu3yDBG+VYa77zAt9d+bLn 4Czbum1nkNd3ZDrIQFKonvzToH5yVj1rfcKpGyBm295ISGE76D/EMzdSCTa+P7480LiM YKTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=ED74PJt4Ou/zgMl+TRSHhnhXw6m9LBBMBQFptSoTWkk=; b=F9v8LC79RYhTsD0UcQ2CaPGiHg7xY9rpG/L0koYY7Rc0pg4l1uUITzZRPOzGCk9kvT VjNaw2V/vZWAFD8ttGnFMhgBl5NHI4dmW7jA8i4WUsBvUfH0MFyNDNL+PhcXcY8eloSz Nv/MtcdGwgDToglo8dfGrEKcYM8K/z5F8sw2v9Z2bDG1lUPmVrzFZ7N8yOd7Rd3wfPuQ P1NG0HfEhzksvHlaIobutFYZqo/LuZqBpxUFTtB2cplaW9BAb0ag3l6n64Zf4vNe6kvY 3+KPX2m0Dfw19YTAk97ByVofpDpFaG7Ump3U44y2zDKodCMovHY5XHn50Duk34jlL3gd SxCQ== X-Gm-Message-State: AKS2vOx64EL2YSGkBDqXMUM5ebf3FGa6op8U3NuDshrHOH8ParEKIzs2 nmnQFMplewLx2A== X-Received: by 10.202.208.148 with SMTP id j20mr1579861oiy.50.1497802377918; Sun, 18 Jun 2017 09:12:57 -0700 (PDT) Received: from linux-4v1g.suse (cpe-24-31-249-175.kc.res.rr.com. [24.31.249.175]) by smtp.gmail.com with ESMTPSA id s41sm4473985ots.54.2017.06.18.09.12.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 18 Jun 2017 09:12:57 -0700 (PDT) From: Larry Finger To: kvalo@codeaurora.org Cc: linux-wireless@vger.kernel.org, Ping-Ke Shih , vincent_fann , shaofu , Larry Finger , Yan-Hsuan Chuang Subject: [PATCH 04/11] rtlwifi: Correct power save capability while init mac80211 Date: Sun, 18 Jun 2017 11:12:42 -0500 Message-Id: <20170618161249.6146-5-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170618161249.6146-1-Larry.Finger@lwfinger.net> References: <20170618161249.6146-1-Larry.Finger@lwfinger.net> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ping-Ke Shih Since the driver itself will enter power saving mode dynamically according to the traffic, we set hw capability SUPPORTS_PS and SUPPORTS_DYNAMIC_PS in case of fwctrl_lps. The process IEEE80211_CONF_CHANGE_PS in op_config is used by SW-LPS only, so we add constraints to avoid errors. Signed-off-by: Ping-Ke Shih Signed-off-by: vincent_fann Signed-off-by: shaofu Signed-off-by: Larry Finger Signed-off-by: Yan-Hsuan Chuang --- drivers/net/wireless/realtek/rtlwifi/base.c | 4 ++++ drivers/net/wireless/realtek/rtlwifi/core.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index bdc379178e87..6415ec03008f 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -405,6 +405,10 @@ static void _rtl_init_mac80211(struct ieee80211_hw *hw) ieee80211_hw_set(hw, SUPPORTS_PS); ieee80211_hw_set(hw, PS_NULLFUNC_STACK); } + if (rtlpriv->psc.fwctrl_lps) { + ieee80211_hw_set(hw, SUPPORTS_PS); + ieee80211_hw_set(hw, SUPPORTS_DYNAMIC_PS); + } hw->wiphy->interface_modes = BIT(NL80211_IFTYPE_AP) | BIT(NL80211_IFTYPE_STATION) | diff --git a/drivers/net/wireless/realtek/rtlwifi/core.c b/drivers/net/wireless/realtek/rtlwifi/core.c index a4f8e326a2bc..5053d8c73e29 100644 --- a/drivers/net/wireless/realtek/rtlwifi/core.c +++ b/drivers/net/wireless/realtek/rtlwifi/core.c @@ -629,7 +629,8 @@ static int rtl_op_config(struct ieee80211_hw *hw, u32 changed) } /*For LPS */ - if (changed & IEEE80211_CONF_CHANGE_PS) { + if ((changed & IEEE80211_CONF_CHANGE_PS) && + rtlpriv->psc.swctrl_lps && !rtlpriv->psc.fwctrl_lps) { cancel_delayed_work(&rtlpriv->works.ps_work); cancel_delayed_work(&rtlpriv->works.ps_rfon_wq); if (conf->flags & IEEE80211_CONF_PS) {