projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
[firefly-linux-kernel-4.4.55.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 df85c49dc59919fef7ed95771c3c44ada2404d45..a1e3e923ea3e12c1fb6a0adabab88d05b1c5530e 100644
(file)
--- 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;