commit e5a81de8e556c104aacffb9ce3d15241a2b55ca9
Author: Jiri Slaby <ku@bellona.localdomain>
Date:   Mon Jun 25 00:09:07 2007 +0200

    regdomain cleanup

diff --git a/openhal/ieee80211_regdomain.c b/openhal/ieee80211_regdomain.c
index f600604..f5da7cf 100644
--- a/openhal/ieee80211_regdomain.c
+++ b/openhal/ieee80211_regdomain.c
@@ -16,10 +16,10 @@
 #include "ieee80211_regdomain.h"
 
 static const struct ieee80211_regdomainmap {
-	u16	rm_domain;
-	u32	rm_domain_5ghz;
-	u32	rm_domain_2ghz;
-} ieee80211_r_map[] = {
+	enum ieee80211_regdomain dmn;
+	enum ieee80211_regdomain dmn5;
+	enum ieee80211_regdomain dmn2;
+} r_map[] = {
 	{ DMN_DEFAULT,		DMN_DEBUG,	DMN_DEBUG },
 	{ DMN_NULL_WORLD,	DMN_NULL,	DMN_WORLD },
 	{ DMN_NULL_ETSIB,	DMN_NULL,	DMN_ETSIB },
@@ -71,21 +71,22 @@ static const struct ieee80211_regdomainmap {
 	{ DMN_WORA_WORLD,	DMN_WORLD,	DMN_WORLD },
 };
 
-u32 ieee80211_regdomain2flag(u16 regdomain, u16 mhz)
+enum ieee80211_regdomain ieee80211_regdomain2flag(enum ieee80211_regdomain dmn,
+		u16 mhz)
 {
 	unsigned int i;
 	
-	for (i = 0; i < ARRAY_SIZE(ieee80211_r_map); i++) {
-		if (ieee80211_r_map[i].rm_domain == regdomain) {
+	for (i = 0; i < ARRAY_SIZE(r_map); i++) {
+		if (r_map[i].dmn == dmn) {
 			if (mhz >= 2000 && mhz <= 3000)
-				return (u32)ieee80211_r_map[i].rm_domain_2ghz;
+				return r_map[i].dmn2;
 			if (mhz >= IEEE80211_CHANNELS_5GHZ_MIN &&
 					mhz <= IEEE80211_CHANNELS_5GHZ_MAX)
-				return (u32)ieee80211_r_map[i].rm_domain_5ghz;
+				return r_map[i].dmn5;
 		}
 	}
 
-	return (u32)DMN_DEBUG;
+	return DMN_DEBUG;
 }
 
 u16 ath5k_regdomain_from_ieee(enum ieee80211_regdomain ieee)
diff --git a/openhal/ieee80211_regdomain.h b/openhal/ieee80211_regdomain.h
index 1f1ed97..14dc84d 100644
--- a/openhal/ieee80211_regdomain.h
+++ b/openhal/ieee80211_regdomain.h
@@ -219,9 +219,9 @@ enum ieee80211_countrycode {
 #define IEEE80211_CHANNELS_2GHZ_MAX	2732	/* 2GHz channel 26 */
 
 struct ieee80211_regchannel {
-	u16	rc_channel;
-	u32	rc_domain;
-	u32	rc_mode;
+	u16 chan;
+	enum ieee80211_regdomain domain;
+	u32 mode;
 };
 
 #define IEEE80211_CHANNELS_2GHZ {					\
@@ -486,7 +486,7 @@ struct ieee80211_regchannel {
 	{ 5240, DMN_WORLD, CHANNEL_OFDM },		\
 }
 
-u32 ieee80211_regdomain2flag(u16, u16);
+enum ieee80211_regdomain ieee80211_regdomain2flag(enum ieee80211_regdomain, u16);
 u16 ath5k_regdomain_from_ieee(enum ieee80211_regdomain ieee);
 enum ieee80211_regdomain ath5k_regdomain_to_ieee(u16 regdomain);