git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From: Felix Fietkau <nbd@nbd.name>
   2 Date: Sat, 22 Sep 2018 15:05:59 +0200
   3 Subject: [PATCH] mac80211: allocate TXQs for active monitor interfaces
   4
   5 Monitor mode interfaces with the active flag are passed down to the driver.
   6 Drivers using TXQ expect that all interfaces have allocated TXQs before
   7 they get added.
   8
   9 Fixes: 79af1f866193d ("mac80211: avoid allocating TXQs that won't be used")
  10 Cc: stable@vger.kernel.org
  11 Reported-by: Catrinel Catrinescu <cc@80211.de>
  12 Signed-off-by: Felix Fietkau <nbd@nbd.name>
  13 ---
  14
  15 --- a/net/mac80211/iface.c
  16 +++ b/net/mac80211/iface.c
  17 @@ -1834,7 +1834,8 @@ int ieee80211_if_add(struct ieee80211_lo
  18
  19                 if (local->ops->wake_tx_queue &&
  20                     type != NL80211_IFTYPE_AP_VLAN &&
  21 -                   type != NL80211_IFTYPE_MONITOR)
  22 +                   (type != NL80211_IFTYPE_MONITOR ||
  23 +                    (params->flags & MONITOR_FLAG_ACTIVE)))
  24                         txq_size += sizeof(struct txq_info) +
  25                                     local->hw.txq_data_size;
  26