]> git.ipfire.org Git - thirdparty/iw.git/blobdiff - info.c
iw: bump version to 5.0
[thirdparty/iw.git] / info.c
diff --git a/info.c b/info.c
index 3d4eaebe590fb3426c1491a64f47e29c4d865aee..f1a25daa63daf5ffb1d4bae5fb8a088abeb80361 100644 (file)
--- a/info.c
+++ b/info.c
@@ -1,6 +1,4 @@
 #include <stdbool.h>
-#include <errno.h>
-#include <net/if.h>
 
 #include <netlink/genl/genl.h>
 #include <netlink/genl/family.h>
@@ -33,11 +31,21 @@ static char *cipher_name(__u32 c)
        case 0x000fac02:
                return "TKIP (00-0f-ac:2)";
        case 0x000fac04:
-               return "CCMP (00-0f-ac:4)";
+               return "CCMP-128 (00-0f-ac:4)";
        case 0x000fac06:
                return "CMAC (00-0f-ac:6)";
        case 0x000fac08:
-               return "GCMP (00-0f-ac:8)";
+               return "GCMP-128 (00-0f-ac:8)";
+       case 0x000fac09:
+               return "GCMP-256 (00-0f-ac:9)";
+       case 0x000fac0a:
+               return "CCMP-256 (00-0f-ac:10)";
+       case 0x000fac0b:
+               return "GMAC-128 (00-0f-ac:11)";
+       case 0x000fac0c:
+               return "GMAC-256 (00-0f-ac:12)";
+       case 0x000fac0d:
+               return "CMAC-256 (00-0f-ac:13)";
        case 0x00147201:
                return "WPI-SMS4 (00-14-72:1)";
        default:
@@ -49,18 +57,24 @@ static char *cipher_name(__u32 c)
        }
 }
 
-static char *dfs_state_name(enum nl80211_dfs_state state)
+static int ext_feature_isset(const unsigned char *ext_features, int ext_features_len,
+                            enum nl80211_ext_feature_index ftidx)
 {
-       switch (state) {
-       case NL80211_DFS_USABLE:
-               return "usable";
-       case NL80211_DFS_AVAILABLE:
-               return "available";
-       case NL80211_DFS_UNAVAILABLE:
-               return "unavailable";
-       default:
-               return "unknown";
-       }
+       unsigned char ft_byte;
+
+       if ((int) ftidx / 8 >= ext_features_len)
+               return 0;
+
+       ft_byte = ext_features[ftidx / 8];
+       return (ft_byte & BIT(ftidx % 8)) != 0;
+}
+
+static void ext_feat_print(const struct nlattr *tb,
+                          enum nl80211_ext_feature_index idx,
+                          const char *feature_name, const char *feature_desc)
+{
+       if (ext_feature_isset(nla_data(tb), nla_len(tb),idx))
+               printf("\t\t* [ %s ]: %s\n", feature_name, feature_desc);
 }
 
 static int print_phy_handler(struct nl_msg *msg, void *arg)
@@ -74,8 +88,8 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
        static struct nla_policy freq_policy[NL80211_FREQUENCY_ATTR_MAX + 1] = {
                [NL80211_FREQUENCY_ATTR_FREQ] = { .type = NLA_U32 },
                [NL80211_FREQUENCY_ATTR_DISABLED] = { .type = NLA_FLAG },
-               [NL80211_FREQUENCY_ATTR_PASSIVE_SCAN] = { .type = NLA_FLAG },
-               [NL80211_FREQUENCY_ATTR_NO_IBSS] = { .type = NLA_FLAG },
+               [NL80211_FREQUENCY_ATTR_NO_IR] = { .type = NLA_FLAG },
+               [__NL80211_FREQUENCY_ATTR_NO_IBSS] = { .type = NLA_FLAG },
                [NL80211_FREQUENCY_ATTR_RADAR] = { .type = NLA_FLAG },
                [NL80211_FREQUENCY_ATTR_MAX_TX_POWER] = { .type = NLA_U32 },
        };
@@ -172,28 +186,22 @@ static int print_phy_handler(struct nl_msg *msg, void *arg)
                                                print_flag("disabled", &open);
                                                goto next;
                                        }
-                                       if (tb_freq[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN])
-                                               print_flag("passive scanning", &open);
-                                       if (tb_freq[NL80211_FREQUENCY_ATTR_NO_IBSS])
-                                               print_flag("no IBSS", &open);
+
+                                       /* If both flags are set assume an new kernel */
+                                       if (tb_freq[NL80211_FREQUENCY_ATTR_NO_IR] && tb_freq[__NL80211_FREQUENCY_ATTR_NO_IBSS]) {
+                                               print_flag("no IR", &open);
+                                       } else if (tb_freq[NL80211_FREQUENCY_ATTR_PASSIVE_SCAN]) {
+                                               print_flag("passive scan", &open);
+                                       } else if (tb_freq[__NL80211_FREQUENCY_ATTR_NO_IBSS]){
+                                               print_flag("no ibss", &open);
+                                       }
+
                                        if (tb_freq[NL80211_FREQUENCY_ATTR_RADAR])
                                                print_flag("radar detection", &open);
 next:
                                        if (open)
                                                printf(")");
                                        printf("\n");
-
-                               if (tb_freq[NL80211_FREQUENCY_ATTR_DFS_STATE]) {
-                                       enum nl80211_dfs_state state = nla_get_u32(tb_freq[NL80211_FREQUENCY_ATTR_DFS_STATE]);
-                                       unsigned long time;
-
-                                       printf("\t\t\t  DFS state: %s", dfs_state_name(state));
-                                       if (tb_freq[NL80211_FREQUENCY_ATTR_DFS_TIME]) {
-                                               time = nla_get_u32(tb_freq[NL80211_FREQUENCY_ATTR_DFS_TIME]);
-                                               printf(" (for %lu sec)", time/1000);
-                                       }
-                                       printf("\n");
-                               }
                                }
                        }
 
@@ -222,6 +230,21 @@ next:
        if (tb_msg[NL80211_ATTR_MAX_SCAN_IE_LEN])
                printf("\tmax scan IEs length: %d bytes\n",
                       nla_get_u16(tb_msg[NL80211_ATTR_MAX_SCAN_IE_LEN]));
+       if (tb_msg[NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS])
+               printf("\tmax # sched scan SSIDs: %d\n",
+                      nla_get_u8(tb_msg[NL80211_ATTR_MAX_NUM_SCHED_SCAN_SSIDS]));
+       if (tb_msg[NL80211_ATTR_MAX_MATCH_SETS])
+               printf("\tmax # match sets: %d\n",
+                      nla_get_u8(tb_msg[NL80211_ATTR_MAX_MATCH_SETS]));
+       if (tb_msg[NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS])
+               printf("\tmax # scan plans: %d\n",
+                      nla_get_u32(tb_msg[NL80211_ATTR_MAX_NUM_SCHED_SCAN_PLANS]));
+       if (tb_msg[NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL])
+               printf("\tmax scan plan interval: %d\n",
+                      nla_get_u32(tb_msg[NL80211_ATTR_MAX_SCAN_PLAN_INTERVAL]));
+       if (tb_msg[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS])
+               printf("\tmax scan plan iterations: %d\n",
+                      nla_get_u32(tb_msg[NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS]));
 
        if (tb_msg[NL80211_ATTR_WIPHY_FRAG_THRESHOLD]) {
                unsigned int frag;
@@ -239,6 +262,22 @@ next:
                        printf("\tRTS threshold: %d\n", rts);
        }
 
+       if (tb_msg[NL80211_ATTR_WIPHY_RETRY_SHORT] ||
+           tb_msg[NL80211_ATTR_WIPHY_RETRY_LONG]) {
+               unsigned char retry_short = 0, retry_long = 0;
+
+               if (tb_msg[NL80211_ATTR_WIPHY_RETRY_SHORT])
+                       retry_short = nla_get_u8(tb_msg[NL80211_ATTR_WIPHY_RETRY_SHORT]);
+               if (tb_msg[NL80211_ATTR_WIPHY_RETRY_LONG])
+                       retry_long = nla_get_u8(tb_msg[NL80211_ATTR_WIPHY_RETRY_LONG]);
+               if (retry_short == retry_long) {
+                       printf("\tRetry short long limit: %d\n", retry_short);
+               } else {
+                       printf("\tRetry short limit: %d\n", retry_short);
+                       printf("\tRetry long limit: %d\n", retry_long);
+               }
+       }
+
        if (tb_msg[NL80211_ATTR_WIPHY_COVERAGE_CLASS]) {
                unsigned char coverage;
 
@@ -429,9 +468,10 @@ broken_combination:
                        [NL80211_WOWLAN_TRIG_EAP_IDENT_REQUEST] = { .type = NLA_FLAG },
                        [NL80211_WOWLAN_TRIG_4WAY_HANDSHAKE] = { .type = NLA_FLAG },
                        [NL80211_WOWLAN_TRIG_RFKILL_RELEASE] = { .type = NLA_FLAG },
+                       [NL80211_WOWLAN_TRIG_NET_DETECT] = { .type = NLA_U32 },
                        [NL80211_WOWLAN_TRIG_TCP_CONNECTION] = { .type = NLA_NESTED },
                };
-               struct nl80211_wowlan_pattern_support *pat;
+               struct nl80211_pattern_support *pat;
                int err;
 
                err = nla_parse_nested(tb_wowlan, MAX_NL80211_WOWLAN_TRIG,
@@ -449,12 +489,13 @@ broken_combination:
                        if (tb_wowlan[NL80211_WOWLAN_TRIG_MAGIC_PKT])
                                printf("\t\t * wake up on magic packet\n");
                        if (tb_wowlan[NL80211_WOWLAN_TRIG_PKT_PATTERN]) {
+                               unsigned int len = nla_len(tb_wowlan[NL80211_WOWLAN_TRIG_PKT_PATTERN]);
+
                                pat = nla_data(tb_wowlan[NL80211_WOWLAN_TRIG_PKT_PATTERN]);
                                printf("\t\t * wake up on pattern match, up to %u patterns of %u-%u bytes,\n"
                                        "\t\t   maximum packet offset %u bytes\n",
                                        pat->max_patterns, pat->min_pattern_len, pat->max_pattern_len,
-                                       (nla_len(tb_wowlan[NL80211_WOWLAN_TRIG_PKT_PATTERN]) <
-                                       sizeof(*pat)) ? 0 : pat->max_pkt_offset);
+                                       len < sizeof(*pat) ? 0 : pat->max_pkt_offset);
                        }
                        if (tb_wowlan[NL80211_WOWLAN_TRIG_GTK_REKEY_SUPPORTED])
                                printf("\t\t * can do GTK rekeying\n");
@@ -466,6 +507,9 @@ broken_combination:
                                printf("\t\t * wake up on 4-way handshake\n");
                        if (tb_wowlan[NL80211_WOWLAN_TRIG_RFKILL_RELEASE])
                                printf("\t\t * wake up on rfkill release\n");
+                       if (tb_wowlan[NL80211_WOWLAN_TRIG_NET_DETECT])
+                               printf("\t\t * wake up on network detection, up to %d match sets\n",
+                                      nla_get_u32(tb_wowlan[NL80211_WOWLAN_TRIG_NET_DETECT]));
                        if (tb_wowlan[NL80211_WOWLAN_TRIG_TCP_CONNECTION])
                                printf("\t\t * wake up on TCP connection\n");
                }
@@ -479,8 +523,10 @@ broken_combination:
 
        if (tb_msg[NL80211_ATTR_HT_CAPABILITY_MASK]) {
                struct ieee80211_ht_cap *cm;
+               unsigned int len = nla_len(tb_msg[NL80211_ATTR_HT_CAPABILITY_MASK]);
+
                printf("\tHT Capability overrides:\n");
-               if (nla_len(tb_msg[NL80211_ATTR_HT_CAPABILITY_MASK]) >= sizeof(*cm)) {
+               if (len >= sizeof(*cm)) {
                        cm = nla_data(tb_msg[NL80211_ATTR_HT_CAPABILITY_MASK]);
                        printf("\t\t * MCS: %02hhx %02hhx %02hhx %02hhx %02hhx %02hhx"
                               " %02hhx %02hhx %02hhx %02hhx\n",
@@ -519,41 +565,186 @@ broken_combination:
                        printf("\tDevice accepts cell base station regulatory hints.\n");
                if (features & NL80211_FEATURE_P2P_DEVICE_NEEDS_CHANNEL)
                        printf("\tP2P Device uses a channel (of the concurrent ones)\n");
+               if (features & NL80211_FEATURE_SAE)
+                       printf("\tDevice supports SAE with AUTHENTICATE command\n");
                if (features & NL80211_FEATURE_LOW_PRIORITY_SCAN)
                        printf("\tDevice supports low priority scan.\n");
                if (features & NL80211_FEATURE_SCAN_FLUSH)
                        printf("\tDevice supports scan flush.\n");
                if (features & NL80211_FEATURE_AP_SCAN)
                        printf("\tDevice supports AP scan.\n");
+               if (features & NL80211_FEATURE_VIF_TXPOWER)
+                       printf("\tDevice supports per-vif TX power setting\n");
+               if (features & NL80211_FEATURE_NEED_OBSS_SCAN)
+                       printf("\tUserspace should do OBSS scan and generate 20/40 coex reports\n");
+               if (features & NL80211_FEATURE_P2P_GO_CTWIN)
+                       printf("\tP2P GO supports CT window setting\n");
+               if (features & NL80211_FEATURE_P2P_GO_OPPPS)
+                       printf("\tP2P GO supports opportunistic powersave setting\n");
+               if (features & NL80211_FEATURE_FULL_AP_CLIENT_STATE)
+                       printf("\tDriver supports full state transitions for AP/GO clients\n");
+               if (features & NL80211_FEATURE_USERSPACE_MPM)
+                       printf("\tDriver supports a userspace MPM\n");
+               if (features & NL80211_FEATURE_ACTIVE_MONITOR)
+                       printf("\tDevice supports active monitor (which will ACK incoming frames)\n");
+               if (features & NL80211_FEATURE_AP_MODE_CHAN_WIDTH_CHANGE)
+                       printf("\tDriver/device bandwidth changes during BSS lifetime (AP/GO mode)\n");
+               if (features & NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES)
+                       printf("\tDevice adds DS IE to probe requests\n");
+               if (features & NL80211_FEATURE_WFA_TPC_IE_IN_PROBES)
+                       printf("\tDevice adds WFA TPC Report IE to probe requests\n");
+               if (features & NL80211_FEATURE_QUIET)
+                       printf("\tDevice supports quiet requests from AP\n");
+               if (features & NL80211_FEATURE_TX_POWER_INSERTION)
+                       printf("\tDevice can update TPC Report IE\n");
+               if (features & NL80211_FEATURE_ACKTO_ESTIMATION)
+                       printf("\tDevice supports ACK timeout estimation.\n");
+               if (features & NL80211_FEATURE_STATIC_SMPS)
+                       printf("\tDevice supports static SMPS\n");
+               if (features & NL80211_FEATURE_DYNAMIC_SMPS)
+                       printf("\tDevice supports dynamic SMPS\n");
+               if (features & NL80211_FEATURE_SUPPORTS_WMM_ADMISSION)
+                       printf("\tDevice supports WMM-AC admission (TSPECs)\n");
+               if (features & NL80211_FEATURE_MAC_ON_CREATE)
+                       printf("\tDevice supports configuring vdev MAC-addr on create.\n");
+               if (features & NL80211_FEATURE_TDLS_CHANNEL_SWITCH)
+                       printf("\tDevice supports TDLS channel switching\n");
+               if (features & NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR)
+                       printf("\tDevice supports randomizing MAC-addr in scans.\n");
+               if (features & NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR)
+                       printf("\tDevice supports randomizing MAC-addr in sched scans.\n");
+               if (features & NL80211_FEATURE_ND_RANDOM_MAC_ADDR)
+                       printf("\tDevice supports randomizing MAC-addr in net-detect scans.\n");
+       }
+
+       if (tb_msg[NL80211_ATTR_TDLS_SUPPORT])
+               printf("\tDevice supports T-DLS.\n");
+
+       if (tb_msg[NL80211_ATTR_EXT_FEATURES]) {
+               struct nlattr *tb = tb_msg[NL80211_ATTR_EXT_FEATURES];
+
+               printf("\tSupported extended features:\n");
+
+               ext_feat_print(tb, NL80211_EXT_FEATURE_VHT_IBSS,
+                              "VHT_IBSS", "VHT-IBSS");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_RRM,
+                              "RRM", "RRM");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_MU_MIMO_AIR_SNIFFER,
+                              "MU_MIMO_AIR_SNIFFER", "MU-MIMO sniffer");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_SCAN_START_TIME,
+                              "SCAN_START_TIME", "scan start timestamp");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_BSS_PARENT_TSF,
+                              "BSS_PARENT_TSF", "BSS last beacon/probe TSF");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_SET_SCAN_DWELL,
+                              "SET_SCAN_DWELL", "scan dwell setting");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_BEACON_RATE_LEGACY,
+                              "BEACON_RATE_LEGACY", "legacy beacon rate setting");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_BEACON_RATE_HT,
+                              "BEACON_RATE_HT", "HT beacon rate setting");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_BEACON_RATE_VHT,
+                              "BEACON_RATE_VHT", "VHT beacon rate setting");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_FILS_STA,
+                              "FILS_STA", "STA FILS (Fast Initial Link Setup)");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA,
+                              "MGMT_TX_RANDOM_TA",
+                              "randomized TA while not associated");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_MGMT_TX_RANDOM_TA_CONNECTED,
+                              "MGMT_TX_RANDOM_TA_CONNECTED",
+                              "randomized TA while associated");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_SCHED_SCAN_RELATIVE_RSSI,
+                              "SCHED_SCAN_RELATIVE_RSSI",
+                              "sched_scan for BSS with better RSSI report");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_CQM_RSSI_LIST,
+                              "CQM_RSSI_LIST",
+                              "multiple CQM_RSSI_THOLD records");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_FILS_SK_OFFLOAD,
+                              "FILS_SK_OFFLOAD",
+                              "FILS shared key authentication offload");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_PSK,
+                              "4WAY_HANDSHAKE_STA_PSK",
+                              "4-way handshake with PSK in station mode");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_4WAY_HANDSHAKE_STA_1X,
+                              "4WAY_HANDSHAKE_STA_1X",
+                              "4-way handshake with 802.1X in station mode");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_FILS_MAX_CHANNEL_TIME,
+                              "FILS_MAX_CHANNEL_TIME",
+                              "FILS max channel attribute override with dwell time");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_ACCEPT_BCAST_PROBE_RESP,
+                              "ACCEPT_BCAST_PROBE_RESP",
+                              "accepts broadcast probe response");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_OCE_PROBE_REQ_HIGH_TX_RATE,
+                              "OCE_PROBE_REQ_HIGH_TX_RATE",
+                              "probe request TX at high rate (at least 5.5Mbps)");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_OCE_PROBE_REQ_DEFERRAL_SUPPRESSION,
+                              "OCE_PROBE_REQ_DEFERRAL_SUPPRESSION",
+                              "probe request tx deferral and suppression");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_MFP_OPTIONAL,
+                              "MFP_OPTIONAL",
+                              "MFP_OPTIONAL value in ATTR_USE_MFP");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_LOW_SPAN_SCAN,
+                              "LOW_SPAN_SCAN", "low span scan");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_LOW_POWER_SCAN,
+                              "LOW_POWER_SCAN", "low power scan");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_HIGH_ACCURACY_SCAN,
+                              "HIGH_ACCURACY_SCAN", "high accuracy scan");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_DFS_OFFLOAD,
+                              "DFS_OFFLOAD", "DFS offload");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_CONTROL_PORT_OVER_NL80211,
+                              "CONTROL_PORT_OVER_NL80211",
+                              "control port over nl80211");
+               ext_feat_print(tb, NL80211_EXT_FEATURE_TXQS,
+                              "TXQS", "FQ-CoDel-enabled intermediate TXQs");
+       }
+
+       if (tb_msg[NL80211_ATTR_COALESCE_RULE]) {
+               struct nl80211_coalesce_rule_support *rule;
+               struct nl80211_pattern_support *pat;
+
+               printf("\tCoalesce support:\n");
+               rule = nla_data(tb_msg[NL80211_ATTR_COALESCE_RULE]);
+               pat = &rule->pat;
+               printf("\t\t * Maximum %u coalesce rules supported\n"
+                      "\t\t * Each rule contains upto %u patterns of %u-%u bytes,\n"
+                      "\t\t   maximum packet offset %u bytes\n"
+                      "\t\t * Maximum supported coalescing delay %u msecs\n",
+                       rule->max_rules, pat->max_patterns, pat->min_pattern_len,
+                       pat->max_pattern_len, pat->max_pkt_offset, rule->max_delay);
        }
 
        return NL_SKIP;
 }
 
+static bool nl80211_has_split_wiphy = false;
+
 static int handle_info(struct nl80211_state *state,
-                      struct nl_cb *cb,
                       struct nl_msg *msg,
                       int argc, char **argv,
                       enum id_input id)
 {
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_phy_handler, NULL);
-       /* kernels not supporting it will ignore this */
-       nla_put_flag(msg, NL80211_ATTR_SPLIT_WIPHY_DUMP);
+       char *feat_args[] = { "features", "-q" };
+       int err;
+
+       err = handle_cmd(state, II_NONE, 2, feat_args);
+       if (!err && nl80211_has_split_wiphy) {
+               nla_put_flag(msg, NL80211_ATTR_SPLIT_WIPHY_DUMP);
+               nlmsg_hdr(msg)->nlmsg_flags |= NLM_F_DUMP;
+       }
+
+       register_handler(print_phy_handler, NULL);
 
        return 0;
 }
-__COMMAND(NULL, info, "info", NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, 0, CIB_PHY, handle_info,
+__COMMAND(NULL, info, "info", NULL, NL80211_CMD_GET_WIPHY, 0, 0, CIB_PHY, handle_info,
         "Show capabilities for the specified wireless device.", NULL);
 TOPLEVEL(list, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info,
         "List all wireless devices and their capabilities.");
 TOPLEVEL(phy, NULL, NL80211_CMD_GET_WIPHY, NLM_F_DUMP, CIB_NONE, handle_info, NULL);
 
-static int handle_commands(struct nl80211_state *state,
-                          struct nl_cb *cb, struct nl_msg *msg,
+static int handle_commands(struct nl80211_state *state, struct nl_msg *msg,
                           int argc, char **argv, enum id_input id)
 {
        int i;
-       for (i = 1; i < NL80211_CMD_MAX; i++)
+       for (i = 1; i <= NL80211_CMD_MAX; i++)
                printf("%d (0x%x): %s\n", i, i, command_name(i));
        /* don't send netlink messages */
        return 2;
@@ -565,6 +756,8 @@ static int print_feature_handler(struct nl_msg *msg, void *arg)
 {
        struct nlattr *tb_msg[NL80211_ATTR_MAX + 1];
        struct genlmsghdr *gnlh = nlmsg_data(nlmsg_hdr(msg));
+       bool print = (unsigned long)arg;
+#define maybe_printf(...) do { if (print) printf(__VA_ARGS__); } while (0)
 
        nla_parse(tb_msg, NL80211_ATTR_MAX, genlmsg_attrdata(gnlh, 0),
                  genlmsg_attrlen(gnlh, 0), NULL);
@@ -572,21 +765,23 @@ static int print_feature_handler(struct nl_msg *msg, void *arg)
        if (tb_msg[NL80211_ATTR_PROTOCOL_FEATURES]) {
                uint32_t feat = nla_get_u32(tb_msg[NL80211_ATTR_PROTOCOL_FEATURES]);
 
-               printf("nl80211 features: 0x%x\n", feat);
-               if (feat & NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP)
-                       printf("\t* split wiphy dump\n");
+               maybe_printf("nl80211 features: 0x%x\n", feat);
+               if (feat & NL80211_PROTOCOL_FEATURE_SPLIT_WIPHY_DUMP) {
+                       maybe_printf("\t* split wiphy dump\n");
+                       nl80211_has_split_wiphy = true;
+               }
        }
 
        return NL_SKIP;
 }
 
-static int handle_features(struct nl80211_state *state,
-                          struct nl_cb *cb, struct nl_msg *msg,
+static int handle_features(struct nl80211_state *state, struct nl_msg *msg,
                           int argc, char **argv, enum id_input id)
 {
-       nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_feature_handler, NULL);
+       unsigned long print = argc == 0 || strcmp(argv[0], "-q");
+       register_handler(print_feature_handler, (void *)print);
        return 0;
 }
 
-TOPLEVEL(features, NULL, NL80211_CMD_GET_PROTOCOL_FEATURES, 0, CIB_NONE,
+TOPLEVEL(features, "", NL80211_CMD_GET_PROTOCOL_FEATURES, 0, CIB_NONE,
         handle_features, "");