diff options
Diffstat (limited to 'drivers/staging/rtlwifi/phydm/phydm_dig.c')
-rw-r--r-- | drivers/staging/rtlwifi/phydm/phydm_dig.c | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/drivers/staging/rtlwifi/phydm/phydm_dig.c b/drivers/staging/rtlwifi/phydm/phydm_dig.c index 31a4f3fcad19..f851ff12dc35 100644 --- a/drivers/staging/rtlwifi/phydm/phydm_dig.c +++ b/drivers/staging/rtlwifi/phydm/phydm_dig.c @@ -198,7 +198,7 @@ static u8 odm_forbidden_igi_check(void *dm_void, u8 dig_dynamic_min, if ((fa_cnt->cnt_all > (fa_cnt->cnt_all_pre + (fa_cnt->cnt_all_pre >> 3) + (fa_cnt->cnt_all_pre >> 4))) && - (current_igi < dig_tab->pre_ig_value)) { + current_igi < dig_tab->pre_ig_value) { if (dig_tab->large_fa_hit != 3) dig_tab->large_fa_hit++; @@ -319,7 +319,7 @@ void odm_write_dig(void *dm_void, u8 current_igi) __func__, ODM_REG(IGI_A, dm), ODM_BIT(IGI, dm)); /* 1 Check initial gain by upper bound */ - if ((!dig_tab->is_psd_in_progress) && dm->is_linked) { + if (!dig_tab->is_psd_in_progress && dm->is_linked) { if (current_igi > dig_tab->rx_gain_range_max) { ODM_RT_TRACE( dm, ODM_COMP_DIG, @@ -353,7 +353,7 @@ void odm_write_dig(void *dm_void, u8 current_igi) /*Add by YuChen for USB IO too slow issue*/ if ((dm->support_ability & ODM_BB_ADAPTIVITY) && - (current_igi > dig_tab->cur_ig_value)) { + current_igi > dig_tab->cur_ig_value) { dig_tab->cur_ig_value = current_igi; phydm_adaptivity(dm); } @@ -388,7 +388,7 @@ void odm_pause_dig(void *dm_void, enum phydm_pause_type pause_type, ODM_RT_TRACE(dm, ODM_COMP_DIG, "%s()=========> level = %d\n", __func__, pause_level); - if ((dig_tab->pause_dig_level == 0) && + if (dig_tab->pause_dig_level == 0 && (!(dm->support_ability & ODM_BB_DIG) || !(dm->support_ability & ODM_BB_FA_CNT))) { ODM_RT_TRACE( @@ -490,6 +490,8 @@ void odm_pause_dig(void *dm_void, enum phydm_pause_type pause_type, break; } + /* pin max_level to be >= 0 */ + max_level = max_t(s8, 0, max_level); /* write IGI of lower level */ odm_write_dig(dm, dig_tab->pause_dig_value[max_level]); ODM_RT_TRACE(dm, ODM_COMP_DIG, @@ -718,7 +720,7 @@ void odm_DIG(void *dm_void) /* 4 Modify DIG upper bound for 92E, 8723A\B, 8821 & 8812 BT */ if ((dm->support_ic_type & (ODM_RTL8192E | ODM_RTL8723B | ODM_RTL8812 | ODM_RTL8821)) && - (dm->is_bt_limited_dig == 1)) { + dm->is_bt_limited_dig == 1) { offset = 10; ODM_RT_TRACE( dm, ODM_COMP_DIG, @@ -817,8 +819,8 @@ void odm_DIG(void *dm_void) if (dm->is_linked && !first_connect) { ODM_RT_TRACE(dm, ODM_COMP_DIG, "Beacon Num (%d)\n", dm->phy_dbg_info.num_qry_beacon_pkt); - if ((dm->phy_dbg_info.num_qry_beacon_pkt < 5) && - (dm->bsta_state)) { + if (dm->phy_dbg_info.num_qry_beacon_pkt < 5 && + dm->bsta_state) { dig_tab->rx_gain_range_min = 0x1c; ODM_RT_TRACE( dm, ODM_COMP_DIG, @@ -880,9 +882,9 @@ void odm_DIG(void *dm_void) current_igi = current_igi - 2; /* 4 Abnormal # beacon case */ - if ((dm->phy_dbg_info.num_qry_beacon_pkt < 5) && - (fa_cnt->cnt_all < DM_DIG_FA_TH1) && - (dm->bsta_state)) { + if (dm->phy_dbg_info.num_qry_beacon_pkt < 5 && + fa_cnt->cnt_all < DM_DIG_FA_TH1 && + dm->bsta_state) { current_igi = dig_tab->rx_gain_range_min; ODM_RT_TRACE( dm, ODM_COMP_DIG, @@ -1319,7 +1321,7 @@ void odm_pause_cck_packet_detection(void *dm_void, ODM_RT_TRACE(dm, ODM_COMP_DIG, "%s()=========> level = %d\n", __func__, pause_level); - if ((dig_tab->pause_cckpd_level == 0) && + if (dig_tab->pause_cckpd_level == 0 && (!(dm->support_ability & ODM_BB_CCK_PD) || !(dm->support_ability & ODM_BB_FA_CNT))) { ODM_RT_TRACE( |