@@ -347,8 +347,7 @@ static void rtw_ops_bss_info_changed(struct ieee80211_hw *hw,
if (conf->assoc) {
rtw_coex_connect_notify(rtwdev, COEX_ASSOCIATE_FINISH);
net_type = RTW_NET_MGD_LINKED;
- if (!rtw_chip_wcpu_11n(rtwdev))
- chip->ops->phy_calibration(rtwdev);
+ chip->ops->phy_calibration(rtwdev);
rtwvif->aid = conf->aid;
rtw_fw_download_rsvd_page(rtwdev);
@@ -410,16 +410,6 @@ void rtw_set_channel(struct rtw_dev *rtwdev)
}
rtw_phy_set_tx_power_level(rtwdev, center_chan);
-
- /* 11N chip uses driver IQK that takes lot of time, so move here
- * to avoid interferencing 4 way handshake.
- */
- if (rtw_chip_wcpu_11n(rtwdev) &&
- !(hw->conf.flags & IEEE80211_CONF_IDLE) &&
- !test_bit(RTW_FLAG_SCANNING, rtwdev->flags) &&
- !test_bit(RTW_FLAG_INACTIVE_PS, rtwdev->flags)) {
- rtwdev->need_rfk = true;
- }
}
static void rtw_vif_write_addr(struct rtw_dev *rtwdev, u32 start, u8 *addr)
@@ -1762,7 +1762,6 @@ struct rtw_dev {
struct rtw_sar sar;
u32 fix_rate_count;
- bool need_rfk;
/* hci related data, must be last */
u8 priv[0] __aligned(sizeof(void *));
@@ -387,11 +387,6 @@ void rtw_tx_pkt_info_update(struct rtw_dev *rtwdev,
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 (rtwdev->need_rfk) {
- rtwdev->need_rfk = false;
- chip->ops->phy_calibration(rtwdev);
- }
}
if (info->flags & IEEE80211_TX_CTL_REQ_TX_STATUS)
BugLink: https://bugs.launchpad.net/bugs/1878147 This reverts commit aec633f49dce4ec5c4ce4cf6683d5d174d1f9ad8. Signed-off-by: You-Sheng Yang <vicamo.yang@canonical.com> --- drivers/net/wireless/realtek/rtw88/mac80211.c | 3 +-- drivers/net/wireless/realtek/rtw88/main.c | 10 ---------- drivers/net/wireless/realtek/rtw88/main.h | 1 - drivers/net/wireless/realtek/rtw88/tx.c | 5 ----- 4 files changed, 1 insertion(+), 18 deletions(-)