diff mbox series

[02/10,SRU,F/OEM-5.6] UBUNTU: SAUCE: Revert "UBUNTU: SAUCE: rtw88: fix rate for a while after being connected"

Message ID 20200529061758.2385086-3-vicamo.yang@canonical.com
State New
Headers show
Series Fix Realtek 8723DE disconnects unsolicitedly when Bluetooth is paired: Reason: 23=IEEE8021X_FAILED | expand

Commit Message

You-Sheng Yang May 29, 2020, 6:17 a.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/1878147

This reverts commit d64c5d41beaa13088c0672106ac94bed028e3713.

Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com>
---
 drivers/net/wireless/realtek/rtw88/mac80211.c | 4 ----
 drivers/net/wireless/realtek/rtw88/main.h     | 2 --
 drivers/net/wireless/realtek/rtw88/tx.c       | 5 -----
 3 files changed, 11 deletions(-)
diff mbox series

Patch

diff --git a/drivers/net/wireless/realtek/rtw88/mac80211.c b/drivers/net/wireless/realtek/rtw88/mac80211.c
index 3c6ae6e6cf51..f92515039e96 100644
--- a/drivers/net/wireless/realtek/rtw88/mac80211.c
+++ b/drivers/net/wireless/realtek/rtw88/mac80211.c
@@ -355,15 +355,11 @@  static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
 			rtw_coex_media_status_notify(rtwdev, conf->assoc);
 			if (rtw_bf_support)
 				rtw_bf_assoc(rtwdev, vif, conf);
-
-			rtwdev->fix_rate_count = 20;
 		} else {
 			rtw_leave_lps(rtwdev);
 			net_type = RTW_NET_NO_LINK;
 			rtwvif->aid = 0;
 			rtw_bf_disassoc(rtwdev, vif, conf);
-
-			rtwdev->fix_rate_count = 0;
 		}
 
 		rtwvif->net_type = net_type;
diff --git a/drivers/net/wireless/realtek/rtw88/main.h b/drivers/net/wireless/realtek/rtw88/main.h
index 021fdb41ff4d..f311adeb4853 100644
--- a/drivers/net/wireless/realtek/rtw88/main.h
+++ b/drivers/net/wireless/realtek/rtw88/main.h
@@ -1761,8 +1761,6 @@  struct rtw_dev {
 
 	struct rtw_sar sar;
 
-	u32 fix_rate_count;
-
 	/* hci related data, must be last */
 	u8 priv[0] __aligned(sizeof(void *));
 };
diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c
index 794d134d2dfe..88c57fe46857 100644
--- a/drivers/net/wireless/realtek/rtw88/tx.c
+++ b/drivers/net/wireless/realtek/rtw88/tx.c
@@ -376,11 +376,6 @@  void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev,
 	else if (ieee80211_is_data(fc))
 		rtw_tx_data_pkt_info_update(rtwdev, pkt_info, control, skb);
 
-	if (rtwdev->fix_rate_count) {
-		rtwdev->fix_rate_count--;
-		rtw_tx_pkt_info_update_rate(rtwdev, pkt_info, skb);
-	}
-
 	bmc = is_broadcast_ether_addr(hdr->addr1) ||
 	      is_multicast_ether_addr(hdr->addr1);