From 3a50bcc184059d40e8b3b7f84fc76c0dac0099d5 Mon Sep 17 00:00:00 2001 From: jow Date: Wed, 2 Jan 2013 19:10:29 +0000 Subject: iwinfo: replace more wext calls with nl80211 equivalents, attempt to infer nl80211 tx power from debugfs before querying wext git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34982 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/utils/iwinfo/src/include/iwinfo.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'package/network/utils/iwinfo/src/include') diff --git a/package/network/utils/iwinfo/src/include/iwinfo.h b/package/network/utils/iwinfo/src/include/iwinfo.h index 868c10b35..bf7d61896 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[]; -- cgit v1.2.3 From 7e49a98eed7f81bb50482735b629f371122aa51c Mon Sep 17 00:00:00 2001 From: jow Date: Fri, 26 Apr 2013 13:20:15 +0000 Subject: iwinfo: move builtin hardware database to /usr/share/libiwinfo/hardware.txt git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36449 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/network/utils/iwinfo/src/include/iwinfo.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'package/network/utils/iwinfo/src/include') diff --git a/package/network/utils/iwinfo/src/include/iwinfo.h b/package/network/utils/iwinfo/src/include/iwinfo.h index bf7d61896..0d92d8db1 100644 --- a/package/network/utils/iwinfo/src/include/iwinfo.h +++ b/package/network/utils/iwinfo/src/include/iwinfo.h @@ -132,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; @@ -143,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 { -- cgit v1.2.3