jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename the Frame Control field subfield Order define to +HTC

Browse source 
This moves the implementation closer to the current IEEE 802.11 standard
since B15 of Frame Control field was renamed to +HTC to match it newer
uses.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2021-05-06 12:12:51 +03:00 committed by Jouni Malinen
parent 11821ab3d1
commit 2950851ace
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/common/ieee802_11_defs.h
View file

@ -22,7 +22,7 @@
#define WLAN_FC_PWRMGT 0x1000 #define WLAN_FC_PWRMGT 0x1000
#define WLAN_FC_MOREDATA 0x2000 #define WLAN_FC_MOREDATA 0x2000
#define WLAN_FC_ISWEP 0x4000 #define WLAN_FC_ISWEP 0x4000
#define WLAN_FC_ORDER 0x8000 #define WLAN_FC_HTC 0x8000
#define WLAN_FC_GET_TYPE(fc) (((fc) & 0x000c) >> 2) #define WLAN_FC_GET_TYPE(fc) (((fc) & 0x000c) >> 2)
#define WLAN_FC_GET_STYPE(fc) (((fc) & 0x00f0) >> 4) #define WLAN_FC_GET_STYPE(fc) (((fc) & 0x00f0) >> 4)

2
wlantest/ccmp.c
View file

@ -35,7 +35,7 @@ static void ccmp_aad_nonce(const struct ieee80211_hdr *hdr, const u8 *data,
if (stype & 0x08) { if (stype & 0x08) {
const u8 *qc; const u8 *qc;
qos = 1; qos = 1;
fc &= ~WLAN_FC_ORDER; fc &= ~WLAN_FC_HTC;
qc = (const u8 *) (hdr + 1); qc = (const u8 *) (hdr + 1);
if (addr4) if (addr4)
qc += ETH_ALEN; qc += ETH_ALEN;

2
wlantest/gcmp.c
View file

@ -33,7 +33,7 @@ static void gcmp_aad_nonce(const struct ieee80211_hdr *hdr, const u8 *data,
if (stype & 0x08) { if (stype & 0x08) {
const u8 *qc; const u8 *qc;
qos = 1; qos = 1;
fc &= ~WLAN_FC_ORDER; fc &= ~WLAN_FC_HTC;
qc = (const u8 *) (hdr + 1); qc = (const u8 *) (hdr + 1);
if (addr4) if (addr4)
qc += ETH_ALEN; qc += ETH_ALEN;