diff options
| author | sam <sam@FreeBSD.org> | 2004-12-31 20:59:03 +0000 |
|---|---|---|
| committer | sam <sam@FreeBSD.org> | 2004-12-31 20:59:03 +0000 |
| commit | e508073ee6012fdd925e1a9bd0b0b11d2fda47f6 (patch) | |
| tree | 38c8b7b8762f9a1a503814447e2318e31b1d2745 /sys/net80211 | |
| parent | 4327f1ee6eb021f33c4bef7ebf8134d480653e78 (diff) | |
| download | FreeBSD-src-e508073ee6012fdd925e1a9bd0b0b11d2fda47f6.zip FreeBSD-src-e508073ee6012fdd925e1a9bd0b0b11d2fda47f6.tar.gz | |
correct pseudo-mic header calculation for QoS frames
Diffstat (limited to 'sys/net80211')
| -rw-r--r-- | sys/net80211/ieee80211_crypto_tkip.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/sys/net80211/ieee80211_crypto_tkip.c b/sys/net80211/ieee80211_crypto_tkip.c index fd02918..9133946 100644 --- a/sys/net80211/ieee80211_crypto_tkip.c +++ b/sys/net80211/ieee80211_crypto_tkip.c @@ -780,7 +780,12 @@ michael_mic_hdr(const struct ieee80211_frame *wh0, uint8_t hdr[16]) break; } - hdr[12] = 0; /* XXX qos priority */ + if (wh->i_fc[0] & IEEE80211_FC0_SUBTYPE_QOS) { + const struct ieee80211_qosframe *qwh = + (const struct ieee80211_qosframe *) wh; + hdr[12] = qwh->i_qos[0] & IEEE80211_QOS_TID; + } else + hdr[12] = 0; hdr[13] = hdr[14] = hdr[15] = 0; /* reserved */ } |
