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

Commit 6819d57f authored by Sujith's avatar Sujith Committed by John W. Linville
Browse files

ath9k_hw: Relocate Opmode initialization 



Programming the opmode in the HW can be done
before the assoc_id and STA_ID registers are
setup. This helps ath9k_htc when multiple register
writes are used.

Signed-off-by: default avatarSujith <Sujith.Manoharan@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 20b3efd9

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

+2 −6
Original line number Original line Diff line number Diff line
@@ -1238,6 +1238,8 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
	ath9k_hw_spur_mitigate_freq(ah, chan);

	ath9k_hw_spur_mitigate_freq(ah, chan);

	ah->eep_ops->set_board_values(ah, chan);

	ah->eep_ops->set_board_values(ah, chan);





	ath9k_hw_set_operating_mode(ah, ah->opmode);



	REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));

	REG_WRITE(ah, AR_STA_ID0, get_unaligned_le32(common->macaddr));

	REG_WRITE(ah, AR_STA_ID1, get_unaligned_le16(common->macaddr + 4)

	REG_WRITE(ah, AR_STA_ID1, get_unaligned_le16(common->macaddr + 4)

		  | macStaId1

		  | macStaId1
@@ -1245,16 +1247,10 @@ int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan, 
		  | (ah->config.

		  | (ah->config.

		     ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)

		     ack_6mb ? AR_STA_ID1_ACKCTS_6MB : 0)

		  | ah->sta_id1_defaults);

		  | ah->sta_id1_defaults);

	ath9k_hw_set_operating_mode(ah, ah->opmode);



	ath_hw_setbssidmask(common);

	ath_hw_setbssidmask(common);



	REG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);

	REG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);



	ath9k_hw_write_associd(ah);

	ath9k_hw_write_associd(ah);



	REG_WRITE(ah, AR_ISR, ~0);

	REG_WRITE(ah, AR_ISR, ~0);



	REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);

	REG_WRITE(ah, AR_RSSI_THR, INIT_RSSI_THR);





	r = ath9k_hw_rf_set_freq(ah, chan);

	r = ath9k_hw_rf_set_freq(ah, chan);