kernel: update linux 3.2 to 3.2.9

[openwrt.git] / package / iwinfo / src / include / iwinfo.h

diff --git a/package/iwinfo/src/include/iwinfo.h b/package/iwinfo/src/include/iwinfo.h
index 72e2333..9e78bab 100644 (file)
--- a/package/iwinfo/src/include/iwinfo.h
+++ b/package/iwinfo/src/include/iwinfo.h
@@ -49,9 +49,20 @@ extern const char *IWINFO_KMGMT_NAMES[];
 extern const char *IWINFO_AUTH_NAMES[];
 
 
+enum iwinfo_opmode {
+       IWINFO_OPMODE_UNKNOWN = 0,
+       IWINFO_OPMODE_MASTER  = 1,
+       IWINFO_OPMODE_ADHOC   = 2,
+       IWINFO_OPMODE_CLIENT  = 3,
+       IWINFO_OPMODE_MONITOR = 4,
+};
+
+extern const char *IWINFO_OPMODE_NAMES[];
+
+
 struct iwinfo_rate_entry {
        uint16_t rate;
-       uint8_t mcs;
+       int8_t mcs;
        uint8_t is_40mhz:1;
        uint8_t is_short_gi:1;
 };
@@ -90,7 +101,7 @@ struct iwinfo_crypto_entry {
 struct iwinfo_scanlist_entry {
        uint8_t mac[6];
        uint8_t ssid[IWINFO_ESSID_MAX_SIZE+1];
-       uint8_t mode[8];
+       enum iwinfo_opmode mode;
        uint8_t channel;
        uint8_t signal;
        uint8_t quality;
@@ -131,6 +142,7 @@ extern const struct iwinfo_hardware_entry IWINFO_HARDWARE_ENTRIES[];
 
 
 struct iwinfo_ops {
+       int (*mode)(const char *, int *);
        int (*channel)(const char *, int *);
        int (*frequency)(const char *, int *);
        int (*frequency_offset)(const char *, int *);
@@ -143,7 +155,6 @@ struct iwinfo_ops {
        int (*quality_max)(const char *, int *);
        int (*mbssid_support)(const char *, int *);
        int (*hwmodelist)(const char *, int *);
-       int (*mode)(const char *, char *);
        int (*ssid)(const char *, char *);
        int (*bssid)(const char *, char *);
        int (*country)(const char *, char *);