From: Jouni Malinen <jouni@codeaurora.org>
Date: Thu, 6 May 2021 09:12:51 +0000 (+0300)
Subject: Rename the Frame Control field subfield Order define to +HTC
X-Git-Tag: hostap_2_10~287
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2950851aceb1b2e36577e860643d70422b373edb;p=thirdparty%2Fhostap.git

Rename the Frame Control field subfield Order define to +HTC

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>
---

diff --git a/src/common/ieee802_11_defs.h b/src/common/ieee802_11_defs.h
index 710186e5d..7d2f36b8f 100644
--- a/src/common/ieee802_11_defs.h
+++ b/src/common/ieee802_11_defs.h
@@ -22,7 +22,7 @@
 #define WLAN_FC_PWRMGT		0x1000
 #define WLAN_FC_MOREDATA	0x2000
 #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_STYPE(fc)	(((fc) & 0x00f0) >> 4)
diff --git a/wlantest/ccmp.c b/wlantest/ccmp.c
index 2a1ad83c9..5d393d43d 100644
--- a/wlantest/ccmp.c
+++ b/wlantest/ccmp.c
@@ -35,7 +35,7 @@ static void ccmp_aad_nonce(const struct ieee80211_hdr *hdr, const u8 *data,
 		if (stype & 0x08) {
 			const u8 *qc;
 			qos = 1;
-			fc &= ~WLAN_FC_ORDER;
+			fc &= ~WLAN_FC_HTC;
 			qc = (const u8 *) (hdr + 1);
 			if (addr4)
 				qc += ETH_ALEN;
diff --git a/wlantest/gcmp.c b/wlantest/gcmp.c
index d92f4edae..f9f95b23d 100644
--- a/wlantest/gcmp.c
+++ b/wlantest/gcmp.c
@@ -33,7 +33,7 @@ static void gcmp_aad_nonce(const struct ieee80211_hdr *hdr, const u8 *data,
 		if (stype & 0x08) {
 			const u8 *qc;
 			qos = 1;
-			fc &= ~WLAN_FC_ORDER;
+			fc &= ~WLAN_FC_HTC;
 			qc = (const u8 *) (hdr + 1);
 			if (addr4)
 				qc += ETH_ALEN;