Message ID | 20200529061722.2384656-3-vicamo.yang@canonical.com |
---|---|
State | New |
Headers | show |
Series | UBUNTU: SAUCE: Fix Realtek 8723DE disconnects unsolicitedly when Bluetooth is paired: Reason: 23=IEEE8021X_FAILED | expand |
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 ceaeb03f0d5d..d019ed9a517f 100644 --- a/drivers/net/wireless/realtek/rtw88/main.h +++ b/drivers/net/wireless/realtek/rtw88/main.h @@ -1778,8 +1778,6 @@ struct rtw_dev { struct rtw_sar sar; - u32 fix_rate_count; - /* hci related data, must be last */ u8 priv[] __aligned(sizeof(void *)); }; diff --git a/drivers/net/wireless/realtek/rtw88/tx.c b/drivers/net/wireless/realtek/rtw88/tx.c index ba276e75eafe..793f66f425b5 100644 --- a/drivers/net/wireless/realtek/rtw88/tx.c +++ b/drivers/net/wireless/realtek/rtw88/tx.c @@ -378,11 +378,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, sta, 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);
BugLink: https://bugs.launchpad.net/bugs/1878147 This reverts commit 81e140747beda1a9edbadbc6cf7a9ad7788d2f9f. 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(-)