diff options
| author | Felix Fietkau <nbd@nbd.name> | 2018-09-22 18:35:31 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-26 11:16:54 +0200 |
| commit | 8105f9b8a8879bff7f1d43d0720c993a99c9d135 (patch) | |
| tree | a4b417df374eae6ae18454d2aa2fe63eba40feb2 /net | |
| parent | c42055105785580563535e6d3143cad95c7ac7ee (diff) | |
| download | linux-8105f9b8a8879bff7f1d43d0720c993a99c9d135.tar.gz linux-8105f9b8a8879bff7f1d43d0720c993a99c9d135.tar.bz2 linux-8105f9b8a8879bff7f1d43d0720c993a99c9d135.zip | |
mac80211: allocate TXQs for active monitor interfaces
Monitor mode interfaces with the active flag are passed down to the driver.
Drivers using TXQ expect that all interfaces have allocated TXQs before
they get added.
Fixes: 79af1f866193d ("mac80211: avoid allocating TXQs that won't be used")
Cc: stable@vger.kernel.org
Reported-by: Catrinel Catrinescu <cc@80211.de>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/mac80211/iface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 5e6cf2cee965..5836ddeac9e3 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -1756,7 +1756,8 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, if (local->ops->wake_tx_queue && type != NL80211_IFTYPE_AP_VLAN && - type != NL80211_IFTYPE_MONITOR) + (type != NL80211_IFTYPE_MONITOR || + (params->flags & MONITOR_FLAG_ACTIVE))) txq_size += sizeof(struct txq_info) + local->hw.txq_data_size; |