On Mon, 2009-03-02 at 15:07 +0200, Jouni Malinen wrote:
> This is not used anywhere in ath9k and is just making the code more
> confusing.
>
> Signed-off-by: Jouni Malinen <jouni.malinen@xxxxxxxxxxx>
>
> ---
> drivers/net/wireless/ath9k/hw.c | 15 ++++++---------
> drivers/net/wireless/ath9k/hw.h | 2 +-
> drivers/net/wireless/ath9k/main.c | 2 +-
> drivers/net/wireless/ath9k/phy.h | 2 --
> 4 files changed, 8 insertions(+), 13 deletions(-)
>
> --- wireless-testing.orig/drivers/net/wireless/ath9k/hw.c 2009-03-02 14:23:07.000000000 +0200
> +++ wireless-testing/drivers/net/wireless/ath9k/hw.c 2009-03-02 14:23:09.000000000 +0200
> @@ -2415,14 +2415,11 @@ bool ath9k_hw_keysetmac(struct ath_hw *a
>
> 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
> 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) & 0xffff;
> + key4 = get_unaligned_le32(k->kv_val + 12);
No longer need the 0xffff here
Harvey
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
