[PATCH 3/8][SRU][U] UBUNTU: SAUCE: Revert "UBUNTU: SAUCE: rtw88: No retry and report for auth and assoc"

[You-Sheng Yang]

BugLink: https://bugs.launchpad.net/bugs/1878147

This reverts commit ef1933c0420f72a60c78d693c8e8234ded981dc7.

Signed-off-by: You-Sheng Yang <vicamo.yang at canonical.com>
---
 drivers/net/wireless/realtek/rtw88/main.h |  1 -
 drivers/net/wireless/realtek/rtw88/tx.c   | 10 ----------
 drivers/net/wireless/realtek/rtw88/tx.h   |  5 -----
 3 files changed, 16 deletions(-)

diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index d019ed9a517f..bfb0487cab00 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -612,7 +612,6 @@ struct rtw_tx_pkt_info {
 	u8 hw_ssn_sel;
 	bool en_hw_exseq;
 	bool bt_null;
-	bool no_retry;
 };
 
 struct rtw_rx_pkt_stat {
diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c
index 793f66f425b5..8789ca437349 100644
--- a/drivers/net/wireless/realtek/rtw88/tx.c
+++ b/drivers/net/wireless/realtek/rtw88/tx.c
@@ -64,11 +64,6 @@ void rtw_tx_fill_tx_desc(struct rtw_tx_pkt_info *pkt_info, struct sk_buff *skb)
 	SET_TX_DESC_EN_HWEXSEQ(txdesc, pkt_info->en_hw_exseq);
 	SET_TX_DESC_HW_SSN_SEL(txdesc, pkt_info->hw_ssn_sel);
 	SET_TX_DESC_BT_NULL(txdesc, pkt_info->bt_null);
-
-	if (pkt_info->no_retry) {
-		SET_TX_DESC_RETRY_LIMIT_ENABLE(txdesc, 1);
-		SET_TX_DESC_DATA_RETRY_LIMIT(txdesc, 0);
-	}
 }
 EXPORT_SYMBOL(rtw_tx_fill_tx_desc);
 
@@ -381,11 +376,6 @@ void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev,
 	bmc = is_broadcast_ether_addr(hdr->addr1) ||
 	      is_multicast_ether_addr(hdr->addr1);
 
-	if (info->flags & IEEE80211_TX_INTFL_MLME_CONN_TX) {
-		info->flags &= ~IEEE80211_TX_CTL_REQ_TX_STATUS;	// no report
-		pkt_info->no_retry = true;	// don't re-tx
-	}
-
 	if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)
 		rtw_tx_report_enable(rtwdev, pkt_info);
 
diff --git a/drivers/net/wireless/realtek/rtw88/tx.h b/drivers/net/wireless/realtek/rtw88/tx.h
index eb245b4368c4..9dce62a0141c 100644
--- a/drivers/net/wireless/realtek/rtw88/tx.h
+++ b/drivers/net/wireless/realtek/rtw88/tx.h
@@ -65,11 +65,6 @@
 	le32p_replace_bits((__le32 *)(txdesc) + 0x03, value, GENMASK(7, 6))
 #define SET_TX_DESC_BT_NULL(txdesc, value)				       \
 	le32p_replace_bits((__le32 *)(txdesc) + 0x02, value, BIT(23))
-#define SET_TX_DESC_RETRY_LIMIT_ENABLE(txdesc, value)			       \
-	le32p_replace_bits((__le32 *)(txdesc) + 0x04, value, BIT(17))
-#define SET_TX_DESC_DATA_RETRY_LIMIT(txdesc, value)			       \
-	le32p_replace_bits((__le32 *)(txdesc) + 0x04, value, GENMASK(23, 18))
-
 
 enum rtw_tx_desc_queue_select {
 	TX_DESC_QSEL_TID0	= 0,
-- 
2.25.1