Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05005c5f authored by Robert Shade's avatar Robert Shade Committed by John W. Linville
Browse files

Show actual timeout value in failed calibration messages. 



The messages are currently hard coding "1ms", which does not match
the actual timeout being used.

Signed-off-by: default avatarRobert Shade <robert.shade@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 56771e50

drivers/net/wireless/ath/ath9k/ar9002_calib.c

+6 −3
Original line number Diff line number Diff line
@@ -731,7 +731,8 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan) 
		if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL,

				  AR_PHY_AGC_CONTROL_CAL, 0, AH_WAIT_TIMEOUT)) {

			ath_dbg(common, CALIBRATE,

				"offset calibration failed to complete in 1ms; noisy environment?\n");

				"offset calibration failed to complete in %d ms; noisy environment?\n",

				AH_WAIT_TIMEOUT / 1000);

			return false;

		}

		REG_CLR_BIT(ah, AR_PHY_TURBO, AR_PHY_FC_DYN2040_EN);
@@ -745,7 +746,8 @@ static bool ar9285_hw_cl_cal(struct ath_hw *ah, struct ath9k_channel *chan) 
	if (!ath9k_hw_wait(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_CAL,

			  0, AH_WAIT_TIMEOUT)) {

		ath_dbg(common, CALIBRATE,

			"offset calibration failed to complete in 1ms; noisy environment?\n");

			"offset calibration failed to complete in %d ms; noisy environment?\n",

			AH_WAIT_TIMEOUT / 1000);

		return false;

	}
@@ -841,7 +843,8 @@ static bool ar9002_hw_init_cal(struct ath_hw *ah, struct ath9k_channel *chan) 
				   AR_PHY_AGC_CONTROL_CAL,

				   0, AH_WAIT_TIMEOUT)) {

			ath_dbg(common, CALIBRATE,

				"offset calibration failed to complete in 1ms; noisy environment?\n");

				"offset calibration failed to complete in %d ms; noisy environment?\n",

				AH_WAIT_TIMEOUT / 1000);

			return false;

		}

drivers/net/wireless/ath/ath9k/ar9003_calib.c

+2 −1
Original line number Diff line number Diff line
@@ -1125,7 +1125,8 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, 
			ar9003_hw_rtt_disable(ah);



		ath_dbg(common, CALIBRATE,

			"offset calibration failed to complete in 1ms; noisy environment?\n");

			"offset calibration failed to complete in %d ms; noisy environment?\n",

			AH_WAIT_TIMEOUT / 1000);

		return false;

	}