Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp192736pxj; Thu, 17 Jun 2021 00:09:29 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwpSaBT6BrMi1BL+YEUEDhrx6UAJHXlb/gUpC1H9JQKiVuTwd2FSQGPEOB6DPASo/cBCUmi X-Received: by 2002:a92:7312:: with SMTP id o18mr2339019ilc.289.1623913769012; Thu, 17 Jun 2021 00:09:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623913769; cv=none; d=google.com; s=arc-20160816; b=Rwu0+7+J8RD8NJEBi2gEtEk0mb2VcEuWOQF0VAzKEXMBeoA6YaPAEX4lGsRX3rEtCQ oKS8gXQniwuWE20Sgd43/tsXAEUtW9jnCGkFQh/FBuGMbr9r7cFigcP7w+biMhRZakZT MsSs7xIBWZvlVD9FXlszuDF8DxZI7wVMRE14mKCdXDNw2BwaCk+lECmDrBcn3c3wQDyJ Ns4u07F+/fGc/qf2AdYCQ1qc/lI5IxmczuCXYt8RY3tEUhxHM4VjLsRO/weVrrq/7XQr 0uPiUmwlWe8ph2IAUJ/2w83BPc2Se34i/tZbfOoKKf2HzhQaSunBN3AcamoDW2vQ91qA AriQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:cc:to:from; bh=Y1/t14B119IqlDgjEfMdKI2zq1IVwUuJaNmxxpnX3BQ=; b=iS//dG4Xki5KbMTJQ64dIkityW4eebn2gJjIHdTzMFRdaS8xrGhMfOQkC+Tx9BWpBk rkig7EfgbYshmB2dnGow+0xTCo7tDWj7fAmIjSCw5O3VmtUGT3T15lPDmOBStqtPJcNX YqdcrhHgEUPkHlhFr2U6gZfCixJSEG+ihfSq3amDLXIDCyxby+LpqlF3ridqj/TRhqka enq8CPgMDne579wi5WdzoFHP7FqLEBhZHdZ+L1ZZ18oVarNc9G8u3zCc0+UWGr8CvxxE hohDagXR4Di+2DCWtgu8GdmrOEebx/v25J4Q8wpjHBOJouiGQbxpQcHsocCiDPnKYnA6 MP2A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j25si2416664jaj.93.2021.06.17.00.09.14; Thu, 17 Jun 2021 00:09:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-wireless-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-wireless-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230137AbhFQHLG (ORCPT + 99 others); Thu, 17 Jun 2021 03:11:06 -0400 Received: from paleale.coelho.fi ([176.9.41.70]:47876 "EHLO farmhouse.coelho.fi" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S230103AbhFQHLF (ORCPT ); Thu, 17 Jun 2021 03:11:05 -0400 Received: from 91-156-6-193.elisa-laajakaista.fi ([91.156.6.193] helo=kveik.lan) by farmhouse.coelho.fi with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94) (envelope-from ) id 1ltm91-001XeC-9R; Thu, 17 Jun 2021 10:08:56 +0300 From: Luca Coelho To: kvalo@codeaurora.org Cc: luca@coelho.fi, linux-wireless@vger.kernel.org Date: Thu, 17 Jun 2021 10:08:42 +0300 Message-Id: X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210617070852.496985-1-luca@coelho.fi> References: <20210617070852.496985-1-luca@coelho.fi> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.5-pre1 (2020-06-20) on farmhouse.coelho.fi X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00, TVD_RCVD_IP autolearn=ham autolearn_force=no version=3.4.5-pre1 Subject: [PATCH 02/12] iwlwifi: mvm: don't request SMPS in AP mode Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org From: Johannes Berg This is not valid (in the spec) and mac80211 will soon warn on it, in addition to ignoring it. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho --- drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c index 99105272139d..e1e45eca09b5 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/utils.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/utils.c @@ -621,7 +621,7 @@ void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif, enum ieee80211_smps_mode smps_request) { struct iwl_mvm_vif *mvmvif; - enum ieee80211_smps_mode smps_mode; + enum ieee80211_smps_mode smps_mode = IEEE80211_SMPS_AUTOMATIC; int i; lockdep_assert_held(&mvm->mutex); @@ -630,10 +630,8 @@ void iwl_mvm_update_smps(struct iwl_mvm *mvm, struct ieee80211_vif *vif, if (num_of_ant(iwl_mvm_get_valid_rx_ant(mvm)) == 1) return; - if (vif->type == NL80211_IFTYPE_AP) - smps_mode = IEEE80211_SMPS_OFF; - else - smps_mode = IEEE80211_SMPS_AUTOMATIC; + if (vif->type != NL80211_IFTYPE_STATION) + return; mvmvif = iwl_mvm_vif_from_mac80211(vif); mvmvif->smps_requests[req_type] = smps_request; -- 2.32.0