Commit 63faceb6 authored by Johannes Berg's avatar Johannes Berg Committed by Emmanuel Grumbach

iwlwifi: mvm: don't send zero quota to the firmware

There are some cases where we can currently send zero quota
for a valid binding, e.g. if we update while an interface is
bound to a channel context but not yet acting as an AP.

Avoid this by reordering the checks.
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 63cbe180
...@@ -105,11 +105,6 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac, ...@@ -105,11 +105,6 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,
if (WARN_ON_ONCE(id >= MAX_BINDINGS)) if (WARN_ON_ONCE(id >= MAX_BINDINGS))
return; return;
if (data->colors[id] < 0)
data->colors[id] = mvmvif->phy_ctxt->color;
else
WARN_ON_ONCE(data->colors[id] != mvmvif->phy_ctxt->color);
if (data->type == IWL_MVM_QUOTA_UPDATE_TYPE_DISABLED && if (data->type == IWL_MVM_QUOTA_UPDATE_TYPE_DISABLED &&
vif == data->vif) vif == data->vif)
return; return;
...@@ -135,6 +130,11 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac, ...@@ -135,6 +130,11 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,
return; return;
} }
if (data->colors[id] < 0)
data->colors[id] = mvmvif->phy_ctxt->color;
else
WARN_ON_ONCE(data->colors[id] != mvmvif->phy_ctxt->color);
data->n_interfaces[id]++; data->n_interfaces[id]++;
if (iwl_mvm_vif_low_latency(mvmvif) && !data->low_latency[id]) { if (iwl_mvm_vif_low_latency(mvmvif) && !data->low_latency[id]) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment