rtw89: send broadcast/multicast packets via HIQ if STAs are in sleep mode

If a packet we are going to send is broadcast/multicast and certain STAs
are in sleep mode, a flag IEEE80211_TX_CTL_SEND_AFTER_DTIM is added to
txinfo. Then, this kind of packets must be sent via HIQ instead of regular
AC queues, because they should be sent right after beacon.

Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://lore.kernel.org/r/20220107034239.22002-11-pkshih@realtek.com

diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c
index 107e2b9..1b15a3f 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.c
+++ b/drivers/net/wireless/realtek/rtw89/core.c
@@ -380,10 +380,10 @@ rtw89_core_tx_update_mgmt_info(struct rtw89_dev *rtwdev,
        struct rtw89_tx_desc_info *desc_info = &tx_req->desc_info;
        u8 qsel, ch_dma;
 
-       qsel = RTW89_TX_QSEL_B0_MGMT;
+       qsel = desc_info->hiq ? RTW89_TX_QSEL_B0_HI : RTW89_TX_QSEL_B0_MGMT;
        ch_dma = rtw89_core_get_ch_dma(rtwdev, qsel);
 
-       desc_info->qsel = RTW89_TX_QSEL_B0_MGMT;
+       desc_info->qsel = qsel;
        desc_info->ch_dma = ch_dma;
        desc_info->hw_ssn_sel = RTW89_MGMT_HW_SSN_SEL;
        desc_info->hw_seq_mode = RTW89_MGMT_HW_SEQ_MODE;
@@ -537,7 +537,7 @@ rtw89_core_tx_update_data_info(struct rtw89_dev *rtwdev,
 
        tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
        tid_indicate = rtw89_core_get_tid_indicate(rtwdev, tid);
-       qsel = rtw89_core_get_qsel(rtwdev, tid);
+       qsel = desc_info->hiq ? RTW89_TX_QSEL_B0_HI : rtw89_core_get_qsel(rtwdev, tid);
        ch_dma = rtw89_core_get_ch_dma(rtwdev, qsel);
 
        desc_info->ch_dma = ch_dma;
@@ -603,6 +603,7 @@ rtw89_core_tx_update_desc_info(struct rtw89_dev *rtwdev,
 {
        struct rtw89_tx_desc_info *desc_info = &tx_req->desc_info;
        struct sk_buff *skb = tx_req->skb;
+       struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
        struct ieee80211_hdr *hdr = (void *)skb->data;
        enum rtw89_core_tx_type tx_type;
        enum btc_pkt_type pkt_type;
@@ -621,6 +622,7 @@ rtw89_core_tx_update_desc_info(struct rtw89_dev *rtwdev,
        desc_info->pkt_size = skb->len;
        desc_info->is_bmc = is_bmc;
        desc_info->wd_page = true;
+       desc_info->hiq = info->flags & IEEE80211_TX_CTL_SEND_AFTER_DTIM;
 
        switch (tx_req->tx_type) {
        case RTW89_CORE_TX_TYPE_MGMT:

diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h
index 202c78a..179dbee 100644 (file)
--- a/drivers/net/wireless/realtek/rtw89/core.h
+++ b/drivers/net/wireless/realtek/rtw89/core.h
@@ -690,6 +690,7 @@ struct rtw89_tx_desc_info {
 #define RTW89_MGMT_HW_SSN_SEL  1
        u8 hw_seq_mode;
 #define RTW89_MGMT_HW_SEQ_MODE 1
+       bool hiq;
 };
 
 struct rtw89_core_tx_request {