[package] iwinfo: factor txpower offset into info display output, recompile if driver...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@29634 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/iwinfo/Makefile b/package/iwinfo/Makefile
index f69b86e..55a0889 100644 (file)
--- a/package/iwinfo/Makefile
+++ b/package/iwinfo/Makefile
@@ -7,9 +7,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiwinfo
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libiwinfo

-PKG_RELEASE:=21
+PKG_RELEASE:=22

 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 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
 
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/package/iwinfo/src/iwinfo_cli.c b/package/iwinfo/src/iwinfo_cli.c
index 4f8f561..d60d7b8 100644 (file)
--- 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)
 {
 
 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;
        if (iw->txpower(ifname, &pwr))
                pwr = -1;

+       else
+               pwr += off;

 
        return format_txpower(pwr);
 }
 
        return format_txpower(pwr);
 }