[NOUPSTREAM] iwlwifi: mvm: use DHC quota enforce for NoA and OPPPS
With Quota offload, use new DHC to set max Quota
for forcing NoA or for entering PS during OPPPS.
(What was done prior to Quota offload).
type=feature
ticket=jira:WLWG-4896
Change-Id: Id3b360a05e20a4f0301f1475089c5ea4cd04f9b3
Signed-off-by: Shaul Triebitz <shaul.triebitz@intel.com>
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/152490
Reviewed-by: Coelho, Luciano <luciano.coelho@intel.com>
x-iwlwifi-stack-dev: 04a9d994775b2df3311917eabe6e00209c3f9237
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 3643453..5e735e0 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -4117,6 +4117,11 @@
mvm->noa_duration = noa_duration;
mvm->noa_vif = vif;
+ if (fw_has_capa(&mvm->fw->ucode_capa,
+ IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA)) {
+ return -EOPNOTSUPP;
+ }
+
return iwl_mvm_update_quotas(mvm, true, NULL);
case IWL_MVM_TM_CMD_SET_BEACON_FILTER:
/* must be associated client vif - ignore authorized */
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
index a00e651..852be5c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
@@ -809,6 +809,12 @@
mvm->p2p_opps_test_wa_vif = mvmvif;
else
mvm->p2p_opps_test_wa_vif = NULL;
+
+ if (fw_has_capa(&mvm->fw->ucode_capa,
+ IWL_UCODE_TLV_CAPA_DYNAMIC_QUOTA)) {
+ return -EOPNOTSUPP;
+ }
+
return iwl_mvm_update_quotas(mvm, force_update, NULL);
}
diff --git a/versions b/versions
index 8f83f46..0c88693 100644
--- a/versions
+++ b/versions
@@ -2,4 +2,4 @@
BACKPORTED_KERNEL_VERSION="(see git)"
BACKPORTED_KERNEL_NAME="iwlwifi"
BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__
-BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:6680:51221186"
+BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:6681:04a9d994"
