From 7ca7bc501e15282d4fac3719052731113afcece1 Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 9 Apr 2013 14:37:55 +0000
Subject: iwinfo: fix frequency/channel and channel/frequency conversions to
 properly implement 802.11j

SVN-Revision: 36292
---
 package/network/utils/iwinfo/Makefile             |  2 +-
 package/network/utils/iwinfo/src/iwinfo_nl80211.c | 31 ++++++++++++++---------
 2 files changed, 20 insertions(+), 13 deletions(-)

(limited to 'package')

diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile
index f8a92dac4b..23f3f38cb4 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:=39
+PKG_RELEASE:=40
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 PKG_CONFIG_DEPENDS := \
diff --git a/package/network/utils/iwinfo/src/iwinfo_nl80211.c b/package/network/utils/iwinfo/src/iwinfo_nl80211.c
index 819845ad1d..2a2bb66dfe 100644
--- a/package/network/utils/iwinfo/src/iwinfo_nl80211.c
+++ b/package/network/utils/iwinfo/src/iwinfo_nl80211.c
@@ -346,23 +346,30 @@ static int nl80211_freq2channel(int freq)
 {
 	if (freq == 2484)
 		return 14;
-
-	if (freq < 2484)
+	else if (freq < 2484)
 		return (freq - 2407) / 5;
-
-	return (freq / 5) - 1000;
+	else if (freq >= 4910 && freq <= 4980)
+		return (freq - 4000) / 5;
+	else
+		return (freq - 5000) / 5;
 }
 
 static int nl80211_channel2freq(int channel, const char *band)
 {
-	if (channel == 14)
-		return 2484;
-
-	if ((channel < 14) && (!band || band[0] != 'a'))
-		return (channel * 5) + 2407;
-
-	if (channel > 0)
-		return (1000 + channel) * 5;
+	if (!band || band[0] != 'a')
+	{
+		if (channel == 14)
+			return 2484;
+		else if (channel < 14)
+			return (channel * 5) + 2407;
+	}
+	else
+	{
+		if (channel >= 182 && channel <= 196)
+			return (channel * 5) + 4000;
+		else
+			return (channel * 5) + 5000;
+	}
 
 	return 0;
 }
-- 
cgit v1.2.3