OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f13b835
)
[PATCH] ieee80211: Fix CCMP decryption problem when QoS is enabled
author
Zhu Yi
<yi.zhu@intel.com>
Tue, 28 Feb 2006 07:10:36 +0000
(15:10 +0800)
committer
John W. Linville
<linville@tuxdriver.com>
Wed, 15 Mar 2006 21:11:55 +0000
(16:11 -0500)
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>
net/ieee80211/ieee80211_crypt_ccmp.c
patch
|
blob
|
history
diff --git
a/net/ieee80211/ieee80211_crypt_ccmp.c
b/net/ieee80211/ieee80211_crypt_ccmp.c
index
4702217
..
3840d19
100644
(file)
--- 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;