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

Commit 0df78612 authored by Zhu Yi's avatar Zhu Yi Committed by John W. Linville
Browse files

[PATCH] ieee80211: Fix CCMP decryption problem when QoS is enabled 



Use the correct STYPE for Qos data.

Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f13b8358

net/ieee80211/ieee80211_crypt_ccmp.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static void ccmp_init_blocks(struct crypto_tfm *tfm, 
	a4_included = ((fc & (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) ==

		       (IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS));

	qc_included = ((WLAN_FC_GET_TYPE(fc) == IEEE80211_FTYPE_DATA) &&

		       (WLAN_FC_GET_STYPE(fc) & 0x08));

		       (WLAN_FC_GET_STYPE(fc) & IEEE80211_STYPE_QOS_DATA));

	aad_len = 22;

	if (a4_included)

		aad_len += 6;