ath9k_htc: do ani shortcalibratio if we got -ETIMEDOUT
current code will handle -ETIMEDOUT as success which is probalbly wrong. According to this comment I assume it is safe to handle -ETIMEDOUT as false: drivers/net/wireless/ath/ath9k/calib.c 290 /* 291 * We timed out waiting for the noisefloor to load, probably due to an 292 * in-progress rx. Simply return here and allow the load plenty of time 293 * to complete before the next calibration interval. We need to avoid 294 * trying to load -50 (which happens below) while the previous load is 295 * still in progress as this can cause rx deafness. Instead by returning 296 * here, the baseband nf cal will just be capped by our present 297 * noisefloor until the next calibration timer. 298 */ Since no other error wariants are present, this patch is checking only for (ret <= 0). Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Oleksij Rempel <linux@rempel-privat.de> Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
This commit is contained in:
Родитель
11c3653705
Коммит
14250640cd
|
@ -794,8 +794,11 @@ void ath9k_htc_ani_work(struct work_struct *work)
|
|||
common->ani.longcal_timer = timestamp;
|
||||
}
|
||||
|
||||
/* Short calibration applies only while caldone is false */
|
||||
if (!common->ani.caldone) {
|
||||
/*
|
||||
* Short calibration applies only while caldone
|
||||
* is false or -ETIMEDOUT
|
||||
*/
|
||||
if (common->ani.caldone <= 0) {
|
||||
if ((timestamp - common->ani.shortcal_timer) >=
|
||||
short_cal_interval) {
|
||||
shortcal = true;
|
||||
|
@ -844,7 +847,11 @@ set_timer:
|
|||
*/
|
||||
cal_interval = ATH_LONG_CALINTERVAL;
|
||||
cal_interval = min(cal_interval, (u32)ATH_ANI_POLLINTERVAL);
|
||||
if (!common->ani.caldone)
|
||||
/*
|
||||
* Short calibration applies only while caldone
|
||||
* is false or -ETIMEDOUT
|
||||
*/
|
||||
if (common->ani.caldone <= 0)
|
||||
cal_interval = min(cal_interval, (u32)short_cal_interval);
|
||||
|
||||
ieee80211_queue_delayed_work(common->hw, &priv->ani_work,
|
||||
|
|
Загрузка…
Ссылка в новой задаче