diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 18:50:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-19 18:50:43 -0700 |
| commit | 2090af718014f3d434fb8b85b00eeea01ebcec19 (patch) | |
| tree | 97eb6e655a3c2d90c212de79b563fa35837a341f /net/ieee80211/ieee80211_crypt_tkip.c | |
| parent | 557240b48e2dc4f6fa878afc3fc767ad745ca7ed (diff) | |
| parent | 4b6ace7f02cddb8c363ad27bb1e5014c6791e34a (diff) | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (166 commits)
[PATCH] net: au1000_eth: PHY framework conversion
[PATCH] 3c5zz ethernet: fix section warnings
[PATCH] smc ethernet: fix section mismatch warnings
[PATCH] hp ethernet: fix section mismatches
[PATCH] Section mismatch in drivers/net/ne.o during modpost
[PATCH] e1000: prevent statistics from getting garbled during reset
[PATCH] smc911x Kconfig fix
[PATCH] forcedeth: new device ids
[PATCH] forcedeth config: version
[PATCH] forcedeth config: module parameters
[PATCH] forcedeth config: diagnostics
[PATCH] forcedeth config: move functions
[PATCH] forcedeth config: statistics
[PATCH] forcedeth config: csum
[PATCH] forcedeth config: wol
[PATCH] forcedeth config: phy
[PATCH] forcedeth config: flow control
[PATCH] forcedeth config: ring sizes
[PATCH] forcedeth config: tso cleanup
[DOC] Update bonding documentation with sysfs info
...
Diffstat (limited to 'net/ieee80211/ieee80211_crypt_tkip.c')
| -rw-r--r-- | net/ieee80211/ieee80211_crypt_tkip.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/net/ieee80211/ieee80211_crypt_tkip.c b/net/ieee80211/ieee80211_crypt_tkip.c index 93def94c1b32..3fa5df2e1f0b 100644 --- a/net/ieee80211/ieee80211_crypt_tkip.c +++ b/net/ieee80211/ieee80211_crypt_tkip.c @@ -501,8 +501,11 @@ static int michael_mic(struct ieee80211_tkip_data *tkey, u8 * key, u8 * hdr, static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr) { struct ieee80211_hdr_4addr *hdr11; + u16 stype; hdr11 = (struct ieee80211_hdr_4addr *)skb->data; + stype = WLAN_FC_GET_STYPE(le16_to_cpu(hdr11->frame_ctl)); + switch (le16_to_cpu(hdr11->frame_ctl) & (IEEE80211_FCTL_FROMDS | IEEE80211_FCTL_TODS)) { case IEEE80211_FCTL_TODS: @@ -523,7 +526,13 @@ static void michael_mic_hdr(struct sk_buff *skb, u8 * hdr) break; } - hdr[12] = 0; /* priority */ + if (stype & IEEE80211_STYPE_QOS_DATA) { + const struct ieee80211_hdr_3addrqos *qoshdr = + (struct ieee80211_hdr_3addrqos *)skb->data; + hdr[12] = le16_to_cpu(qoshdr->qos_ctl) & IEEE80211_QCTL_TID; + } else + hdr[12] = 0; /* priority */ + hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */ } |