From: Johannes Berg <johannes.berg@intel.com>
Date: Thu, 22 Jun 2017 10:20:29 +0000 (+0200)
Subject: mac80211: avoid allocating TXQs that won't be used
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=79af1f866193de29e65a4dba7d0dab14b0c0ff93;p=linux.git

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>
---

diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c
index f75029abf7286..2619daa299613 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;