dumalogiya
/
openwrt
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

iwinfo: add SR71-15 radio info, fix nl80211 channel/frequency reporting on some architectures

Browse Source 
SVN-Revision: 36417
v19.07.3_mercusys_ac12_duma
Jo-Philipp Wich 11 years ago
parent 2c78c1457b
commit a040ead1c5
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File

2
package/network/utils/iwinfo/Makefile
Unescape Escape View File

@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo PKG_NAME:=libiwinfo
PKG_RELEASE:=41 PKG_RELEASE:=42
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \

5
package/network/utils/iwinfo/src/iwinfo_lib.c
Unescape Escape View File

@ -361,8 +361,9 @@ const struct iwinfo_hardware_entry IWINFO_HARDWARE_ENTRIES[] = {
{ VENDOR_UBNT, "SR4C", 0x168c, 0x0013, 0x7777, 0x1004, 6, 0 }, { VENDOR_UBNT, "SR4C", 0x168c, 0x0013, 0x7777, 0x1004, 6, 0 },
{ VENDOR_UBNT, "SR5", 0x168c, 0x0013, 0x168c, 0x2042, 7, 0 }, { VENDOR_UBNT, "SR5", 0x168c, 0x0013, 0x168c, 0x2042, 7, 0 },
{ VENDOR_UBNT, "SR9", 0x168c, 0x0013, 0x7777, 0x2009, 12, -1500 }, { VENDOR_UBNT, "SR9", 0x168c, 0x0013, 0x7777, 0x2009, 12, -1500 },
{ VENDOR_UBNT, "SR71A", 0x168c, 0x0027, 0x168c, 0x2082, 10, 0 }, { VENDOR_UBNT, "SR71A", 0x168c, 0x0027, 0x168c, 0x2082, 7, 0 },
{ VENDOR_UBNT, "SR71", 0x168c, 0x0027, 0x0777, 0x4082, 10, 0 }, { VENDOR_UBNT, "SR71", 0x168c, 0x0027, 0x0777, 0x4082, 7, 0 },
{ VENDOR_UBNT, "SR71-15", 0x168c, 0x0029, 0x0777, 0x4005, 7, 0 },
#endif #endif
#ifdef USE_NL80211 #ifdef USE_NL80211
{ VENDOR_UBNT, "PicoStation M2", 0x168c, 0x002a, 0x0777, 0xe302, 12, 0 }, /* ToDo: confirm offset */ { VENDOR_UBNT, "PicoStation M2", 0x168c, 0x002a, 0x0777, 0xe302, 12, 0 }, /* ToDo: confirm offset */

5
package/network/utils/iwinfo/src/iwinfo_nl80211.c
Unescape Escape View File

@ -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; char *res, *channel;
struct nl80211_msg_conveyor *req; struct nl80211_msg_conveyor *req;
@ -963,8 +964,8 @@ int nl80211_get_frequency(const char *ifname, int *buf)
(res = nl80211_hostapd_info(ifname)) && (res = nl80211_hostapd_info(ifname)) &&
(channel = nl80211_getval(NULL, res, "channel"))) (channel = nl80211_getval(NULL, res, "channel")))
{ {
*buf = nl80211_channel2freq(atoi(channel), chn = atoi(channel);
nl80211_getval(NULL, res, "hw_mode")); *buf = nl80211_channel2freq(chn, nl80211_getval(NULL, res, "hw_mode"));
} }
else else
{ {

Write Preview
Loading…
Cancel
Save