summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/ipw2x00/ipw2200.c
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2011-11-09 21:33:45 +0100
committerJohn W. Linville <linville@tuxdriver.com>2011-11-11 12:32:50 -0500
commit776d68f863b8fa3880595a958cf86b837427713a (patch)
treee89725354f9d2069b60219f6222ca822ed2c61b8 /drivers/net/wireless/ipw2x00/ipw2200.c
parent8e1b23b9ed427c3bd4c69503fed64231458d3edb (diff)
downloadop-kernel-dev-776d68f863b8fa3880595a958cf86b837427713a.zip
op-kernel-dev-776d68f863b8fa3880595a958cf86b837427713a.tar.gz
wireless: move ieee80211chan2mhz macro
The macro is only used in ipw2200 and we certainly don't want to encourage its use, so move it out of the radiotap header file and into the driver. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/ipw2x00/ipw2200.c')
-rw-r--r--drivers/net/wireless/ipw2x00/ipw2200.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c
index 99a710d..9957588 100644
--- a/drivers/net/wireless/ipw2x00/ipw2200.c
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c
@@ -131,6 +131,14 @@ static struct ieee80211_rate ipw2200_rates[] = {
#define ipw2200_bg_rates (ipw2200_rates + 0)
#define ipw2200_num_bg_rates 12
+/* Ugly macro to convert literal channel numbers into their mhz equivalents
+ * There are certianly some conditions that will break this (like feeding it '30')
+ * but they shouldn't arise since nothing talks on channel 30. */
+#define ieee80211chan2mhz(x) \
+ (((x) <= 14) ? \
+ (((x) == 14) ? 2484 : ((x) * 5) + 2407) : \
+ ((x) + 1000) * 5)
+
#ifdef CONFIG_IPW2200_QOS
static int qos_enable = 0;
static int qos_burst_enable = 0;
OpenPOWER on IntegriCloud