projects
/
openwrt
/
openwrt.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2c78c14
)
iwinfo: add SR71-15 radio info, fix nl80211 channel/frequency reporting on some archi...
author
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 24 Apr 2013 14:44:20 +0000
(14:44 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Wed, 24 Apr 2013 14:44:20 +0000
(14:44 +0000)
SVN-Revision: 36417
package/network/utils/iwinfo/Makefile
patch
|
blob
|
history
package/network/utils/iwinfo/src/iwinfo_lib.c
patch
|
blob
|
history
package/network/utils/iwinfo/src/iwinfo_nl80211.c
patch
|
blob
|
history
diff --git
a/package/network/utils/iwinfo/Makefile
b/package/network/utils/iwinfo/Makefile
index 8b103ebb57fd64ab8488ffa6070d07291aea18a6..d650c0d025f5031c9f9ba9c4ad08f833025bde1f 100644
(file)
--- a/
package/network/utils/iwinfo/Makefile
+++ b/
package/network/utils/iwinfo/Makefile
@@
-7,7
+7,7
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo
include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo
-PKG_RELEASE:=4
1
+PKG_RELEASE:=4
2
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \
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 e943546e7b8f7d245095ef740b32a3bfe92ea1bf..368f0cf312bcafed7c091d9b550678c28e685a13 100644
(file)
--- 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, "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 */
#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 2a2bb66dfeba3f240d4dd4e4defa8ff525991bb6..dd619e2d6f294053dc542d0faaee48f66ad9af04 100644
(file)
--- 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 nl80211_get_frequency(const char *ifname, int *buf)
{
+ int chn;
char *res, *channel;
struct nl80211_msg_conveyor *req;
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")))
{
(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
{
}
else
{