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

Commit 0edc9a67 authored by Bruno Randolf's avatar Bruno Randolf Committed by John W. Linville
Browse files

ath5k: Use high bitrates for ACK/CTS 



There was a confusion in the usage of the bits AR5K_STA_ID1_ACKCTS_6MB and
AR5K_STA_ID1_BASE_RATE_11B. If they are set (1), we will get lower bitrates for
ACK and CTS. Therefore ath5k_hw_set_ack_bitrate_high(ah, false) actually
resulted in high bitrates, which i think is what we want anyways. Cleared the
confusion and added some documentation.

Signed-off-by: default avatarBruno Randolf <br1@einfach.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent cc78e904

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

+1 −2
Original line number Diff line number Diff line
@@ -2558,8 +2558,7 @@ ath5k_init(struct ath5k_softc *sc) 
	for (i = 0; i < AR5K_KEYTABLE_SIZE; i++)

		ath5k_hw_reset_key(ah, i);



	/* Set ack to be sent at low bit-rates */

	ath5k_hw_set_ack_bitrate_high(ah, false);

	ath5k_hw_set_ack_bitrate_high(ah, true);

	ret = 0;

done:

	mmiowb();

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

+2 −2
Original line number Diff line number Diff line
@@ -154,9 +154,9 @@ void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high) 
	else {

		u32 val = AR5K_STA_ID1_BASE_RATE_11B | AR5K_STA_ID1_ACKCTS_6MB;

		if (high)

			AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1, val);

		else

			AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1, val);

		else

			AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1, val);

	}

}

drivers/net/wireless/ath/ath5k/reg.h

+2 −2
Original line number Diff line number Diff line
@@ -1139,8 +1139,8 @@ 
#define AR5K_STA_ID1_DEFAULT_ANTENNA	0x00200000	/* Use default antenna */

#define AR5K_STA_ID1_DESC_ANTENNA	0x00400000	/* Update antenna from descriptor */

#define AR5K_STA_ID1_RTS_DEF_ANTENNA	0x00800000	/* Use default antenna for RTS */

#define AR5K_STA_ID1_ACKCTS_6MB		0x01000000	/* Use 6Mbit/s for ACK/CTS */

#define AR5K_STA_ID1_BASE_RATE_11B	0x02000000	/* Use 11b base rate for ACK/CTS [5211+] */

#define AR5K_STA_ID1_ACKCTS_6MB		0x01000000	/* Rate to use for ACK/CTS. 0: highest mandatory rate <= RX rate; 1: 1Mbps in B mode */

#define AR5K_STA_ID1_BASE_RATE_11B	0x02000000	/* 802.11b base rate. 0: 1, 2, 5.5 and 11Mbps; 1: 1 and 2Mbps. [5211+] */

#define AR5K_STA_ID1_SELFGEN_DEF_ANT	0x04000000	/* Use def. antenna for self generated frames */

#define AR5K_STA_ID1_CRYPT_MIC_EN	0x08000000	/* Enable MIC */

#define AR5K_STA_ID1_KEYSRCH_MODE	0x10000000	/* Look up key when key id != 0 */