commit 40a937fb2ca1d864263d659bcb87817ef0a976e9 Author: Jiri Slaby Date: Mon Jun 25 10:17:56 2007 +0200 fill also channel (this means rewrite regdomain structure to contain channels instead of freq, awk rulez) diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c index 337c724..c09c0cb 100644 --- a/ath/if_ath_pci.c +++ b/ath/if_ath_pci.c @@ -267,7 +267,7 @@ static unsigned int ath_copy_channels(struct ath_hw *ah, IEEE80211_CHANNELS_5GHZ; const struct ieee80211_regchannel *chans; enum ieee80211_regdomain dmn; - unsigned int i, count, size, chfreq, all, f; + unsigned int i, count, size, chfreq, all, f, ch; if (!test_bit(mode, ah->ah_modes)) return 0; @@ -299,7 +299,8 @@ static unsigned int ath_copy_channels(struct ath_hw *ah, } for (i = 0, count = 0; i < size && max > 0; i++) { - f = all ? ath_ieee2mhz(i + 1) : chans[i].chan; + ch = all ? i + 1 : chans[i].chan; + f = ath_ieee2mhz(ch); /* Check if channel is supported by the chipset */ if (ath5k_check_channel(ah, f, chfreq) == false) continue; @@ -313,7 +314,7 @@ static unsigned int ath_copy_channels(struct ath_hw *ah, continue; /* Write channel and increment counter */ -// channels->chan = i; + channels->chan = ch; channels->freq = f; channels->val = map[mode].chan; channels++; diff --git a/openhal/ieee80211_regdomain.h b/openhal/ieee80211_regdomain.h index 14dc84d..b5f67f3 100644 --- a/openhal/ieee80211_regdomain.h +++ b/openhal/ieee80211_regdomain.h @@ -217,6 +217,8 @@ enum ieee80211_countrycode { #define IEEE80211_CHANNELS_2GHZ_MIN 2412 /* 2GHz channel 1 */ #define IEEE80211_CHANNELS_2GHZ_MAX 2732 /* 2GHz channel 26 */ +#define IEEE80211_CHANNELS_5GHZ_MIN 5005 /* 5GHz channel 1 */ +#define IEEE80211_CHANNELS_5GHZ_MAX 6100 /* 5GHz channel 220 */ struct ieee80211_regchannel { u16 chan; @@ -225,265 +227,262 @@ struct ieee80211_regchannel { }; #define IEEE80211_CHANNELS_2GHZ { \ - { 2412, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2417, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2422, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2427, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2432, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2437, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2442, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2447, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2452, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2457, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2462, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2467, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2472, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2412*/ { 1, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2417*/ { 2, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2422*/ { 3, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2427*/ { 4, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2432*/ { 5, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2437*/ { 6, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2442*/ { 7, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2447*/ { 8, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2452*/ { 9, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2457*/ { 10, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2462*/ { 11, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2467*/ { 12, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2472*/ { 13, DMN_APLD, CHANNEL_CCK|CHANNEL_OFDM }, \ \ - { 2432, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2437, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 2442, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2432*/ { 5, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2437*/ { 6, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*2442*/ { 7, DMN_ETSIB, CHANNEL_CCK|CHANNEL_OFDM }, \ \ - { 2412, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2417, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2422, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2427, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2432, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2437, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 2442, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2447, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2452, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2457, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2462, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2467, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2472, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2412*/ { 1, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2417*/ { 2, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2422*/ { 3, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2427*/ { 4, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2432*/ { 5, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2437*/ { 6, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*2442*/ { 7, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2447*/ { 8, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2452*/ { 9, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2457*/ { 10, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2462*/ { 11, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2467*/ { 12, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2472*/ { 13, DMN_ETSIC, CHANNEL_CCK|CHANNEL_OFDM }, \ \ - { 2412, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2417, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2422, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2427, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2432, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2437, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 2442, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2447, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2452, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2457, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2462, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2412*/ { 1, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2417*/ { 2, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2422*/ { 3, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2427*/ { 4, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2432*/ { 5, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2437*/ { 6, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*2442*/ { 7, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2447*/ { 8, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2452*/ { 9, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2457*/ { 10, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2462*/ { 11, DMN_FCCA, CHANNEL_CCK|CHANNEL_OFDM }, \ \ - { 2412, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2417, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2422, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2427, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2432, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2437, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2442, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2447, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2452, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2457, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2462, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2467, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2472, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2484, DMN_MKKA, CHANNEL_CCK }, \ +/*2412*/ { 1, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2417*/ { 2, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2422*/ { 3, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2427*/ { 4, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2432*/ { 5, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2437*/ { 6, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2442*/ { 7, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2447*/ { 8, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2452*/ { 9, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2457*/ { 10, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2462*/ { 11, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2467*/ { 12, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2472*/ { 13, DMN_MKKA, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2484*/ { 14, DMN_MKKA, CHANNEL_CCK }, \ \ - { 2412, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2417, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2422, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2427, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2432, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2437, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 2442, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2447, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2452, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2457, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2462, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2467, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ - { 2472, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2412*/ { 1, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2417*/ { 2, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2422*/ { 3, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2427*/ { 4, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2432*/ { 5, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2437*/ { 6, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*2442*/ { 7, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2447*/ { 8, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2452*/ { 9, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2457*/ { 10, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2462*/ { 11, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2467*/ { 12, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ +/*2472*/ { 13, DMN_WORLD, CHANNEL_CCK|CHANNEL_OFDM }, \ } -#define IEEE80211_CHANNELS_5GHZ_MIN 5005 /* 5GHz channel 1 */ -#define IEEE80211_CHANNELS_5GHZ_MAX 6100 /* 5GHz channel 220 */ - #define IEEE80211_CHANNELS_5GHZ { \ - { 5745, DMN_APL1, CHANNEL_OFDM }, \ - { 5765, DMN_APL1, CHANNEL_OFDM }, \ - { 5785, DMN_APL1, CHANNEL_OFDM }, \ - { 5805, DMN_APL1, CHANNEL_OFDM }, \ - { 5825, DMN_APL1, CHANNEL_OFDM }, \ +/*5745*/ { 149, DMN_APL1, CHANNEL_OFDM }, \ +/*5765*/ { 153, DMN_APL1, CHANNEL_OFDM }, \ +/*5785*/ { 157, DMN_APL1, CHANNEL_OFDM }, \ +/*5805*/ { 161, DMN_APL1, CHANNEL_OFDM }, \ +/*5825*/ { 165, DMN_APL1, CHANNEL_OFDM }, \ \ - { 5745, DMN_APL2, CHANNEL_OFDM }, \ - { 5765, DMN_APL2, CHANNEL_OFDM }, \ - { 5785, DMN_APL2, CHANNEL_OFDM }, \ - { 5805, DMN_APL2, CHANNEL_OFDM }, \ +/*5745*/ { 149, DMN_APL2, CHANNEL_OFDM }, \ +/*5765*/ { 153, DMN_APL2, CHANNEL_OFDM }, \ +/*5785*/ { 157, DMN_APL2, CHANNEL_OFDM }, \ +/*5805*/ { 161, DMN_APL2, CHANNEL_OFDM }, \ \ - { 5280, DMN_APL3, CHANNEL_OFDM }, \ - { 5300, DMN_APL3, CHANNEL_OFDM }, \ - { 5320, DMN_APL3, CHANNEL_OFDM }, \ - { 5745, DMN_APL3, CHANNEL_OFDM }, \ - { 5765, DMN_APL3, CHANNEL_OFDM }, \ - { 5785, DMN_APL3, CHANNEL_OFDM }, \ - { 5805, DMN_APL3, CHANNEL_OFDM }, \ +/*5280*/ { 56, DMN_APL3, CHANNEL_OFDM }, \ +/*5300*/ { 60, DMN_APL3, CHANNEL_OFDM }, \ +/*5320*/ { 64, DMN_APL3, CHANNEL_OFDM }, \ +/*5745*/ { 149, DMN_APL3, CHANNEL_OFDM }, \ +/*5765*/ { 153, DMN_APL3, CHANNEL_OFDM }, \ +/*5785*/ { 157, DMN_APL3, CHANNEL_OFDM }, \ +/*5805*/ { 161, DMN_APL3, CHANNEL_OFDM }, \ \ - { 5180, DMN_APL4, CHANNEL_OFDM }, \ - { 5200, DMN_APL4, CHANNEL_OFDM }, \ - { 5220, DMN_APL4, CHANNEL_OFDM }, \ - { 5240, DMN_APL4, CHANNEL_OFDM }, \ - { 5745, DMN_APL4, CHANNEL_OFDM }, \ - { 5765, DMN_APL4, CHANNEL_OFDM }, \ - { 5785, DMN_APL4, CHANNEL_OFDM }, \ - { 5805, DMN_APL4, CHANNEL_OFDM }, \ - { 5825, DMN_APL4, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_APL4, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_APL4, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_APL4, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_APL4, CHANNEL_OFDM }, \ +/*5745*/ { 149, DMN_APL4, CHANNEL_OFDM }, \ +/*5765*/ { 153, DMN_APL4, CHANNEL_OFDM }, \ +/*5785*/ { 157, DMN_APL4, CHANNEL_OFDM }, \ +/*5805*/ { 161, DMN_APL4, CHANNEL_OFDM }, \ +/*5825*/ { 165, DMN_APL4, CHANNEL_OFDM }, \ \ - { 5745, DMN_APL5, CHANNEL_OFDM }, \ - { 5765, DMN_APL5, CHANNEL_OFDM }, \ - { 5785, DMN_APL5, CHANNEL_OFDM }, \ - { 5805, DMN_APL5, CHANNEL_OFDM }, \ - { 5825, DMN_APL5, CHANNEL_OFDM }, \ +/*5745*/ { 149, DMN_APL5, CHANNEL_OFDM }, \ +/*5765*/ { 153, DMN_APL5, CHANNEL_OFDM }, \ +/*5785*/ { 157, DMN_APL5, CHANNEL_OFDM }, \ +/*5805*/ { 161, DMN_APL5, CHANNEL_OFDM }, \ +/*5825*/ { 165, DMN_APL5, CHANNEL_OFDM }, \ \ - { 5180, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5200, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5220, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5240, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5260, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5280, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5300, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5320, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5500, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5520, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5540, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5560, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5580, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5600, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5620, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5640, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5660, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5680, DMN_ETSI1, CHANNEL_OFDM }, \ - { 5700, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5260*/ { 52, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5280*/ { 56, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5300*/ { 60, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5320*/ { 64, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5500*/ { 100, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5520*/ { 104, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5540*/ { 108, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5560*/ { 112, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5580*/ { 116, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5600*/ { 120, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5620*/ { 124, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5640*/ { 128, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5660*/ { 132, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5680*/ { 136, DMN_ETSI1, CHANNEL_OFDM }, \ +/*5700*/ { 140, DMN_ETSI1, CHANNEL_OFDM }, \ \ - { 5180, DMN_ETSI2, CHANNEL_OFDM }, \ - { 5200, DMN_ETSI2, CHANNEL_OFDM }, \ - { 5220, DMN_ETSI2, CHANNEL_OFDM }, \ - { 5240, DMN_ETSI2, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_ETSI2, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_ETSI2, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_ETSI2, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_ETSI2, CHANNEL_OFDM }, \ \ - { 5180, DMN_ETSI3, CHANNEL_OFDM }, \ - { 5200, DMN_ETSI3, CHANNEL_OFDM }, \ - { 5220, DMN_ETSI3, CHANNEL_OFDM }, \ - { 5240, DMN_ETSI3, CHANNEL_OFDM }, \ - { 5260, DMN_ETSI3, CHANNEL_OFDM }, \ - { 5280, DMN_ETSI3, CHANNEL_OFDM }, \ - { 5300, DMN_ETSI3, CHANNEL_OFDM }, \ - { 5320, DMN_ETSI3, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_ETSI3, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_ETSI3, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_ETSI3, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_ETSI3, CHANNEL_OFDM }, \ +/*5260*/ { 52, DMN_ETSI3, CHANNEL_OFDM }, \ +/*5280*/ { 56, DMN_ETSI3, CHANNEL_OFDM }, \ +/*5300*/ { 60, DMN_ETSI3, CHANNEL_OFDM }, \ +/*5320*/ { 64, DMN_ETSI3, CHANNEL_OFDM }, \ \ - { 5180, DMN_ETSI4, CHANNEL_OFDM }, \ - { 5200, DMN_ETSI4, CHANNEL_OFDM }, \ - { 5220, DMN_ETSI4, CHANNEL_OFDM }, \ - { 5240, DMN_ETSI4, CHANNEL_OFDM }, \ - { 5260, DMN_ETSI4, CHANNEL_OFDM }, \ - { 5280, DMN_ETSI4, CHANNEL_OFDM }, \ - { 5300, DMN_ETSI4, CHANNEL_OFDM }, \ - { 5320, DMN_ETSI4, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_ETSI4, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_ETSI4, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_ETSI4, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_ETSI4, CHANNEL_OFDM }, \ +/*5260*/ { 52, DMN_ETSI4, CHANNEL_OFDM }, \ +/*5280*/ { 56, DMN_ETSI4, CHANNEL_OFDM }, \ +/*5300*/ { 60, DMN_ETSI4, CHANNEL_OFDM }, \ +/*5320*/ { 64, DMN_ETSI4, CHANNEL_OFDM }, \ \ - { 5180, DMN_ETSI5, CHANNEL_OFDM }, \ - { 5200, DMN_ETSI5, CHANNEL_OFDM }, \ - { 5220, DMN_ETSI5, CHANNEL_OFDM }, \ - { 5240, DMN_ETSI5, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_ETSI5, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_ETSI5, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_ETSI5, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_ETSI5, CHANNEL_OFDM }, \ \ - { 5180, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5200, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5220, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5240, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5260, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5280, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5500, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5520, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5540, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5560, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5580, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5600, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5620, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5640, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5660, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5680, DMN_ETSI6, CHANNEL_OFDM }, \ - { 5700, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5260*/ { 52, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5280*/ { 56, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5500*/ { 100, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5520*/ { 104, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5540*/ { 108, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5560*/ { 112, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5580*/ { 116, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5600*/ { 120, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5620*/ { 124, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5640*/ { 128, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5660*/ { 132, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5680*/ { 136, DMN_ETSI6, CHANNEL_OFDM }, \ +/*5700*/ { 140, DMN_ETSI6, CHANNEL_OFDM }, \ \ - { 5180, DMN_FCC1, CHANNEL_OFDM }, \ - { 5200, DMN_FCC1, CHANNEL_OFDM }, \ - { 5210, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5220, DMN_FCC1, CHANNEL_OFDM }, \ - { 5240, DMN_FCC1, CHANNEL_OFDM }, \ - { 5250, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5260, DMN_FCC1, CHANNEL_OFDM }, \ - { 5280, DMN_FCC1, CHANNEL_OFDM }, \ - { 5290, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5300, DMN_FCC1, CHANNEL_OFDM }, \ - { 5320, DMN_FCC1, CHANNEL_OFDM }, \ - { 5745, DMN_FCC1, CHANNEL_OFDM }, \ - { 5760, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5765, DMN_FCC1, CHANNEL_OFDM }, \ - { 5785, DMN_FCC1, CHANNEL_OFDM }, \ - { 5800, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5805, DMN_FCC1, CHANNEL_OFDM }, \ - { 5825, DMN_FCC1, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_FCC1, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_FCC1, CHANNEL_OFDM }, \ +/*5210*/ { 42, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5220*/ { 44, DMN_FCC1, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_FCC1, CHANNEL_OFDM }, \ +/*5250*/ { 50, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5260*/ { 52, DMN_FCC1, CHANNEL_OFDM }, \ +/*5280*/ { 56, DMN_FCC1, CHANNEL_OFDM }, \ +/*5290*/ { 58, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5300*/ { 60, DMN_FCC1, CHANNEL_OFDM }, \ +/*5320*/ { 64, DMN_FCC1, CHANNEL_OFDM }, \ +/*5745*/ { 149, DMN_FCC1, CHANNEL_OFDM }, \ +/*5760*/ { 152, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5765*/ { 153, DMN_FCC1, CHANNEL_OFDM }, \ +/*5785*/ { 157, DMN_FCC1, CHANNEL_OFDM }, \ +/*5800*/ { 160, DMN_FCC1, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5805*/ { 161, DMN_FCC1, CHANNEL_OFDM }, \ +/*5825*/ { 165, DMN_FCC1, CHANNEL_OFDM }, \ \ - { 5180, DMN_FCC2, CHANNEL_OFDM }, \ - { 5200, DMN_FCC2, CHANNEL_OFDM }, \ - { 5220, DMN_FCC2, CHANNEL_OFDM }, \ - { 5240, DMN_FCC2, CHANNEL_OFDM }, \ - { 5260, DMN_FCC2, CHANNEL_OFDM }, \ - { 5280, DMN_FCC2, CHANNEL_OFDM }, \ - { 5300, DMN_FCC2, CHANNEL_OFDM }, \ - { 5320, DMN_FCC2, CHANNEL_OFDM }, \ - { 5745, DMN_FCC2, CHANNEL_OFDM }, \ - { 5765, DMN_FCC2, CHANNEL_OFDM }, \ - { 5785, DMN_FCC2, CHANNEL_OFDM }, \ - { 5805, DMN_FCC2, CHANNEL_OFDM }, \ - { 5825, DMN_FCC2, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_FCC2, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_FCC2, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_FCC2, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_FCC2, CHANNEL_OFDM }, \ +/*5260*/ { 52, DMN_FCC2, CHANNEL_OFDM }, \ +/*5280*/ { 56, DMN_FCC2, CHANNEL_OFDM }, \ +/*5300*/ { 60, DMN_FCC2, CHANNEL_OFDM }, \ +/*5320*/ { 64, DMN_FCC2, CHANNEL_OFDM }, \ +/*5745*/ { 149, DMN_FCC2, CHANNEL_OFDM }, \ +/*5765*/ { 153, DMN_FCC2, CHANNEL_OFDM }, \ +/*5785*/ { 157, DMN_FCC2, CHANNEL_OFDM }, \ +/*5805*/ { 161, DMN_FCC2, CHANNEL_OFDM }, \ +/*5825*/ { 165, DMN_FCC2, CHANNEL_OFDM }, \ \ - { 5180, DMN_FCC3, CHANNEL_OFDM }, \ - { 5200, DMN_FCC3, CHANNEL_OFDM }, \ - { 5210, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5220, DMN_FCC3, CHANNEL_OFDM }, \ - { 5240, DMN_FCC3, CHANNEL_OFDM }, \ - { 5250, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5260, DMN_FCC3, CHANNEL_OFDM }, \ - { 5280, DMN_FCC3, CHANNEL_OFDM }, \ - { 5290, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5300, DMN_FCC3, CHANNEL_OFDM }, \ - { 5320, DMN_FCC3, CHANNEL_OFDM }, \ - { 5500, DMN_FCC3, CHANNEL_OFDM }, \ - { 5520, DMN_FCC3, CHANNEL_OFDM }, \ - { 5540, DMN_FCC3, CHANNEL_OFDM }, \ - { 5560, DMN_FCC3, CHANNEL_OFDM }, \ - { 5580, DMN_FCC3, CHANNEL_OFDM }, \ - { 5600, DMN_FCC3, CHANNEL_OFDM }, \ - { 5620, DMN_FCC3, CHANNEL_OFDM }, \ - { 5640, DMN_FCC3, CHANNEL_OFDM }, \ - { 5660, DMN_FCC3, CHANNEL_OFDM }, \ - { 5680, DMN_FCC3, CHANNEL_OFDM }, \ - { 5700, DMN_FCC3, CHANNEL_OFDM }, \ - { 5745, DMN_FCC3, CHANNEL_OFDM }, \ - { 5760, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5765, DMN_FCC3, CHANNEL_OFDM }, \ - { 5785, DMN_FCC3, CHANNEL_OFDM }, \ - { 5800, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ - { 5805, DMN_FCC3, CHANNEL_OFDM }, \ - { 5825, DMN_FCC3, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_FCC3, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_FCC3, CHANNEL_OFDM }, \ +/*5210*/ { 42, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5220*/ { 44, DMN_FCC3, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_FCC3, CHANNEL_OFDM }, \ +/*5250*/ { 50, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5260*/ { 52, DMN_FCC3, CHANNEL_OFDM }, \ +/*5280*/ { 56, DMN_FCC3, CHANNEL_OFDM }, \ +/*5290*/ { 58, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5300*/ { 60, DMN_FCC3, CHANNEL_OFDM }, \ +/*5320*/ { 64, DMN_FCC3, CHANNEL_OFDM }, \ +/*5500*/ { 100, DMN_FCC3, CHANNEL_OFDM }, \ +/*5520*/ { 104, DMN_FCC3, CHANNEL_OFDM }, \ +/*5540*/ { 108, DMN_FCC3, CHANNEL_OFDM }, \ +/*5560*/ { 112, DMN_FCC3, CHANNEL_OFDM }, \ +/*5580*/ { 116, DMN_FCC3, CHANNEL_OFDM }, \ +/*5600*/ { 120, DMN_FCC3, CHANNEL_OFDM }, \ +/*5620*/ { 124, DMN_FCC3, CHANNEL_OFDM }, \ +/*5640*/ { 128, DMN_FCC3, CHANNEL_OFDM }, \ +/*5660*/ { 132, DMN_FCC3, CHANNEL_OFDM }, \ +/*5680*/ { 136, DMN_FCC3, CHANNEL_OFDM }, \ +/*5700*/ { 140, DMN_FCC3, CHANNEL_OFDM }, \ +/*5745*/ { 149, DMN_FCC3, CHANNEL_OFDM }, \ +/*5760*/ { 152, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5765*/ { 153, DMN_FCC3, CHANNEL_OFDM }, \ +/*5785*/ { 157, DMN_FCC3, CHANNEL_OFDM }, \ +/*5800*/ { 160, DMN_FCC3, CHANNEL_OFDM|CHANNEL_TURBO }, \ +/*5805*/ { 161, DMN_FCC3, CHANNEL_OFDM }, \ +/*5825*/ { 165, DMN_FCC3, CHANNEL_OFDM }, \ \ - { 5170, DMN_MKK1, CHANNEL_OFDM }, \ - { 5190, DMN_MKK1, CHANNEL_OFDM }, \ - { 5210, DMN_MKK1, CHANNEL_OFDM }, \ - { 5230, DMN_MKK1, CHANNEL_OFDM }, \ +/*5170*/ { 34, DMN_MKK1, CHANNEL_OFDM }, \ +/*5190*/ { 38, DMN_MKK1, CHANNEL_OFDM }, \ +/*5210*/ { 42, DMN_MKK1, CHANNEL_OFDM }, \ +/*5230*/ { 46, DMN_MKK1, CHANNEL_OFDM }, \ \ - { 5040, DMN_MKK2, CHANNEL_OFDM }, \ - { 5060, DMN_MKK2, CHANNEL_OFDM }, \ - { 5080, DMN_MKK2, CHANNEL_OFDM }, \ - { 5170, DMN_MKK2, CHANNEL_OFDM }, \ - { 5190, DMN_MKK2, CHANNEL_OFDM }, \ - { 5210, DMN_MKK2, CHANNEL_OFDM }, \ - { 5230, DMN_MKK2, CHANNEL_OFDM }, \ +/*5040*/ { 8, DMN_MKK2, CHANNEL_OFDM }, \ +/*5060*/ { 12, DMN_MKK2, CHANNEL_OFDM }, \ +/*5080*/ { 16, DMN_MKK2, CHANNEL_OFDM }, \ +/*5170*/ { 34, DMN_MKK2, CHANNEL_OFDM }, \ +/*5190*/ { 38, DMN_MKK2, CHANNEL_OFDM }, \ +/*5210*/ { 42, DMN_MKK2, CHANNEL_OFDM }, \ +/*5230*/ { 46, DMN_MKK2, CHANNEL_OFDM }, \ \ - { 5180, DMN_WORLD, CHANNEL_OFDM }, \ - { 5200, DMN_WORLD, CHANNEL_OFDM }, \ - { 5220, DMN_WORLD, CHANNEL_OFDM }, \ - { 5240, DMN_WORLD, CHANNEL_OFDM }, \ +/*5180*/ { 36, DMN_WORLD, CHANNEL_OFDM }, \ +/*5200*/ { 40, DMN_WORLD, CHANNEL_OFDM }, \ +/*5220*/ { 44, DMN_WORLD, CHANNEL_OFDM }, \ +/*5240*/ { 48, DMN_WORLD, CHANNEL_OFDM }, \ } enum ieee80211_regdomain ieee80211_regdomain2flag(enum ieee80211_regdomain, u16);