summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-01 16:17:10 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-01-01 16:17:10 +0000
commit3329b43e7655951c4b496eb7c24b2af096fcbef7 (patch)
tree221fc4a8bc361611ee3dc068c07bfc210a6f216f
parente2b9e1a026996e7ee14c4104c49587056ff4027f (diff)
[package] iwinfo: factor txpower offset into info display output, recompile if driver selection changes
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29634 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/iwinfo/Makefile8
-rw-r--r--package/iwinfo/src/iwinfo_cli.c7
2 files changed, 13 insertions, 2 deletions
diff --git a/package/iwinfo/Makefile b/package/iwinfo/Makefile
index f69b86e8f..55a088960 100644
--- a/package/iwinfo/Makefile
+++ b/package/iwinfo/Makefile
@@ -7,9 +7,15 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo
-PKG_RELEASE:=21
+PKG_RELEASE:=22
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_CONFIG_DEPENDS := \
+ CONFIG_PACKAGE_kmod-brcm-wl \
+ CONFIG_PACKAGE_kmod-brcm-wl-mini \
+ CONFIG_PACKAGE_kmod-brcm-wl-mimo \
+ CONFIG_PACKAGE_kmod-madwifi \
+ CONFIG_PACKAGE_kmod-mac80211
include $(INCLUDE_DIR)/package.mk
diff --git a/package/iwinfo/src/iwinfo_cli.c b/package/iwinfo/src/iwinfo_cli.c
index 4f8f5612c..d60d7b8d9 100644
--- a/package/iwinfo/src/iwinfo_cli.c
+++ b/package/iwinfo/src/iwinfo_cli.c
@@ -391,9 +391,14 @@ static char * print_frequency(const struct iwinfo_ops *iw, const char *ifname)
static char * print_txpower(const struct iwinfo_ops *iw, const char *ifname)
{
- int pwr;
+ int pwr, off;
+ if (iw->txpower_offset(ifname, &off))
+ off = 0;
+
if (iw->txpower(ifname, &pwr))
pwr = -1;
+ else
+ pwr += off;
return format_txpower(pwr);
}