Эх сурвалжийг харах

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>
Johannes Berg 8 жил өмнө
parent
commit
79af1f8661
1 өөрчлөгдсөн 3 нэмэгдсэн , 1 устгасан
  1. 3 1
      net/mac80211/iface.c

+ 3 - 1
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;