iwinfo: add 802.11ax HE rate information

[project/iwinfo.git] / include / iwinfo.h

diff --git a/include/iwinfo.h b/include/iwinfo.h
index 680f384f603d7424b729faf503a61aa8ff3be928..3fc414be492dfdcbe35199d502aa8ed785bc0730 100644 (file)
--- a/include/iwinfo.h
+++ b/include/iwinfo.h
@@ -29,6 +29,7 @@
 #define IWINFO_80211_N       (1 << 3)
 #define IWINFO_80211_AC      (1 << 4)
 #define IWINFO_80211_AD      (1 << 5)
+#define IWINFO_80211_AX      (1 << 6)
 
 #define IWINFO_CIPHER_NONE   (1 << 0)
 #define IWINFO_CIPHER_WEP40  (1 << 1)
@@ -38,7 +39,8 @@
 #define IWINFO_CIPHER_WEP104 (1 << 5)
 #define IWINFO_CIPHER_AESOCB (1 << 6)
 #define IWINFO_CIPHER_CKIP   (1 << 7)
-#define IWINFO_CIPHER_COUNT  8
+#define IWINFO_CIPHER_GCMP   (1 << 8)
+#define IWINFO_CIPHER_COUNT  9
 
 #define IWINFO_KMGMT_NONE    (1 << 0)
 #define IWINFO_KMGMT_8021x   (1 << 1)
@@ -89,8 +91,13 @@ enum iwinfo_htmode {
        IWINFO_HTMODE_VHT80_80   = (1 << 5),
        IWINFO_HTMODE_VHT160     = (1 << 6),
        IWINFO_HTMODE_NOHT       = (1 << 7),
+       IWINFO_HTMODE_HE20       = (1 << 8),
+       IWINFO_HTMODE_HE40       = (1 << 9),
+       IWINFO_HTMODE_HE80       = (1 << 10),
+       IWINFO_HTMODE_HE80_80    = (1 << 11),
+       IWINFO_HTMODE_HE160      = (1 << 12),
 
-       IWINFO_HTMODE_COUNT      = 8
+       IWINFO_HTMODE_COUNT      = 13
 };
 
 extern const char *IWINFO_HTMODE_NAMES[IWINFO_HTMODE_COUNT];
@@ -103,6 +110,9 @@ struct iwinfo_rate_entry {
        uint8_t is_short_gi:1;
        uint8_t is_ht:1;
        uint8_t is_vht:1;
+       uint8_t is_he:1;
+       uint8_t he_gi;
+       uint8_t he_dcm;
        uint8_t mhz;
        uint8_t nss;
 };
@@ -164,8 +174,8 @@ struct iwinfo_freqlist_entry {
 struct iwinfo_crypto_entry {
        uint8_t enabled;
        uint8_t wpa_version;
-       uint8_t group_ciphers;
-       uint8_t pair_ciphers;
+       uint16_t group_ciphers;
+       uint16_t pair_ciphers;
        uint8_t auth_suites;
        uint8_t auth_algs;
 };
@@ -254,6 +264,8 @@ struct iwinfo_ops {
        int (*probe)(const char *ifname);
        int (*mode)(const char *, int *);
        int (*channel)(const char *, int *);
+       int (*center_chan1)(const char *, int *);
+       int (*center_chan2)(const char *, int *);
        int (*frequency)(const char *, int *);
        int (*frequency_offset)(const char *, int *);
        int (*txpower)(const char *, int *);
@@ -282,8 +294,6 @@ struct iwinfo_ops {
        int (*survey)(const char *, char *, int *);
        int (*lookup_phy)(const char *, char *);
        void (*close)(void);
-       int (*center_chan1)(const char *, int *);
-       int (*center_chan2)(const char *, int *);
 };
 
 const char * iwinfo_type(const char *ifname);