iwinfo: expose txpower and frequency offset information

SVN-Revision: 29425

5 files changed, 110 insertions, 92 deletions

diff --git a/package/iwinfo/src/include/iwinfo.h b/package/iwinfo/src/include/iwinfo.h
index 86bf8b1b6d..198d57c9d2 100644
--- a/package/iwinfo/src/include/iwinfo.h
+++ b/package/iwinfo/src/include/iwinfo.h
@@ -120,7 +120,9 @@ extern const struct iwinfo_hardware_entry IWINFO_HARDWARE_ENTRIES[];
 struct iwinfo_ops {
 	int (*channel)(const char *, int *);
 	int (*frequency)(const char *, int *);
+	int (*frequency_offset)(const char *, int *);
 	int (*txpower)(const char *, int *);
+	int (*txpower_offset)(const char *, int *);
 	int (*bitrate)(const char *, int *);
 	int (*signal)(const char *, int *);
 	int (*noise)(const char *, int *);
diff --git a/package/iwinfo/src/include/iwinfo/madwifi.h b/package/iwinfo/src/include/iwinfo/madwifi.h
index ecbe749c8a..9acbc36460 100644
--- a/package/iwinfo/src/include/iwinfo/madwifi.h
+++ b/package/iwinfo/src/include/iwinfo/madwifi.h
@@ -32,7 +32,9 @@ int madwifi_get_bssid(const char *ifname, char *buf);
 int madwifi_get_country(const char *ifname, char *buf);
 int madwifi_get_channel(const char *ifname, int *buf);
 int madwifi_get_frequency(const char *ifname, int *buf);
+int madwifi_get_frequency_offset(const char *ifname, int *buf);
 int madwifi_get_txpower(const char *ifname, int *buf);
+int madwifi_get_txpower_offset(const char *ifname, int *buf);
 int madwifi_get_bitrate(const char *ifname, int *buf);
 int madwifi_get_signal(const char *ifname, int *buf);
 int madwifi_get_noise(const char *ifname, int *buf);
@@ -51,29 +53,31 @@ int madwifi_get_hardware_name(const char *ifname, char *buf);
 void madwifi_close(void);
 
 static const struct iwinfo_ops madwifi_ops = {
-	.channel        = madwifi_get_channel,
-	.frequency      = madwifi_get_frequency,
-	.txpower        = madwifi_get_txpower,
-	.bitrate        = madwifi_get_bitrate,
-	.signal         = madwifi_get_signal,
-	.noise          = madwifi_get_noise,
-	.quality        = madwifi_get_quality,
-	.quality_max    = madwifi_get_quality_max,
-	.mbssid_support = madwifi_get_mbssid_support,
-	.hwmodelist     = madwifi_get_hwmodelist,
-	.mode           = madwifi_get_mode,
-	.ssid           = madwifi_get_ssid,
-	.bssid          = madwifi_get_bssid,
-	.country        = madwifi_get_country,
-	.hardware_id    = madwifi_get_hardware_id,
-	.hardware_name  = madwifi_get_hardware_name,
-	.encryption     = madwifi_get_encryption,
-	.assoclist      = madwifi_get_assoclist,
-	.txpwrlist      = madwifi_get_txpwrlist,
-	.scanlist       = madwifi_get_scanlist,
-	.freqlist       = madwifi_get_freqlist,
-	.countrylist    = madwifi_get_countrylist,
-	.close          = madwifi_close
+	.channel          = madwifi_get_channel,
+	.frequency        = madwifi_get_frequency,
+	.frequency_offset = madwifi_get_frequency_offset,
+	.txpower          = madwifi_get_txpower,
+	.txpower_offset   = madwifi_get_txpower_offset,
+	.bitrate          = madwifi_get_bitrate,
+	.signal           = madwifi_get_signal,
+	.noise            = madwifi_get_noise,
+	.quality          = madwifi_get_quality,
+	.quality_max      = madwifi_get_quality_max,
+	.mbssid_support   = madwifi_get_mbssid_support,
+	.hwmodelist       = madwifi_get_hwmodelist,
+	.mode             = madwifi_get_mode,
+	.ssid             = madwifi_get_ssid,
+	.bssid            = madwifi_get_bssid,
+	.country          = madwifi_get_country,
+	.hardware_id      = madwifi_get_hardware_id,
+	.hardware_name    = madwifi_get_hardware_name,
+	.encryption       = madwifi_get_encryption,
+	.assoclist        = madwifi_get_assoclist,
+	.txpwrlist        = madwifi_get_txpwrlist,
+	.scanlist         = madwifi_get_scanlist,
+	.freqlist         = madwifi_get_freqlist,
+	.countrylist      = madwifi_get_countrylist,
+	.close            = madwifi_close
 };
 
 #endif
diff --git a/package/iwinfo/src/include/iwinfo/nl80211.h b/package/iwinfo/src/include/iwinfo/nl80211.h
index 3df25d34b4..fd0ddb43ab 100644
--- a/package/iwinfo/src/include/iwinfo/nl80211.h
+++ b/package/iwinfo/src/include/iwinfo/nl80211.h
@@ -63,7 +63,9 @@ int nl80211_get_bssid(const char *ifname, char *buf);
 int nl80211_get_country(const char *ifname, char *buf);
 int nl80211_get_channel(const char *ifname, int *buf);
 int nl80211_get_frequency(const char *ifname, int *buf);
+int nl80211_get_frequency_offset(const char *ifname, int *buf);
 int nl80211_get_txpower(const char *ifname, int *buf);
+int nl80211_get_txpower_offset(const char *ifname, int *buf);
 int nl80211_get_bitrate(const char *ifname, int *buf);
 int nl80211_get_signal(const char *ifname, int *buf);
 int nl80211_get_noise(const char *ifname, int *buf);
@@ -82,29 +84,31 @@ int nl80211_get_hardware_name(const char *ifname, char *buf);
 void nl80211_close(void);
 
 static const struct iwinfo_ops nl80211_ops = {
-	.channel        = nl80211_get_channel,
-	.frequency      = nl80211_get_frequency,
-	.txpower        = nl80211_get_txpower,
-	.bitrate        = nl80211_get_bitrate,
-	.signal         = nl80211_get_signal,
-	.noise          = nl80211_get_noise,
-	.quality        = nl80211_get_quality,
-	.quality_max    = nl80211_get_quality_max,
-	.mbssid_support = nl80211_get_mbssid_support,
-	.hwmodelist     = nl80211_get_hwmodelist,
-	.mode           = nl80211_get_mode,
-	.ssid           = nl80211_get_ssid,
-	.bssid          = nl80211_get_bssid,
-	.country        = nl80211_get_country,
-	.hardware_id    = nl80211_get_hardware_id,
-	.hardware_name  = nl80211_get_hardware_name,
-	.encryption     = nl80211_get_encryption,
-	.assoclist      = nl80211_get_assoclist,
-	.txpwrlist      = nl80211_get_txpwrlist,
-	.scanlist       = nl80211_get_scanlist,
-	.freqlist       = nl80211_get_freqlist,
-	.countrylist    = nl80211_get_countrylist,
-	.close          = nl80211_close
+	.channel          = nl80211_get_channel,
+	.frequency        = nl80211_get_frequency,
+	.frequency_offset = nl80211_get_frequency_offset,
+	.txpower          = nl80211_get_txpower,
+	.txpower_offset   = nl80211_get_txpower_offset,
+	.bitrate          = nl80211_get_bitrate,
+	.signal           = nl80211_get_signal,
+	.noise            = nl80211_get_noise,
+	.quality          = nl80211_get_quality,
+	.quality_max      = nl80211_get_quality_max,
+	.mbssid_support   = nl80211_get_mbssid_support,
+	.hwmodelist       = nl80211_get_hwmodelist,
+	.mode             = nl80211_get_mode,
+	.ssid             = nl80211_get_ssid,
+	.bssid            = nl80211_get_bssid,
+	.country          = nl80211_get_country,
+	.hardware_id      = nl80211_get_hardware_id,
+	.hardware_name    = nl80211_get_hardware_name,
+	.encryption       = nl80211_get_encryption,
+	.assoclist        = nl80211_get_assoclist,
+	.txpwrlist        = nl80211_get_txpwrlist,
+	.scanlist         = nl80211_get_scanlist,
+	.freqlist         = nl80211_get_freqlist,
+	.countrylist      = nl80211_get_countrylist,
+	.close            = nl80211_close
 };
 
 #endif
diff --git a/package/iwinfo/src/include/iwinfo/wext.h b/package/iwinfo/src/include/iwinfo/wext.h
index 4d2f4aa0a2..8412ef39b3 100644
--- a/package/iwinfo/src/include/iwinfo/wext.h
+++ b/package/iwinfo/src/include/iwinfo/wext.h
@@ -33,7 +33,9 @@ int wext_get_bssid(const char *ifname, char *buf);
 int wext_get_country(const char *ifname, char *buf);
 int wext_get_channel(const char *ifname, int *buf);
 int wext_get_frequency(const char *ifname, int *buf);
+int wext_get_frequency_offset(const char *ifname, int *buf);
 int wext_get_txpower(const char *ifname, int *buf);
+int wext_get_txpower_offset(const char *ifname, int *buf);
 int wext_get_bitrate(const char *ifname, int *buf);
 int wext_get_signal(const char *ifname, int *buf);
 int wext_get_noise(const char *ifname, int *buf);
@@ -52,29 +54,31 @@ int wext_get_hardware_name(const char *ifname, char *buf);
 void wext_close(void);
 
 static const struct iwinfo_ops wext_ops = {
-	.channel        = wext_get_channel,
-	.frequency      = wext_get_frequency,
-	.txpower        = wext_get_txpower,
-	.bitrate        = wext_get_bitrate,
-	.signal         = wext_get_signal,
-	.noise          = wext_get_noise,
-	.quality        = wext_get_quality,
-	.quality_max    = wext_get_quality_max,
-	.mbssid_support = wext_get_mbssid_support,
-	.hwmodelist     = wext_get_hwmodelist,
-	.mode           = wext_get_mode,
-	.ssid           = wext_get_ssid,
-	.bssid          = wext_get_bssid,
-	.country        = wext_get_country,
-	.hardware_id    = wext_get_hardware_id,
-	.hardware_name  = wext_get_hardware_name,
-	.encryption     = wext_get_encryption,
-	.assoclist      = wext_get_assoclist,
-	.txpwrlist      = wext_get_txpwrlist,
-	.scanlist       = wext_get_scanlist,
-	.freqlist       = wext_get_freqlist,
-	.countrylist    = wext_get_countrylist,
-	.close          = wext_close
+	.channel          = wext_get_channel,
+	.frequency        = wext_get_frequency,
+	.frequency_offset = wext_get_frequency_offset,
+	.txpower          = wext_get_txpower,
+	.txpower_offset   = wext_get_txpower_offset,
+	.bitrate          = wext_get_bitrate,
+	.signal           = wext_get_signal,
+	.noise            = wext_get_noise,
+	.quality          = wext_get_quality,
+	.quality_max      = wext_get_quality_max,
+	.mbssid_support   = wext_get_mbssid_support,
+	.hwmodelist       = wext_get_hwmodelist,
+	.mode             = wext_get_mode,
+	.ssid             = wext_get_ssid,
+	.bssid            = wext_get_bssid,
+	.country          = wext_get_country,
+	.hardware_id      = wext_get_hardware_id,
+	.hardware_name    = wext_get_hardware_name,
+	.encryption       = wext_get_encryption,
+	.assoclist        = wext_get_assoclist,
+	.txpwrlist        = wext_get_txpwrlist,
+	.scanlist         = wext_get_scanlist,
+	.freqlist         = wext_get_freqlist,
+	.countrylist      = wext_get_countrylist,
+	.close            = wext_close
 };
 
 #endif
diff --git a/package/iwinfo/src/include/iwinfo/wl.h b/package/iwinfo/src/include/iwinfo/wl.h
index 10be96aeb9..47dda47102 100644
--- a/package/iwinfo/src/include/iwinfo/wl.h
+++ b/package/iwinfo/src/include/iwinfo/wl.h
@@ -32,7 +32,9 @@ int wl_get_bssid(const char *ifname, char *buf);
 int wl_get_country(const char *ifname, char *buf);
 int wl_get_channel(const char *ifname, int *buf);
 int wl_get_frequency(const char *ifname, int *buf);
+int wl_get_frequency_offset(const char *ifname, int *buf);
 int wl_get_txpower(const char *ifname, int *buf);
+int wl_get_txpower_offset(const char *ifname, int *buf);
 int wl_get_bitrate(const char *ifname, int *buf);
 int wl_get_signal(const char *ifname, int *buf);
 int wl_get_noise(const char *ifname, int *buf);
@@ -52,29 +54,31 @@ int wl_get_hardware_name(const char *ifname, char *buf);
 void wl_close(void);
 
 static const struct iwinfo_ops wl_ops = {
-	.channel        = wl_get_channel,
-	.frequency      = wl_get_frequency,
-	.txpower        = wl_get_txpower,
-	.bitrate        = wl_get_bitrate,
-	.signal         = wl_get_signal,
-	.noise          = wl_get_noise,
-	.quality        = wl_get_quality,
-	.quality_max    = wl_get_quality_max,
-	.mbssid_support = wl_get_mbssid_support,
-	.hwmodelist     = wl_get_hwmodelist,
-	.mode           = wl_get_mode,
-	.ssid           = wl_get_ssid,
-	.bssid          = wl_get_bssid,
-	.country        = wl_get_country,
-	.hardware_id    = wl_get_hardware_id,
-	.hardware_name  = wl_get_hardware_name,
-	.encryption     = wl_get_encryption,
-	.assoclist      = wl_get_assoclist,
-	.txpwrlist      = wl_get_txpwrlist,
-	.scanlist       = wl_get_scanlist,
-	.freqlist       = wl_get_freqlist,
-	.countrylist    = wl_get_countrylist,
-	.close          = wl_close
+	.channel          = wl_get_channel,
+	.frequency        = wl_get_frequency,
+	.frequency_offset = wl_get_frequency_offset,
+	.txpower          = wl_get_txpower,
+	.txpower_offset   = wl_get_txpower_offset,
+	.bitrate          = wl_get_bitrate,
+	.signal           = wl_get_signal,
+	.noise            = wl_get_noise,
+	.quality          = wl_get_quality,
+	.quality_max      = wl_get_quality_max,
+	.mbssid_support   = wl_get_mbssid_support,
+	.hwmodelist       = wl_get_hwmodelist,
+	.mode             = wl_get_mode,
+	.ssid             = wl_get_ssid,
+	.bssid            = wl_get_bssid,
+	.country          = wl_get_country,
+	.hardware_id      = wl_get_hardware_id,
+	.hardware_name    = wl_get_hardware_name,
+	.encryption       = wl_get_encryption,
+	.assoclist        = wl_get_assoclist,
+	.txpwrlist        = wl_get_txpwrlist,
+	.scanlist         = wl_get_scanlist,
+	.freqlist         = wl_get_freqlist,
+	.countrylist      = wl_get_countrylist,
+	.close            = wl_close
 };
 
 #endif