From: Johannes Berg <johannes.berg@xxxxxxxxx>
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@xxxxxxxxx>
---
drivers/net/wireless/ipw2x00/ipw2200.c | 8 ++++++++
include/net/ieee80211_radiotap.h | 8 --------
2 files changed, 8 insertions(+), 8 deletions(-)
--- a/drivers/net/wireless/ipw2x00/ipw2200.c 2011-11-09 10:07:12.000000000 +0100
+++ b/drivers/net/wireless/ipw2x00/ipw2200.c 2011-11-09 21:32:19.000000000 +0100
@@ -131,6 +131,14 @@ static struct ieee80211_rate ipw2200_rat
#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;
--- a/include/net/ieee80211_radiotap.h 2011-11-08 18:04:29.000000000 +0100
+++ b/include/net/ieee80211_radiotap.h 2011-11-09 21:32:20.000000000 +0100
@@ -271,14 +271,6 @@ enum ieee80211_radiotap_type {
#define IEEE80211_RADIOTAP_MCS_FEC_LDPC 0x10
-/* 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)
-
/* helpers */
static inline int ieee80211_get_radiotap_len(unsigned char *data)
{
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
