diff options
Diffstat (limited to 'drivers/net/wireless/rtlwifi/rtl8188ee/dm.c')
-rw-r--r-- | drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c index a6184b6e1d57..f8daa61cf1c3 100644 --- a/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c +++ b/drivers/net/wireless/rtlwifi/rtl8188ee/dm.c | |||
@@ -235,7 +235,7 @@ void rtl88e_dm_txpower_track_adjust(struct ieee80211_hw *hw, | |||
235 | u8 pwr_val = 0; | 235 | u8 pwr_val = 0; |
236 | u8 cck_base = rtldm->swing_idx_cck_base; | 236 | u8 cck_base = rtldm->swing_idx_cck_base; |
237 | u8 cck_val = rtldm->swing_idx_cck; | 237 | u8 cck_val = rtldm->swing_idx_cck; |
238 | u8 ofdm_base = rtldm->swing_idx_ofdm_base; | 238 | u8 ofdm_base = rtldm->swing_idx_ofdm_base[0]; |
239 | u8 ofdm_val = rtlpriv->dm.swing_idx_ofdm[RF90_PATH_A]; | 239 | u8 ofdm_val = rtlpriv->dm.swing_idx_ofdm[RF90_PATH_A]; |
240 | 240 | ||
241 | if (type == 0) { | 241 | if (type == 0) { |
@@ -726,7 +726,7 @@ static void rtl88e_dm_pwdb_monitor(struct ieee80211_hw *hw) | |||
726 | static u64 last_rx; | 726 | static u64 last_rx; |
727 | long tmp_entry_max_pwdb = 0, tmp_entry_min_pwdb = 0xff; | 727 | long tmp_entry_max_pwdb = 0, tmp_entry_min_pwdb = 0xff; |
728 | 728 | ||
729 | if (rtlhal->oem_id == RT_CID_819x_HP) { | 729 | if (rtlhal->oem_id == RT_CID_819X_HP) { |
730 | u64 cur_txok_cnt = 0; | 730 | u64 cur_txok_cnt = 0; |
731 | u64 cur_rxok_cnt = 0; | 731 | u64 cur_rxok_cnt = 0; |
732 | cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok; | 732 | cur_txok_cnt = rtlpriv->stats.txbytesunicast - last_txok; |
@@ -851,9 +851,8 @@ static void rtl88e_dm_check_edca_turbo(struct ieee80211_hw *hw) | |||
851 | } else { | 851 | } else { |
852 | if (rtlpriv->dm.current_turbo_edca) { | 852 | if (rtlpriv->dm.current_turbo_edca) { |
853 | u8 tmp = AC0_BE; | 853 | u8 tmp = AC0_BE; |
854 | rtlpriv->cfg->ops->set_hw_reg(hw, | 854 | rtlpriv->cfg->ops->set_hw_reg(hw, HW_VAR_AC_PARAM, |
855 | HW_VAR_AC_PARAM, | 855 | &tmp); |
856 | (u8 *)(&tmp)); | ||
857 | rtlpriv->dm.current_turbo_edca = false; | 856 | rtlpriv->dm.current_turbo_edca = false; |
858 | } | 857 | } |
859 | } | 858 | } |
@@ -912,7 +911,7 @@ static void rtl88e_dm_txpower_tracking_callback_thermalmeter(struct ieee80211_hw | |||
912 | for (i = 0; i < OFDM_TABLE_LENGTH; i++) { | 911 | for (i = 0; i < OFDM_TABLE_LENGTH; i++) { |
913 | if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) { | 912 | if (ele_d == (ofdmswing_table[i] & MASKOFDM_D)) { |
914 | ofdm_old[0] = (u8) i; | 913 | ofdm_old[0] = (u8) i; |
915 | rtldm->swing_idx_ofdm_base = (u8)i; | 914 | rtldm->swing_idx_ofdm_base[0] = (u8)i; |
916 | RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, | 915 | RT_TRACE(rtlpriv, COMP_POWER_TRACKING, DBG_LOUD, |
917 | "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index = 0x%x\n", | 916 | "Initial pathA ele_d reg0x%x = 0x%lx, ofdm_index = 0x%x\n", |
918 | ROFDM0_XATXIQIMBAL, | 917 | ROFDM0_XATXIQIMBAL, |