From patchwork Fri Dec 12 11:41:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Kazior X-Patchwork-Id: 5481851 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 687B3BEEBA for ; Fri, 12 Dec 2014 11:54:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7C0662014A for ; Fri, 12 Dec 2014 11:54:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 961E820148 for ; Fri, 12 Dec 2014 11:54:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967427AbaLLLyh (ORCPT ); Fri, 12 Dec 2014 06:54:37 -0500 Received: from mail-wg0-f41.google.com ([74.125.82.41]:36926 "EHLO mail-wg0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967353AbaLLLyf (ORCPT ); Fri, 12 Dec 2014 06:54:35 -0500 Received: by mail-wg0-f41.google.com with SMTP id y19so8931334wgg.0 for ; Fri, 12 Dec 2014 03:54:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tieto.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=JshokST1BxYBpgBsANYsYZQhizx47kg+fQ5yenmlqF8=; b=Ob15HQJPQGkYVUjXWdWucE3CXQGWuNU5dIhELsT9kygbAbN3ytk1zpeK5UJnJL7214 3iA6HiamOFH5yi4WRGQJ9LEY8RICvXD90ungE0NhkVDzz+iLO3tQ895cxUa+sZFQT0BR 0EX3w9P4YQKVY8mRju0vvodTk0oinlJlTZEbE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=JshokST1BxYBpgBsANYsYZQhizx47kg+fQ5yenmlqF8=; b=bEE81SWrIAbOi4PCSLP2uwXDIG5Ktf4uOM1xuEwxGVpTHWJ1HyCvPuFCoVeV/jJtg2 ySV/+ZRsue6shRyAR8A4M7F/J6p8A8nk0kpZK/kzZ+lCYLxPMeLcl/y8b0MBmfpzbs0c vNBY/OpLla1sj7/yIA9zNE0KWsRujVWrDVCIlRTUwTlp64B4/ufa+CYqxX5S7mWz89g5 L1deVW7EMfgg0VLq7DADcNgvW8s7DeD1WwwIyTgITq7Svee1o75nomUrT8EpF+W5jLm8 Ak9ELNseGsPRSO5DboE1SnO8oK2+oXLVmUIwXVHUcOQ8POtCfX9U3Mc8eGbHZBKuVcjl gSJg== X-Gm-Message-State: ALoCoQlq+jytAY+WdBH0DRCrbhAoSKkPT7sk73g0we27kAq4mcox/NQKoI7bgCDml25AQ1wJs1MypzM5A2Eczv48MousBPVECsJEcxPWDHzMFMygHIJ3RHEM507oG0jM2uVLtnz8q02v X-Received: by 10.180.198.145 with SMTP id jc17mr6899981wic.67.1418385273207; Fri, 12 Dec 2014 03:54:33 -0800 (PST) Received: from localhost.localdomain ([91.198.246.8]) by mx.google.com with ESMTPSA id pf4sm1516796wjb.36.2014.12.12.03.54.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Dec 2014 03:54:32 -0800 (PST) From: Michal Kazior To: ath10k@lists.infradead.org Cc: linux-wireless@vger.kernel.org, Michal Kazior Subject: [PATCH v2 4/5] ath10k: enable per-vif sta powersave Date: Fri, 12 Dec 2014 12:41:38 +0100 Message-Id: <1418384499-31660-5-git-send-email-michal.kazior@tieto.com> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1418384499-31660-1-git-send-email-michal.kazior@tieto.com> References: <1418214714-29689-1-git-send-email-michal.kazior@tieto.com> <1418384499-31660-1-git-send-email-michal.kazior@tieto.com> X-DomainID: tieto.com Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Per-vif bss_conf.ps should be used to configure powersave. Signed-off-by: Michal Kazior --- drivers/net/wireless/ath/ath10k/mac.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index 2804952..19ddbc6 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -1099,9 +1099,6 @@ static int ath10k_mac_vif_recalc_ps_poll_count(struct ath10k_vif *arvif) return 0; } -/* - * Review this when mac80211 gains per-interface powersave support. - */ static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif) { struct ath10k *ar = arvif->ar; @@ -1117,7 +1114,7 @@ static int ath10k_mac_vif_setup_ps(struct ath10k_vif *arvif) if (arvif->vif->type != NL80211_IFTYPE_STATION) return 0; - if (conf->flags & IEEE80211_CONF_PS) { + if (vif->bss_conf.ps) { psmode = WMI_STA_PS_MODE_ENABLED; param = WMI_STA_PS_PARAM_INACTIVITY_TIME; @@ -3378,6 +3375,13 @@ static void ath10k_bss_info_changed(struct ieee80211_hw *hw, ath10k_warn(ar, "failed to recalc tx power: %d\n", ret); } + if (changed & BSS_CHANGED_PS) { + ret = ath10k_mac_vif_setup_ps(arvif); + if (ret) + ath10k_warn(ar, "failed to setup ps on vdev %i: %d\n", + arvif->vdev_id, ret); + } + mutex_unlock(&ar->conf_mutex); }