Merge remote-tracking branch 'wireless-next/master'

[karo-tx-linux.git] / drivers / net / wireless / iwlwifi / mvm / quota.c

diff --git a/drivers/net/wireless/iwlwifi/mvm/quota.c b/drivers/net/wireless/iwlwifi/mvm/quota.c
index 6c724a076427921e9525a34da9638f172eb4388d..17e2bc827f9a3b20b7da9e0d7ee4dd43ac00606a 100644 (file)
--- a/drivers/net/wireless/iwlwifi/mvm/quota.c
+++ b/drivers/net/wireless/iwlwifi/mvm/quota.c
@@ -110,7 +110,8 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,
                        data->n_interfaces[id]++;
                break;
        case NL80211_IFTYPE_AP:
-               if (mvmvif->ap_active)
+       case NL80211_IFTYPE_ADHOC:
+               if (mvmvif->ap_ibss_active)
                        data->n_interfaces[id]++;
                break;
        case NL80211_IFTYPE_MONITOR:
@@ -119,10 +120,6 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac,
                break;
        case NL80211_IFTYPE_P2P_DEVICE:
                break;
-       case NL80211_IFTYPE_ADHOC:
-               if (vif->bss_conf.ibss_joined)
-                       data->n_interfaces[id]++;
-               break;
        default:
                WARN_ON_ONCE(1);
                break;
@@ -140,7 +137,7 @@ static void iwl_mvm_adjust_quota_for_noa(struct iwl_mvm *mvm,
                return;
 
        mvmvif = iwl_mvm_vif_from_mac80211(mvm->noa_vif);
-       if (!mvmvif->ap_active)
+       if (!mvmvif->ap_ibss_active)
                return;
 
        phy_id = mvmvif->phy_ctxt->id;
@@ -154,7 +151,8 @@ static void iwl_mvm_adjust_quota_for_noa(struct iwl_mvm *mvm,
                if (id != phy_id)
                        continue;
 
-               quota *= (beacon_int - mvm->noa_duration) / beacon_int;
+               quota *= (beacon_int - mvm->noa_duration);
+               quota /= beacon_int;
 
                cmd->quotas[i].quota = cpu_to_le32(quota);
        }