diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2013-04-24 14:44:20 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2013-04-24 14:44:20 +0000 |
| commit | a040ead1c533957cacf4dd7e4bfb397165cc9de7 (patch) | |
| tree | 8447be6aca6629474f68014287f8a5e07eb9d12d | |
| parent | 2c78c1457b2a0f44dd295bbf5fc7c6e6465409a5 (diff) | |
| download | upstream-a040ead1c533957cacf4dd7e4bfb397165cc9de7.tar.gz upstream-a040ead1c533957cacf4dd7e4bfb397165cc9de7.tar.bz2 upstream-a040ead1c533957cacf4dd7e4bfb397165cc9de7.zip | |
iwinfo: add SR71-15 radio info, fix nl80211 channel/frequency reporting on some architectures
SVN-Revision: 36417
| -rw-r--r-- | package/network/utils/iwinfo/Makefile | 2 | ||||
| -rw-r--r-- | package/network/utils/iwinfo/src/iwinfo_lib.c | 5 | ||||
| -rw-r--r-- | package/network/utils/iwinfo/src/iwinfo_nl80211.c | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 8b103ebb57..d650c0d025 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libiwinfo -PKG_RELEASE:=41 +PKG_RELEASE:=42 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_CONFIG_DEPENDS := \ diff --git a/package/network/utils/iwinfo/src/iwinfo_lib.c b/package/network/utils/iwinfo/src/iwinfo_lib.c index e943546e7b..368f0cf312 100644 --- a/package/network/utils/iwinfo/src/iwinfo_lib.c +++ b/package/network/utils/iwinfo/src/iwinfo_lib.c @@ -361,8 +361,9 @@ const struct iwinfo_hardware_entry IWINFO_HARDWARE_ENTRIES[] = { { VENDOR_UBNT, "SR4C", 0x168c, 0x0013, 0x7777, 0x1004, 6, 0 }, { VENDOR_UBNT, "SR5", 0x168c, 0x0013, 0x168c, 0x2042, 7, 0 }, { VENDOR_UBNT, "SR9", 0x168c, 0x0013, 0x7777, 0x2009, 12, -1500 }, - { VENDOR_UBNT, "SR71A", 0x168c, 0x0027, 0x168c, 0x2082, 10, 0 }, - { VENDOR_UBNT, "SR71", 0x168c, 0x0027, 0x0777, 0x4082, 10, 0 }, + { VENDOR_UBNT, "SR71A", 0x168c, 0x0027, 0x168c, 0x2082, 7, 0 }, + { VENDOR_UBNT, "SR71", 0x168c, 0x0027, 0x0777, 0x4082, 7, 0 }, + { VENDOR_UBNT, "SR71-15", 0x168c, 0x0029, 0x0777, 0x4005, 7, 0 }, #endif #ifdef USE_NL80211 { VENDOR_UBNT, "PicoStation M2", 0x168c, 0x002a, 0x0777, 0xe302, 12, 0 }, /* ToDo: confirm offset */ diff --git a/package/network/utils/iwinfo/src/iwinfo_nl80211.c b/package/network/utils/iwinfo/src/iwinfo_nl80211.c index 2a2bb66dfe..dd619e2d6f 100644 --- a/package/network/utils/iwinfo/src/iwinfo_nl80211.c +++ b/package/network/utils/iwinfo/src/iwinfo_nl80211.c @@ -944,6 +944,7 @@ static int nl80211_get_frequency_info_cb(struct nl_msg *msg, void *arg) int nl80211_get_frequency(const char *ifname, int *buf) { + int chn; char *res, *channel; struct nl80211_msg_conveyor *req; @@ -963,8 +964,8 @@ int nl80211_get_frequency(const char *ifname, int *buf) (res = nl80211_hostapd_info(ifname)) && (channel = nl80211_getval(NULL, res, "channel"))) { - *buf = nl80211_channel2freq(atoi(channel), - nl80211_getval(NULL, res, "hw_mode")); + chn = atoi(channel); + *buf = nl80211_channel2freq(chn, nl80211_getval(NULL, res, "hw_mode")); } else { |