Commit 930e0ead authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Felix Fietkau
Browse files

mt76: fix tkip configuration for mt7615/7663 devices 



Fix Tx-Rx MIC overwrite during TKIP hw key configuration

Fixes: 01cfc1b4 ("mt76: mt7615: add BIP_CMAC_128 cipher support")
Tested-by: default avatarYN Chen <yn.chen@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
parent d3a5d89e

drivers/net/wireless/mediatek/mt76/mt7615/mac.c

+8 −6
Original line number Diff line number Diff line
@@ -1046,15 +1046,17 @@ int mt7615_mac_wtbl_update_key(struct mt7615_dev *dev, 
	if (cmd == SET_KEY) {

		if (cipher == MT_CIPHER_TKIP) {

			/* Rx/Tx MIC keys are swapped */

			memcpy(data, key, 16);

			memcpy(data + 16, key + 24, 8);

			memcpy(data + 24, key + 16, 8);

		}

		} else {

			if (cipher != MT_CIPHER_BIP_CMAC_128 && wcid->cipher)

				memmove(data + 16, data, 16);

			if (cipher != MT_CIPHER_BIP_CMAC_128 || !wcid->cipher)

				memcpy(data, key, keylen);

			else if (cipher == MT_CIPHER_BIP_CMAC_128)

				memcpy(data + 16, key, 16);

		}

	} else {

		if (wcid->cipher & ~BIT(cipher)) {

			if (cipher != MT_CIPHER_BIP_CMAC_128)