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

Commit e0caf9ea authored by Jouni Malinen's avatar Jouni Malinen Committed by John W. Linville
Browse files

ath9k: Remove unused key xoring 



This is not used anywhere in ath9k and is just making the code more
confusing.

Signed-off-by: default avatarJouni Malinen <jouni.malinen@atheros.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 672903b3

drivers/net/wireless/ath9k/hw.c

+6 −9
Original line number Diff line number Diff line
@@ -2415,14 +2415,11 @@ bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac) 


bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,

				 const struct ath9k_keyval *k,

				 const u8 *mac, int xorKey)

				 const u8 *mac)

{

	const struct ath9k_hw_capabilities *pCap = &ah->caps;

	u32 key0, key1, key2, key3, key4;

	u32 keyType;

	u32 xorMask = xorKey ?

		(ATH9K_KEY_XOR << 24 | ATH9K_KEY_XOR << 16 | ATH9K_KEY_XOR << 8

		 | ATH9K_KEY_XOR) : 0;



	if (entry >= pCap->keycache_size) {

		DPRINTF(ah->ah_sc, ATH_DBG_KEYCACHE,
@@ -2474,11 +2471,11 @@ bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry, 
		return false;

	}



	key0 = get_unaligned_le32(k->kv_val + 0) ^ xorMask;

	key1 = (get_unaligned_le16(k->kv_val + 4) ^ xorMask) & 0xffff;

	key2 = get_unaligned_le32(k->kv_val + 6) ^ xorMask;

	key3 = (get_unaligned_le16(k->kv_val + 10) ^ xorMask) & 0xffff;

	key4 = get_unaligned_le32(k->kv_val + 12) ^ xorMask;

	key0 = get_unaligned_le32(k->kv_val + 0);

	key1 = get_unaligned_le16(k->kv_val + 4);

	key2 = get_unaligned_le32(k->kv_val + 6);

	key3 = get_unaligned_le16(k->kv_val + 10);

	key4 = get_unaligned_le32(k->kv_val + 12);

	if (k->kv_len <= LEN_WEP104)

		key4 &= 0xff;

drivers/net/wireless/ath9k/hw.h

+1 −1
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ bool ath9k_hw_keyreset(struct ath_hw *ah, u16 entry); 
bool ath9k_hw_keysetmac(struct ath_hw *ah, u16 entry, const u8 *mac);

bool ath9k_hw_set_keycache_entry(struct ath_hw *ah, u16 entry,

				 const struct ath9k_keyval *k,

				 const u8 *mac, int xorKey);

				 const u8 *mac);

bool ath9k_hw_keyisvalid(struct ath_hw *ah, u16 entry);



/* GPIO / RFKILL / Antennae */

drivers/net/wireless/ath9k/main.c

+1 −1
Original line number Diff line number Diff line
@@ -642,7 +642,7 @@ static int ath_keyset(struct ath_softc *sc, u16 keyix, 
	bool status;



	status = ath9k_hw_set_keycache_entry(sc->sc_ah,

		keyix, hk, mac, false);

		keyix, hk, mac);



	return status != false;

}

drivers/net/wireless/ath9k/phy.h

+0 −2
Original line number Diff line number Diff line
@@ -559,8 +559,6 @@ bool ath9k_hw_init_rf(struct ath_hw *ah, 
		}							\

	} while (0)



#define ATH9K_KEY_XOR                 0xaa



#define ATH9K_IS_MIC_ENABLED(ah)					\

	((ah)->sta_id1_defaults & AR_STA_ID1_CRPT_MIC_ENABLE)