diff options
| author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
|---|---|---|
| committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
| commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
| tree | 4140720b20e8d641c11da882010d6130a75fef21 /package/network/utils/iwinfo/src/include | |
| parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
| parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) | |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'package/network/utils/iwinfo/src/include')
| -rw-r--r-- | package/network/utils/iwinfo/src/include/iwinfo.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/package/network/utils/iwinfo/src/include/iwinfo.h b/package/network/utils/iwinfo/src/include/iwinfo.h index 868c10b35..0d92d8db1 100644 --- a/package/network/utils/iwinfo/src/include/iwinfo.h +++ b/package/network/utils/iwinfo/src/include/iwinfo.h @@ -50,11 +50,16 @@ 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, + IWINFO_OPMODE_UNKNOWN = 0, + IWINFO_OPMODE_MASTER = 1, + IWINFO_OPMODE_ADHOC = 2, + IWINFO_OPMODE_CLIENT = 3, + IWINFO_OPMODE_MONITOR = 4, + IWINFO_OPMODE_AP_VLAN = 5, + IWINFO_OPMODE_WDS = 6, + IWINFO_OPMODE_MESHPOINT = 7, + IWINFO_OPMODE_P2P_CLIENT = 8, + IWINFO_OPMODE_P2P_GO = 9, }; extern const char *IWINFO_OPMODE_NAMES[]; @@ -127,8 +132,8 @@ struct iwinfo_hardware_id { }; struct iwinfo_hardware_entry { - const char *vendor_name; - const char *device_name; + char vendor_name[64]; + char device_name[64]; uint16_t vendor_id; uint16_t device_id; uint16_t subsystem_vendor_id; @@ -138,7 +143,8 @@ struct iwinfo_hardware_entry { }; extern const struct iwinfo_iso3166_label IWINFO_ISO3166_NAMES[]; -extern const struct iwinfo_hardware_entry IWINFO_HARDWARE_ENTRIES[]; + +#define IWINFO_HARDWARE_FILE "/usr/share/libiwinfo/hardware.txt" struct iwinfo_ops { |