diff options
| author | Zhu Yi | 2006-02-28 08:10:36 +0100 |
|---|---|---|
| committer | John W. Linville | 2006-03-15 22:11:55 +0100 |
| commit | 0df7861240b3484dea52d1f5782c69fd95b6cf23 (patch) | |
| tree | 5de4228d09da99a352b125692f4c3aa3402103c9 | |
| parent | [PATCH] fs/namespace.c:dup_namespace(): fix a use after free (diff) | |
| download | kernel-qcow2-linux-0df7861240b3484dea52d1f5782c69fd95b6cf23.tar.gz kernel-qcow2-linux-0df7861240b3484dea52d1f5782c69fd95b6cf23.tar.xz kernel-qcow2-linux-0df7861240b3484dea52d1f5782c69fd95b6cf23.zip | |
[PATCH] ieee80211: Fix CCMP decryption problem when QoS is enabled
Use the correct STYPE for Qos data.
Signed-off-by: Zhu Yi <yi.zhu@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_ccmp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_crypt_ccmp.c b/net/ieee80211/ieee80211_crypt_ccmp.c index 470221728503..3840d1911f2b 100644 --- a/net/ieee80211/ieee80211_crypt_ccmp.c +++ b/net/ieee80211/ieee80211_crypt_ccmp.c @@ -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; |