diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:38:28 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-03-25 16:38:28 -0400 |
commit | 31c5770b5d7354c308bd41bf2bb3e02e5e0e95b6 (patch) | |
tree | 3135ede01b35ad7a0fe44c18d4ea55d3c512779e /drivers/net/wireless/iwlwifi/mvm/quota.c | |
parent | c78b3841fac9a59c7494be143aa7f2e69ea47958 (diff) | |
parent | e635c797b3b18ffbe4ef5db27971f48b661f03bd (diff) |
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next
Diffstat (limited to 'drivers/net/wireless/iwlwifi/mvm/quota.c')
-rw-r--r-- | drivers/net/wireless/iwlwifi/mvm/quota.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/quota.c b/drivers/net/wireless/iwlwifi/mvm/quota.c index df85c49dc599..a1e3e923ea3e 100644 --- a/drivers/net/wireless/iwlwifi/mvm/quota.c +++ b/drivers/net/wireless/iwlwifi/mvm/quota.c @@ -114,7 +114,8 @@ static void iwl_mvm_quota_iterator(void *_data, u8 *mac, data->n_interfaces[id]++; break; case NL80211_IFTYPE_MONITOR: - data->n_interfaces[id]++; + if (mvmvif->monitor_active) + data->n_interfaces[id]++; break; case NL80211_IFTYPE_P2P_DEVICE: break; |