diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2017-06-22 12:20:29 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2017-09-21 11:41:57 +0200 |
| commit | 79af1f866193de29e65a4dba7d0dab14b0c0ff93 (patch) | |
| tree | 11b01b9ad489c3625c93521c1bbe251b24b9ca28 /net/mac80211 | |
| parent | net_sched: sch_htb: add per class overlimits counter (diff) | |
| download | linux-79af1f866193de29e65a4dba7d0dab14b0c0ff93.tar.xz linux-79af1f866193de29e65a4dba7d0dab14b0c0ff93.zip | |
mac80211: avoid allocating TXQs that won't be used
For AP_VLAN and monitor interfaces we'll never use the TXQs
we allocated, so avoid doing so.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/iface.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index f75029abf728..2619daa29961 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1772,7 +1772,9 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, sizeof(void *)); int txq_size = 0; - if (local->ops->wake_tx_queue) + if (local->ops->wake_tx_queue && + type != NL80211_IFTYPE_AP_VLAN && + type != NL80211_IFTYPE_MONITOR) txq_size += sizeof(struct txq_info) + local->hw.txq_data_size; |