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

Commit ace5d5de authored by John W. Linville's avatar John W. Linville
Browse files

ath5k: fixup some merge damage for AR5211 IQ calibration 



Resolution of a merge conflict upstream accidentally removed a hunk of
"ath5k: IQ calibration for AR5211 is slightly different", so restore it.

Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f74cb0f7

drivers/net/wireless/ath/ath5k/phy.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -1388,6 +1388,9 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah, 
	i_coff = (-iq_corr) / i_coffd;

	i_coff = (-iq_corr) / i_coffd;

	i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */

	i_coff = clamp(i_coff, -32, 31); /* signed 6 bit */





	if (ah->ah_version == AR5K_AR5211)

		q_coff = (i_pwr / q_coffd) - 64;

	else

		q_coff = (i_pwr / q_coffd) - 128;

		q_coff = (i_pwr / q_coffd) - 128;

	q_coff = clamp(q_coff, -16, 15); /* signed 5 bit */

	q_coff = clamp(q_coff, -16, 15); /* signed 5 bit */