ops: make support for wireless extensions optional

[project/iwinfo.git] / iwinfo_lib.c

diff --git a/iwinfo_lib.c b/iwinfo_lib.c
index c30d8341a1dfb1f5c57468b91b6a56f28fac2f04..22571f04ff6d341c80285c4247f0193e6720a24c 100644 (file)
--- a/iwinfo_lib.c
+++ b/iwinfo_lib.c
@@ -31,12 +31,17 @@ const char *IWINFO_CIPHER_NAMES[] = {
        "WEP104",
        "AES-OCB",
        "CKIP",
+       "GCMP",
+       "CCMP-256",
+       "GCMP-256",
 };
 
 const char *IWINFO_KMGMT_NAMES[] = {
        "NONE",
        "802.1X",
        "PSK",
+       "SAE",
+       "OWE",
 };
 
 const char *IWINFO_AUTH_NAMES[] = {
@@ -57,6 +62,22 @@ const char *IWINFO_OPMODE_NAMES[] = {
        "P2P Go",
 };
 
+const char *IWINFO_HTMODE_NAMES[] = {
+       "HT20",
+       "HT40",
+       "VHT20",
+       "VHT40",
+       "VHT80",
+       "VHT80+80",
+       "VHT160",
+       "NOHT",
+       "HE20",
+       "HE40",
+       "HE80",
+       "HE80+80",
+       "HE160"
+};
+
 
 /*
  * ISO3166 country labels
@@ -313,10 +334,6 @@ const struct iwinfo_iso3166_label IWINFO_ISO3166_NAMES[] = {
        { 0,               "" }
 };
 
-#ifndef ARRAY_SIZE
-#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#endif
-
 static const struct iwinfo_ops *backends[] = {
 #ifdef USE_NL80211
        &nl80211_ops,
@@ -327,7 +344,9 @@ static const struct iwinfo_ops *backends[] = {
 #ifdef USE_WL
        &wl_ops,
 #endif
+#ifdef USE_WEXT
        &wext_ops,
+#endif
 };
 
 const char * iwinfo_type(const char *ifname)