Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iwinfo: fix frequency/channel and channel/frequency conversions to properly implement 802.11j

Browse source 
SVN-Revision: 36292
This commit is contained in:
Jo-Philipp Wich 2013-04-09 14:37:55 +00:00
parent 9f21b979f4
commit 7ca7bc501e
2 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/utils/iwinfo/Makefile
View file

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

25
package/network/utils/iwinfo/src/iwinfo_nl80211.c
View file

@ -346,23 +346,30 @@ static int nl80211_freq2channel(int freq)
{ {
if (freq == 2484) if (freq == 2484)
return 14; return 14;
else if (freq < 2484)
if (freq < 2484)
return (freq - 2407) / 5; return (freq - 2407) / 5;
else if (freq >= 4910 && freq <= 4980)
return (freq / 5) - 1000; return (freq - 4000) / 5;
else
return (freq - 5000) / 5;
} }
static int nl80211_channel2freq(int channel, const char *band) static int nl80211_channel2freq(int channel, const char *band)
{
if (!band || band[0] != 'a')
{ {
if (channel == 14) if (channel == 14)
return 2484; return 2484;
else if (channel < 14)
if ((channel < 14) && (!band || band[0] != 'a'))
return (channel * 5) + 2407; return (channel * 5) + 2407;
}
if (channel > 0) else
return (1000 + channel) * 5; {
if (channel >= 182 && channel <= 196)
return (channel * 5) + 4000;
else
return (channel * 5) + 5000;
}
return 0; return 0;
} }