print wdev id in event info

[thirdparty/iw.git] / info.c

diff --git a/info.c b/info.c
index 0950bd1be87ff0333c1ace99a2bda50a6a2ce602..f039bba04981f348d4ef359d9bd1f4681fb3c0d2 100644 (file)
--- a/info.c
+++ b/info.c
@@ -36,6 +36,8 @@ static char *cipher_name(__u32 c)
                return "CCMP (00-0f-ac:4)";
        case 0x000fac06:
                return "CMAC (00-0f-ac:6)";
+       case 0x000fac08:
+               return "GCMP (00-0f-ac:8)";
        case 0x00147201:
                return "WPI-SMS4 (00-14-72:1)";
        default:
@@ -319,7 +321,7 @@ broken_combination:
                                if (!printed)
                                        printf("\t\t * %s:", iftype_name(nla_type(nl_if)));
                                printed = true;
-                               printf(" 0x%.4x", nla_get_u16(nl_ftype));
+                               printf(" 0x%.2x", nla_get_u16(nl_ftype));
                        }
                        if (printed)
                                printf("\n");
@@ -334,7 +336,7 @@ broken_combination:
                                if (!printed)
                                        printf("\t\t * %s:", iftype_name(nla_type(nl_if)));
                                printed = true;
-                               printf(" 0x%.4x", nla_get_u16(nl_ftype));
+                               printf(" 0x%.2x", nla_get_u16(nl_ftype));
                        }
                        if (printed)
                                printf("\n");
@@ -444,7 +446,8 @@ broken_combination:
 static int handle_info(struct nl80211_state *state,
                       struct nl_cb *cb,
                       struct nl_msg *msg,
-                      int argc, char **argv)
+                      int argc, char **argv,
+                      enum id_input id)
 {
        nl_cb_set(cb, NL_CB_VALID, NL_CB_CUSTOM, print_phy_handler, NULL);