diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-04-27 09:45:06 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-04-27 09:45:06 +0000 |
| commit | acd03cf8d8c3a047108b7983944b0c8d0228f812 (patch) | |
| tree | 2825e0cb2ae9d5cb7d1659d82aca130412df80ad /package/iwinfo/src/include/iwinfo.h | |
| parent | 344bc0ebcac126e43235d1bb4f719ff1794fe794 (diff) | |
| download | upstream-acd03cf8d8c3a047108b7983944b0c8d0228f812.tar.gz upstream-acd03cf8d8c3a047108b7983944b0c8d0228f812.tar.bz2 upstream-acd03cf8d8c3a047108b7983944b0c8d0228f812.zip | |
AA: iwinfo: merge r34982, r35005, r35007, r35471, r36292, r36339, r36417, r36449, r36450
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@36465 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/iwinfo/src/include/iwinfo.h')
| -rw-r--r-- | package/iwinfo/src/include/iwinfo.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/package/iwinfo/src/include/iwinfo.h b/package/iwinfo/src/include/iwinfo.h index 868c10b359..0d92d8db1e 100644 --- a/package/iwinfo/src/include/iwinfo.h +++ b/package/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 { |