From patchwork Fri Dec 2 01:48:20 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Larry Finger X-Patchwork-Id: 9457587 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 E10BD6074E for ; Fri, 2 Dec 2016 01:48:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D2B6B2003F for ; Fri, 2 Dec 2016 01:48:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C7698284ED; Fri, 2 Dec 2016 01:48:52 +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.3 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, 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 116432003F for ; Fri, 2 Dec 2016 01:48:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754577AbcLBBst (ORCPT ); Thu, 1 Dec 2016 20:48:49 -0500 Received: from mail-oi0-f65.google.com ([209.85.218.65]:35465 "EHLO mail-oi0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751105AbcLBBss (ORCPT ); Thu, 1 Dec 2016 20:48:48 -0500 Received: by mail-oi0-f65.google.com with SMTP id v84so25421573oie.2 for ; Thu, 01 Dec 2016 17:48:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=lGJO5y1Q6OPPS2jJ1SOYv9gBzKuJce+cPy9ReJ9p99A=; b=U1Mma2kImVgY+dvYtvYPBfoORk0RLQrNpUtWO88W0J2rm/QlARp2g+WEsp1c3IPSMw aQa3LgP36EWS5uP2cMFpsNnGjdD37LDv4F0uOsn1maBQZktauLmN+0SQpa64vzkRW5nQ +tF9iu68UYWCkgCYKV40k13nVpOXcl7wE344zTH1794ClCke0lkE1IHPvEbpuvz1v0I9 Q0xMLhtbK6byEvJ8X++ZFiLG1wmOKmZcTvEiDL8U30I0G7BKesYGisPxH5yc/BT9T14/ R2pi+myVzYAF1F14XkPX/FgP97oLsbNMiHhRiPGUEPuZvKfQglSMe+mfuH5FLhnmvJmh NOBg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=lGJO5y1Q6OPPS2jJ1SOYv9gBzKuJce+cPy9ReJ9p99A=; b=hI8FqFAbQsJaAr12K+ahNzNWfs4b0EtpXlO215o2FrT0Sbs5IpiLrNx/728DQo7ohN BNLdEuDC/2dtyKwkv8ivfdgEE8174zdeHHTP6Tlv89CfdZ77+HMd5/ni2Qh5KI+GLDls rJMUlfuD8hrblIfHnfhlIJEKtlOTt9iYwXsTvqnZ+9ZivgkCUDV/Sir2zyOfK1BVd7dw w4H4j74VGYZOmqLU0e8eVgfYhNwp1tsb3yykPRIdy2L8WYQXTtIFElRhNXlplunYkrVX //yvfJ/lnWVMnHAoFd2CwWK958mUr5An9IzuoFLfnNmpDRIOaXd6A1c5p2ajWpp8xY6g qMCg== X-Gm-Message-State: AKaTC01k6frFZ+HEs1n/BDeGWptmulxOuXrcmO7O6rS1w19rU0JFFV4l0/lM0iajEYhELA== X-Received: by 10.157.48.50 with SMTP id d47mr21706848otc.204.1480643328052; Thu, 01 Dec 2016 17:48:48 -0800 (PST) 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 17sm949990oty.17.2016.12.01.17.48.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 01 Dec 2016 17:48:47 -0800 (PST) From: Larry Finger To: kvalo@codeaurora.org Cc: devel@driverdev.osuosl.org, linux-wireless@vger.kernel.org, Vincent Fann , Larry Finger , shaofu , Ping-Ke Shih Subject: [PATCH 01/14] rtlwifi: Correct power save capability while init mac80211 Date: Thu, 1 Dec 2016 19:48:20 -0600 Message-Id: <20161202014833.6856-2-Larry.Finger@lwfinger.net> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161202014833.6856-1-Larry.Finger@lwfinger.net> References: <20161202014833.6856-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 Set IEEE80211_HW_SUPPORTS_PS when driver is fwlps Because mac80211 control SW-LPS only, we add constraints to avoid errors. Signed-off-by: Vincent Fann Signed-off-by: shaofu Signed-off-by: Ping-Ke Shih Signed-off-by: Larry Finger --- drivers/net/wireless/realtek/rtlwifi/base.c | 2 ++ drivers/net/wireless/realtek/rtlwifi/core.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtlwifi/base.c b/drivers/net/wireless/realtek/rtlwifi/base.c index 4ac928b..fa2d26a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/base.c +++ b/drivers/net/wireless/realtek/rtlwifi/base.c @@ -406,6 +406,8 @@ 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); 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 2caa4ad..7c2ac24 100644 --- a/drivers/net/wireless/realtek/rtlwifi/core.c +++ b/drivers/net/wireless/realtek/rtlwifi/core.c @@ -620,7 +620,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) {