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

This project is archived. Its data is read-only.

Commit a45f369d authored Jan 30, 2011 by Gertjan van Wingerde Committed by John W. Linville Jan 31, 2011

rt2x00: Fix WPA TKIP Michael MIC failures.



As reported and found by Johannes Stezenbach:
rt2800{pci,usb} do not report the Michael MIC in RXed frames, but do check
the Michael MIC in hardware. Therefore we have to report to mac80211 that the
received frame does not include the Michael MIC.

Signed-off-by: Gertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 21957c31

drivers/net/wireless/rt2x00/rt2800pci.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -675,6 +675,12 @@ static void rt2800pci_fill_rxdone(struct queue_entry *entry,
	*/		*/
	rxdesc->flags \|= RX_FLAG_IV_STRIPPED;		rxdesc->flags \|= RX_FLAG_IV_STRIPPED;

			/*
			* The hardware has already checked the Michael Mic and has
			* stripped it from the frame. Signal this to mac80211.
			*/
			rxdesc->flags \|= RX_FLAG_MMIC_STRIPPED;

	if (rxdesc->cipher_status == RX_CRYPTO_SUCCESS)		if (rxdesc->cipher_status == RX_CRYPTO_SUCCESS)
	rxdesc->flags \|= RX_FLAG_DECRYPTED;		rxdesc->flags \|= RX_FLAG_DECRYPTED;
	else if (rxdesc->cipher_status == RX_CRYPTO_FAIL_MIC)		else if (rxdesc->cipher_status == RX_CRYPTO_FAIL_MIC)

drivers/net/wireless/rt2x00/rt2800usb.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -484,6 +484,12 @@ static void rt2800usb_fill_rxdone(struct queue_entry *entry,
	*/		*/
	rxdesc->flags \|= RX_FLAG_IV_STRIPPED;		rxdesc->flags \|= RX_FLAG_IV_STRIPPED;

			/*
			* The hardware has already checked the Michael Mic and has
			* stripped it from the frame. Signal this to mac80211.
			*/
			rxdesc->flags \|= RX_FLAG_MMIC_STRIPPED;

	if (rxdesc->cipher_status == RX_CRYPTO_SUCCESS)		if (rxdesc->cipher_status == RX_CRYPTO_SUCCESS)
	rxdesc->flags \|= RX_FLAG_DECRYPTED;		rxdesc->flags \|= RX_FLAG_DECRYPTED;
	else if (rxdesc->cipher_status == RX_CRYPTO_FAIL_MIC)		else if (rxdesc->cipher_status == RX_CRYPTO_FAIL_MIC)