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 710186e5d36af68580dca09bd3c3f35c1680b1b2..7d2f36b8f1e63e366cb6302f27b40608b429ea44 100644 (file)
--- 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 2a1ad83c9ee244612cf0254464cc5693ee927377..5d393d43dd24652f8abef7ac1acbaee97c09a142 100644 (file)
--- 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 d92f4edae6e76a7db998abe55607646a6a73eee4..f9f95b23db314e949b87239e830423a898b1d2f3 100644 (file)
--- 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;