From patchwork Mon Feb 3 20:58:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emmanuel Grumbach X-Patchwork-Id: 3571521 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 B0408C02DC for ; Mon, 3 Feb 2014 21:00:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDEC32017B for ; Mon, 3 Feb 2014 21:00:00 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2666120179 for ; Mon, 3 Feb 2014 21:00:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753618AbaBCU7z (ORCPT ); Mon, 3 Feb 2014 15:59:55 -0500 Received: from mail-ee0-f50.google.com ([74.125.83.50]:50755 "EHLO mail-ee0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753565AbaBCU7y (ORCPT ); Mon, 3 Feb 2014 15:59:54 -0500 Received: by mail-ee0-f50.google.com with SMTP id d17so3855014eek.23 for ; Mon, 03 Feb 2014 12:59:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=r16YSxPqhGS7fssBDJWSZWm+A09wYM2Pz5578SEsmks=; b=ztlIc9M/id4Sw0yuD978Q7RMb8vKLGVZsbi9hWZyq9P69l4FjBQLB5hhJgsHvlJmqR zo6gYcbGS1Ksk7HJmQIy8fDsWq+9H5uSKjn5wpGqZ8b1LLrMy6R4e5Vzwmq6dk12mJ96 jDA4k6f2ZBFifxdUtejM2g7+ihWMK9P8St+takOdKi6yFxDQ1KzG6S/bnHjzjAN29qQC nIRdc9BHdMUtnXCrvtQWCQMVb3gauMLsgS+lEvWLAXGMdfx/FBRA59ekOmX/1l0Vnez5 fOyTn8p/hgVGYdlHK3IxJFpxtBwHhrQ9PmuhELZw/MMFKy4VdBbcYfguuIN9nmOtfeAG GqOw== X-Received: by 10.15.45.194 with SMTP id b42mr5115983eew.103.1391461185224; Mon, 03 Feb 2014 12:59:45 -0800 (PST) Received: from localhost.localdomain (93-172-204-107.bb.netvision.net.il. [93.172.204.107]) by mx.google.com with ESMTPSA id k6sm79956311eep.17.2014.02.03.12.59.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Feb 2014 12:59:44 -0800 (PST) From: Emmanuel Grumbach To: linux-wireless@vger.kernel.org Cc: Emmanuel Grumbach Subject: [PATCH 57/62] iwlwifi: mvm: don't look at power commmand to decide if power is enabled Date: Mon, 3 Feb 2014 22:58:03 +0200 Message-Id: <1391461088-8082-57-git-send-email-egrumbach@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 From: Emmanuel Grumbach Reviewed-by: Johannes Berg Signed-off-by: Emmanuel Grumbach --- drivers/net/wireless/iwlwifi/mvm/power.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/iwlwifi/mvm/power.c b/drivers/net/wireless/iwlwifi/mvm/power.c index f9ddd79..20bc376 100644 --- a/drivers/net/wireless/iwlwifi/mvm/power.c +++ b/drivers/net/wireless/iwlwifi/mvm/power.c @@ -423,6 +423,7 @@ static int iwl_mvm_power_mac_update_mode(struct iwl_mvm *mvm, int ret; bool ba_enable; struct iwl_mac_power_cmd cmd = {}; + struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif); if (vif->type != NL80211_IFTYPE_STATION) return 0; @@ -439,8 +440,9 @@ static int iwl_mvm_power_mac_update_mode(struct iwl_mvm *mvm, if (ret) return ret; - ba_enable = !!(cmd.flags & - cpu_to_le16(POWER_FLAGS_POWER_MANAGEMENT_ENA_MSK)); + ba_enable = !(iwlmvm_mod_params.power_scheme == IWL_POWER_SCHEME_CAM || + mvm->ps_prevented || mvm->bound_vif_cnt > 1 || + !vif->bss_conf.ps || iwl_mvm_vif_low_latency(mvmvif)); return iwl_mvm_update_beacon_abort(mvm, vif, ba_enable); }