[RFC,05/13] wifi: mac80211: Convert vif->txq to an array

Message ID	20250127162625.20747-6-Alexander@wetzel-home.de
State	New
Headers	show Received: from ns2.wdyn.eu (ns2.wdyn.eu [5.252.227.236]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 96ABC15573F for <linux-wireless@vger.kernel.org>; Mon, 27 Jan 2025 16:28:26 +0000 (UTC) From: Alexander Wetzel <Alexander@wetzel-home.de> To: linux-wireless@vger.kernel.org Cc: johannes@sipsolutions.net, Alexander Wetzel <alexander@wetzel-home.de> Subject: [RFC PATCH 05/13] wifi: mac80211: Convert vif->txq to an array Date: Mon, 27 Jan 2025 17:26:17 +0100 Message-ID: <20250127162625.20747-6-Alexander@wetzel-home.de> In-Reply-To: <20250127162625.20747-1-Alexander@wetzel-home.de> References: <20250127162625.20747-1-Alexander@wetzel-home.de> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	Convert mac80211 to TXQs only \| expand [RFC,00/13] Convert mac80211 to TXQs only [RFC,02/13] wifi: mac80211: Fix debugfs handling for virtual monitor [RFC,03/13] wifi: mac80211: Cleanup sta TXQs on flush [RFC,04/13] wifi: mac80211: Always provide the MMPDU TXQ [RFC,05/13] wifi: mac80211: Convert vif->txq to an array [RFC,06/13] wifi: mac80211: Add new TX queues to replace legacy TX [RFC,07/13] wifi: mac80211: Stop using legacy TX path [RFC,08/13] wifi: mac80211: Call ieee80211_tx_h_select_key only once [RFC,09/13] wifi: mac80211: Rename IEEE80211_TX_INTFL_OFFCHAN_TX_OK [RFC,10/13] wifi: mac80211: Simplify AMPDU handling [RFC,11/13] wifi: mac80211: Migrate TX to kthread [RFC,12/13] wifi: mac80211: Drop wake_txqs_tasklet [RFC,13/13] wifi: mac80211: Cleanup ieee80211_wake_txq naming

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index c61b95a928da..53df2a9102a7 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c @@ -4297,7 +4297,7 @@ struct ieee80211_txq *ath10k_mac_txq_lookup(struct ath10k *ar, if (peer->sta) return peer->sta->txq[tid]; else if (peer->vif) - return peer->vif->txq; + return peer->vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; else return NULL; } @@ -5539,7 +5539,7 @@ static int ath10k_add_interface(struct ieee80211_hw *hw, mutex_lock(&ar->conf_mutex); memset(arvif, 0, sizeof(*arvif)); - ath10k_mac_txq_init(vif->txq); + ath10k_mac_txq_init(vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); arvif->ar = ar; arvif->vif = vif; @@ -5985,7 +5985,7 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, spin_unlock_bh(&ar->data_lock); ath10k_peer_cleanup(ar, arvif->vdev_id); - ath10k_mac_txq_unref(ar, vif->txq); + ath10k_mac_txq_unref(ar, vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); if (vif->type == NL80211_IFTYPE_MONITOR) { ar->monitor_arvif = NULL; @@ -6002,7 +6002,7 @@ static void ath10k_remove_interface(struct ieee80211_hw *hw, ath10k_mac_vif_tx_unlock_all(arvif); spin_unlock_bh(&ar->htt.tx_lock); - ath10k_mac_txq_unref(ar, vif->txq); + ath10k_mac_txq_unref(ar, vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); out: mutex_unlock(&ar->conf_mutex); diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h index bcfc8df0efe5..9b58308ba08a 100644 --- a/drivers/net/wireless/ath/ath9k/ath9k.h +++ b/drivers/net/wireless/ath/ath9k/ath9k.h @@ -437,7 +437,7 @@ ath_node_to_tid(struct ath_node *an, u8 tidno) if (sta) txq = sta->txq[tidno % ARRAY_SIZE(sta->txq)]; else - txq = vif->txq; + txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; return (struct ath_atx_tid *) txq->drv_priv; } diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c index 07778d55878b..0906d714e680 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c @@ -1590,12 +1590,12 @@ int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw, } } else if (vif->type == NL80211_IFTYPE_AP && mvmvif->csa_blocks_tx) { struct iwl_mvm_txq *mvmtxq = - iwl_mvm_txq_from_mac80211(vif->txq); + iwl_mvm_txq_from_mac80211(vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); clear_bit(IWL_MVM_TXQ_STATE_STOP_AP_CSA, &mvmtxq->state); local_bh_disable(); - iwl_mvm_mac_itxq_xmit(hw, vif->txq); + iwl_mvm_mac_itxq_xmit(hw, vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); ieee80211_iterate_stations_atomic(hw, iwl_mvm_post_csa_tx, hw); local_bh_enable(); @@ -5722,7 +5722,7 @@ int iwl_mvm_pre_channel_switch(struct iwl_mvm *mvm, break; mvmvif->csa_blocks_tx = true; - mvmtxq = iwl_mvm_txq_from_mac80211(vif->txq); + mvmtxq = iwl_mvm_txq_from_mac80211(vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); set_bit(IWL_MVM_TXQ_STATE_STOP_AP_CSA, &mvmtxq->state); ieee80211_iterate_stations_atomic(mvm->hw, iwl_mvm_csa_block_txqs, diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/main.c b/drivers/net/wireless/mediatek/mt76/mt7603/main.c index 574f74ad325d..760a55f17f0e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7603/main.c @@ -35,6 +35,7 @@ mt7603_stop(struct ieee80211_hw *hw, bool suspend) static int mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { + struct ieee80211_txq *txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; struct mt7603_vif *mvif = (struct mt7603_vif *)vif->drv_priv; struct mt7603_dev *dev = hw->priv; struct mt76_txq *mtxq; @@ -75,7 +76,7 @@ mt7603_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) eth_broadcast_addr(bc_addr); mt7603_wtbl_init(dev, idx, mvif->idx, bc_addr); - mtxq = (struct mt76_txq *)vif->txq->drv_priv; + mtxq = (struct mt76_txq *)txq->drv_priv; mtxq->wcid = idx; rcu_assign_pointer(dev->mt76.wcid[idx], &mvif->sta.wcid); diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/main.c b/drivers/net/wireless/mediatek/mt76/mt7615/main.c index 376975388007..1f6207b124fb 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/main.c @@ -179,6 +179,7 @@ static int get_omac_idx(enum nl80211_iftype type, u64 mask) static int mt7615_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { + struct ieee80211_txq *txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; struct mt7615_vif *mvif = (struct mt7615_vif *)vif->drv_priv; struct mt7615_dev *dev = mt7615_hw_dev(hw); struct mt7615_phy *phy = mt7615_hw_phy(hw); @@ -232,8 +233,8 @@ static int mt7615_add_interface(struct ieee80211_hw *hw, MT_WTBL_UPDATE_ADM_COUNT_CLEAR); rcu_assign_pointer(dev->mt76.wcid[idx], &mvif->sta.wcid); - if (vif->txq) { - mtxq = (struct mt76_txq *)vif->txq->drv_priv; + if (txq) { + mtxq = (struct mt76_txq *)txq->drv_priv; mtxq->wcid = idx; } diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c index 8020446be37b..26d20fabf979 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_util.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_util.c @@ -280,6 +280,7 @@ static void mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif, unsigned int idx) { + struct ieee80211_txq *txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; struct mt76x02_vif *mvif = (struct mt76x02_vif *)vif->drv_priv; struct mt76_txq *mtxq; @@ -290,7 +291,7 @@ mt76x02_vif_init(struct mt76x02_dev *dev, struct ieee80211_vif *vif, mvif->group_wcid.hw_key_idx = -1; mt76_wcid_init(&mvif->group_wcid); - mtxq = (struct mt76_txq *)vif->txq->drv_priv; + mtxq = (struct mt76_txq *)txq->drv_priv; rcu_assign_pointer(dev->mt76.wcid[MT_VIF_WCID(idx)], &mvif->group_wcid); mtxq->wcid = MT_VIF_WCID(idx); } diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/main.c b/drivers/net/wireless/mediatek/mt76/mt7915/main.c index c6f498fc81ff..24577eed41ba 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/main.c @@ -204,6 +204,7 @@ static void mt7915_init_bitrate_mask(struct ieee80211_vif *vif) static int mt7915_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { + struct ieee80211_txq *txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; struct mt7915_vif *mvif = (struct mt7915_vif *)vif->drv_priv; struct mt7915_dev *dev = mt7915_hw_dev(hw); struct mt7915_phy *phy = mt7915_hw_phy(hw); @@ -259,9 +260,8 @@ static int mt7915_add_interface(struct ieee80211_hw *hw, mt7915_mac_wtbl_update(dev, idx, MT_WTBL_UPDATE_ADM_COUNT_CLEAR); - - if (vif->txq) { - mtxq = (struct mt76_txq *)vif->txq->drv_priv; + if (txq) { + mtxq = (struct mt76_txq *)txq->drv_priv; mtxq->wcid = idx; } diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/main.c b/drivers/net/wireless/mediatek/mt76/mt7921/main.c index a7f5bfbc02ed..3f6cff769561 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/main.c @@ -287,6 +287,7 @@ static void mt7921_stop(struct ieee80211_hw *hw, bool suspend) static int mt7921_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { + struct ieee80211_txq *txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; struct mt792x_vif *mvif = (struct mt792x_vif *)vif->drv_priv; struct mt792x_dev *dev = mt792x_hw_dev(hw); struct mt792x_phy *phy = mt792x_hw_phy(hw); @@ -330,8 +331,8 @@ mt7921_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) ewma_rssi_init(&mvif->bss_conf.rssi); rcu_assign_pointer(dev->mt76.wcid[idx], &mvif->sta.deflink.wcid); - if (vif->txq) { - mtxq = (struct mt76_txq *)vif->txq->drv_priv; + if (txq) { + mtxq = (struct mt76_txq *)txq->drv_priv; mtxq->wcid = idx; } diff --git a/drivers/net/wireless/mediatek/mt76/mt7925/main.c b/drivers/net/wireless/mediatek/mt76/mt7925/main.c index 791c8b00e112..6636961754ea 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7925/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7925/main.c @@ -352,6 +352,7 @@ static int mt7925_mac_link_bss_add(struct mt792x_dev *dev, { struct mt792x_bss_conf *mconf = mt792x_link_conf_to_mconf(link_conf); struct ieee80211_vif *vif = link_conf->vif; + struct ieee80211_txq *txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; struct mt792x_vif *mvif = mconf->vif; struct mt76_txq *mtxq; int idx, ret = 0; @@ -395,8 +396,8 @@ static int mt7925_mac_link_bss_add(struct mt792x_dev *dev, ewma_rssi_init(&mconf->rssi); rcu_assign_pointer(dev->mt76.wcid[idx], &mlink->wcid); - if (vif->txq) { - mtxq = (struct mt76_txq *)vif->txq->drv_priv; + if (txq) { + mtxq = (struct mt76_txq *)txq->drv_priv; mtxq->wcid = idx; } diff --git a/drivers/net/wireless/mediatek/mt76/mt7996/main.c b/drivers/net/wireless/mediatek/mt76/mt7996/main.c index 2b34ae5e0cb5..def6185710eb 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7996/main.c +++ b/drivers/net/wireless/mediatek/mt76/mt7996/main.c @@ -179,6 +179,7 @@ static void mt7996_init_bitrate_mask(struct ieee80211_vif *vif) static int mt7996_add_interface(struct ieee80211_hw *hw, struct ieee80211_vif *vif) { + struct ieee80211_txq *txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; struct mt7996_vif *mvif = (struct mt7996_vif *)vif->drv_priv; struct mt7996_dev *dev = mt7996_hw_dev(hw); struct mt7996_phy *phy = mt7996_hw_phy(hw); @@ -228,8 +229,8 @@ static int mt7996_add_interface(struct ieee80211_hw *hw, mt7996_mac_wtbl_update(dev, idx, MT_WTBL_UPDATE_ADM_COUNT_CLEAR); - if (vif->txq) { - mtxq = (struct mt76_txq *)vif->txq->drv_priv; + if (txq) { + mtxq = (struct mt76_txq *)txq->drv_priv; mtxq->wcid = idx; } diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c index 026fbf4ad9cc..f689e37c4f7d 100644 --- a/drivers/net/wireless/realtek/rtw88/mac80211.c +++ b/drivers/net/wireless/realtek/rtw88/mac80211.c @@ -162,7 +162,7 @@ static int rtw_ops_add_interface(struct ieee80211_hw *hw, rtwvif->stats.rx_cnt = 0; rtwvif->scan_req = NULL; memset(&rtwvif->bfee, 0, sizeof(struct rtw_bfee)); - rtw_txq_init(rtwdev, vif->txq); + rtw_txq_init(rtwdev, vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); INIT_LIST_HEAD(&rtwvif->rsvd_page_list); mutex_lock(&rtwdev->mutex); @@ -239,7 +239,7 @@ static void rtw_ops_remove_interface(struct ieee80211_hw *hw, rtw_leave_lps_deep(rtwdev); - rtw_txq_cleanup(rtwdev, vif->txq); + rtw_txq_cleanup(rtwdev, vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); rtw_remove_rsvd_page(rtwdev, rtwvif); eth_zero_addr(rtwvif->mac_addr); diff --git a/drivers/net/wireless/realtek/rtw88/main.c b/drivers/net/wireless/realtek/rtw88/main.c index e91530ed05a0..c58c29c7e917 100644 --- a/drivers/net/wireless/realtek/rtw88/main.c +++ b/drivers/net/wireless/realtek/rtw88/main.c @@ -625,7 +625,7 @@ static void rtw_reset_vif_iter(void *data, u8 *mac, struct ieee80211_vif *vif) rtw_bf_disassoc(rtwdev, vif, NULL); rtw_vif_assoc_changed(rtwvif, NULL); - rtw_txq_cleanup(rtwdev, vif->txq); + rtw_txq_cleanup(rtwdev, vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); rtw_release_macid(rtwdev, rtwvif->mac_id); } diff --git a/drivers/net/wireless/realtek/rtw89/mac80211.c b/drivers/net/wireless/realtek/rtw89/mac80211.c index 5eac0b524060..f1f485d58179 100644 --- a/drivers/net/wireless/realtek/rtw89/mac80211.c +++ b/drivers/net/wireless/realtek/rtw89/mac80211.c @@ -187,7 +187,7 @@ static int rtw89_ops_add_interface(struct ieee80211_hw *hw, rtw89_init_vif(rtwdev, rtwvif, mac_id, port); - rtw89_core_txq_init(rtwdev, vif->txq); + rtw89_core_txq_init(rtwdev, vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); if (!rtw89_rtwvif_in_list(rtwdev, rtwvif)) list_add_tail(&rtwvif->list, &rtwdev->rtwvifs_list); diff --git a/include/net/mac80211.h b/include/net/mac80211.h index 9320d4bc22ee..c3cd62dc63e0 100644 --- a/include/net/mac80211.h +++ b/include/net/mac80211.h @@ -1961,6 +1961,16 @@ enum ieee80211_neg_ttlm_res { NEG_TTLM_RES_SUGGEST_PREFERRED }; +/** + * enum ieee80211_vif_txq - per-vif intermediate queues (txqi) + * + * @IEEE80211_VIF_TXQ_MULTICAST: queue for broadcast/multicast data frames. + */ +enum ieee80211_vif_txq { + IEEE80211_VIF_TXQ_MULTICAST, + IEEE80211_VIF_TXQ_NUM, +}; + /** * struct ieee80211_vif - per-interface data * @@ -2015,7 +2025,7 @@ enum ieee80211_neg_ttlm_res { * for this interface. * @drv_priv: data area for driver use, will always be aligned to * sizeof(void \*). - * @txq: the multicast data TX queue + * @txq: per-vif iTXQs (see enum ieee80211_vif_txq for available queues) * @offload_flags: 802.3 -> 802.11 enapsulation offload flags, see * &enum ieee80211_offload_flags. * @mbssid_tx_vif: Pointer to the transmitting interface if MBSSID is enabled. @@ -2034,7 +2044,7 @@ struct ieee80211_vif { u8 cab_queue; u8 hw_queue[IEEE80211_NUM_ACS]; - struct ieee80211_txq *txq; + struct ieee80211_txq *txq[IEEE80211_VIF_TXQ_NUM]; netdev_features_t netdev_features; u32 driver_flags; diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index fbdd6b46b154..f4d1159e7da7 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -4631,12 +4631,16 @@ static int ieee80211_get_txq_stats(struct wiphy *wiphy, rcu_read_lock(); if (wdev) { + struct ieee80211_txq *txq; + sdata = IEEE80211_WDEV_TO_SUB_IF(wdev); - if (!sdata->vif.txq) { + txq = sdata->vif.txq[IEEE80211_VIF_TXQ_MULTICAST]; + + if (!txq) { ret = 1; goto out; } - ieee80211_fill_txq_stats(txqstats, to_txq_info(sdata->vif.txq)); + ieee80211_fill_txq_stats(txqstats, to_txq_info(txq)); } else { /* phy stats */ txqstats->filled |= BIT(NL80211_TXQ_STATS_BACKLOG_PACKETS) | diff --git a/net/mac80211/debugfs_netdev.c b/net/mac80211/debugfs_netdev.c index a9bc2fd59f55..e3541e29b879 100644 --- a/net/mac80211/debugfs_netdev.c +++ b/net/mac80211/debugfs_netdev.c @@ -619,10 +619,10 @@ static ssize_t ieee80211_if_fmt_aqm( struct txq_info *txqi; int len; - if (!sdata->vif.txq) + if (!sdata->vif.txq[IEEE80211_VIF_TXQ_MULTICAST]) return 0; - txqi = to_txq_info(sdata->vif.txq); + txqi = to_txq_info(sdata->vif.txq[IEEE80211_VIF_TXQ_MULTICAST]); spin_lock_bh(&local->fq.lock); rcu_read_lock(); diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 1a2b682c452c..6b29bcc40a88 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c @@ -2239,6 +2239,8 @@ int ieee80211_if_add(struct ieee80211_local *local, const char *name, void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) { + struct ieee80211_txq *txq = sdata->vif.txq[IEEE80211_VIF_TXQ_MULTICAST]; + ASSERT_RTNL(); lockdep_assert_wiphy(sdata->local->hw.wiphy); @@ -2246,8 +2248,8 @@ void ieee80211_if_remove(struct ieee80211_sub_if_data *sdata) list_del_rcu(&sdata->list); mutex_unlock(&sdata->local->iflist_mtx); - if (sdata->vif.txq) - ieee80211_txq_purge(sdata->local, to_txq_info(sdata->vif.txq)); + if (txq) + ieee80211_txq_purge(sdata->local, to_txq_info(txq)); synchronize_rcu(); diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 7b6ae03e421f..581b3d97e278 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -1320,7 +1320,7 @@ static struct txq_info *ieee80211_get_txq(struct ieee80211_local *local, txq = sta->sta.txq[tid]; } else { - txq = vif->txq; + txq = vif->txq[IEEE80211_VIF_TXQ_MULTICAST]; } if (!txq) @@ -1484,10 +1484,10 @@ void ieee80211_txq_remove_vlan(struct ieee80211_local *local, ap = container_of(sdata->bss, struct ieee80211_sub_if_data, u.ap); - if (!ap->vif.txq) + if (!ap->vif.txq[IEEE80211_VIF_TXQ_MULTICAST]) return; - txqi = to_txq_info(ap->vif.txq); + txqi = to_txq_info(ap->vif.txq[IEEE80211_VIF_TXQ_MULTICAST]); tin = &txqi->tin; spin_lock_bh(&fq->lock); @@ -1509,7 +1509,7 @@ void ieee80211_txq_init(struct ieee80211_sub_if_data *sdata, txqi->txq.vif = &sdata->vif; if (!sta) { - sdata->vif.txq = &txqi->txq; + sdata->vif.txq[IEEE80211_VIF_TXQ_MULTICAST] = &txqi->txq; txqi->txq.tid = 0; txqi->txq.ac = IEEE80211_AC_BE; diff --git a/net/mac80211/util.c b/net/mac80211/util.c index 4fdac50cda67..b65e08de0a00 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -364,13 +364,14 @@ static void __ieee80211_wake_txqs(struct ieee80211_sub_if_data *sdata, int ac) } } - if (!vif->txq) + if (!vif->txq[IEEE80211_VIF_TXQ_MULTICAST]) goto out; - txqi = to_txq_info(vif->txq); + txqi = to_txq_info(vif->txq[IEEE80211_VIF_TXQ_MULTICAST]); if (!test_and_clear_bit(IEEE80211_TXQ_DIRTY, &txqi->flags) || - (ps && atomic_read(&ps->num_sta_ps)) || ac != vif->txq->ac) + (ps && atomic_read(&ps->num_sta_ps)) || + ac != vif->txq[IEEE80211_VIF_TXQ_MULTICAST]->ac) goto out; spin_unlock(&fq->lock);

[RFC,05/13] wifi: mac80211: Convert vif->txq to an array

Commit Message

Patch