Injected management frames currently overwrite caller-supplied sequence numbers because hardware sequence numbering remains enabled when IEEE80211_TX_CTL_ASSIGN_SEQ is unset, and injected frames ignore NO_ACK and explicit radiotap retry limits. Preserve the caller's sequence number when IEEE80211_TX_CTL_ASSIGN_SEQ is not set, apply NO_ACK in TX descriptors and completion status, and honor radiotap retry counts up to RTW89_TX_DATA_CNT_LMT_MAX (63). Signed-off-by: Enver Ikromov --- drivers/net/wireless/realtek/rtw89/core.c | 19 ++++++++++++++++++- drivers/net/wireless/realtek/rtw89/core.h | 2 ++ drivers/net/wireless/realtek/rtw89/mac.h | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/drivers/net/wireless/realtek/rtw89/core.c b/drivers/net/wireless/realtek/rtw89/core.c index e599058..712c10a 100644 --- a/drivers/net/wireless/realtek/rtw89/core.c +++ b/drivers/net/wireless/realtek/rtw89/core.c @@ -1265,6 +1265,20 @@ static void rtw89_core_tx_update_injection(struct rtw89_dev *rtwdev, desc_info->use_rate = true; desc_info->dis_data_fb = true; + if (!(info->flags & IEEE80211_TX_CTL_ASSIGN_SEQ)) { + desc_info->hw_ssn_sel = 0; + desc_info->hw_seq_mode = 0; + } + + if (info->flags & IEEE80211_TX_CTL_NO_ACK) { + desc_info->no_ack = true; + desc_info->tx_cnt_lmt_en = true; + desc_info->tx_cnt_lmt = 1; + } else if (info->control.rates[0].count) { + desc_info->tx_cnt_lmt_en = true; + desc_info->tx_cnt_lmt = info->control.rates[0].count; + } + if (flags & IEEE80211_TX_RC_160_MHZ_WIDTH) desc_info->data_bw = 3; else if (flags & IEEE80211_TX_RC_80_MHZ_WIDTH) @@ -1800,7 +1814,9 @@ static __le32 rtw89_build_txwd_body5_v2(struct rtw89_tx_desc_info *desc_info) static __le32 rtw89_build_txwd_body6_v2(struct rtw89_tx_desc_info *desc_info) { - u32 dword = FIELD_PREP(BE_TXD_BODY6_UPD_WLAN_HDR, desc_info->upd_wlan_hdr); + u32 dword = FIELD_PREP(BE_TXD_BODY6_NO_ACK, desc_info->no_ack) | + FIELD_PREP(BE_TXD_BODY6_UPD_WLAN_HDR, + desc_info->upd_wlan_hdr); return cpu_to_le32(dword); } @@ -7540,6 +7556,7 @@ static int rtw89_core_register_hw(struct rtw89_dev *rtwdev) hw->queues = IEEE80211_NUM_ACS; hw->max_rx_aggregation_subframes = chip->max_rx_agg_num; hw->max_tx_aggregation_subframes = chip->max_tx_agg_num; + hw->max_rate_tries = RTW89_TX_DATA_CNT_LMT_MAX; hw->uapsd_max_sp_len = IEEE80211_WMM_IE_STA_QOSINFO_SP_ALL; hw->radiotap_mcs_details |= IEEE80211_RADIOTAP_MCS_HAVE_FEC | diff --git a/drivers/net/wireless/realtek/rtw89/core.h b/drivers/net/wireless/realtek/rtw89/core.h index 780ec47..3065e11 100644 --- a/drivers/net/wireless/realtek/rtw89/core.h +++ b/drivers/net/wireless/realtek/rtw89/core.h @@ -1278,6 +1278,7 @@ struct rtw89_tx_desc_info { bool tx_cnt_lmt_en; u8 sn: 4; u8 tx_cnt_lmt: 6; +#define RTW89_TX_DATA_CNT_LMT_MAX 0x3f u8 addr_info_nr; u8 sec_keyid; u8 sec_type; @@ -1300,6 +1301,7 @@ struct rtw89_tx_desc_info { bool stbc; bool ldpc; bool upd_wlan_hdr; + bool no_ack; bool mlo; bool sw_mld; }; diff --git a/drivers/net/wireless/realtek/rtw89/mac.h b/drivers/net/wireless/realtek/rtw89/mac.h index 2e76bb1..c94b34b 100644 --- a/drivers/net/wireless/realtek/rtw89/mac.h +++ b/drivers/net/wireless/realtek/rtw89/mac.h @@ -1896,6 +1896,8 @@ void rtw89_tx_rpt_tx_status(struct rtw89_dev *rtwdev, struct sk_buff *skb, info = IEEE80211_SKB_CB(skb); ieee80211_tx_info_clear_status(info); + if (info->flags & IEEE80211_TX_CTL_NO_ACK) + info->flags |= IEEE80211_TX_STAT_NOACK_TRANSMITTED; if (tx_status == RTW89_TX_DONE) info->flags |= IEEE80211_TX_STAT_ACK; else -- 2.56.0.windows.4