Date: Fri, 16 Jan 2009 23:50:22 +0000 (UTC) From: Sam Leffler <sam@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r187352 - user/sam/wifi/sys/dev/ath/ath_hal Message-ID: <200901162350.n0GNoMdp021934@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sam Date: Fri Jan 16 23:50:22 2009 New Revision: 187352 URL: http://svn.freebsd.org/changeset/base/187352 Log: correct 11g regulatory for Argentina, it's allowed; with this there are no countries that disallow 11g operation so remove the special handling Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c Modified: user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c ============================================================================== --- user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c Fri Jan 16 23:25:49 2009 (r187351) +++ user/sam/wifi/sys/dev/ath/ath_hal/ah_regdomain.c Fri Jan 16 23:50:22 2009 (r187352) @@ -295,9 +295,9 @@ enum { APL2_ETSIC = 0x56, /* Venezuela */ APL5_WORLD = 0x58, /* Chile */ APL6_WORLD = 0x5B, /* Singapore */ - APL7_FCCA = 0x5C, /* Taiwan 5.47 Band */ - APL8_WORLD = 0x5D, /* Malaysia 5GHz */ - APL9_WORLD = 0x5E, /* Korea 5GHz */ + APL7_FCCA = 0x5C, /* Taiwan 5.47 Band */ + APL8_WORLD = 0x5D, /* Malaysia 5GHz */ + APL9_WORLD = 0x5E, /* Korea 5GHz */ /* * World mode SKUs @@ -606,7 +606,6 @@ static REG_DMN_PAIR_MAPPING regDomainPai typedef struct { HAL_CTRY_CODE countryCode; HAL_REG_DOMAIN regDmnEnum; - HAL_BOOL allow11g; HAL_BOOL allow11aTurbo; HAL_BOOL allow11gTurbo; HAL_BOOL allow11ng20; @@ -616,147 +615,147 @@ typedef struct { } COUNTRY_CODE_TO_ENUM_RD; static COUNTRY_CODE_TO_ENUM_RD allCountries[] = { - {CTRY_DEBUG, NO_ENUMRD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_DEFAULT, DEF_REGDMN, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_ALBANIA, NULL1_WORLD, YES, NO, YES, YES, NO, NO, NO }, - {CTRY_ALGERIA, NULL1_WORLD, YES, NO, YES, YES, NO, NO, NO }, - {CTRY_ARGENTINA, APL3_WORLD, NO, NO, NO, NO, NO, NO, NO }, - {CTRY_ARMENIA, ETSI4_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_AUSTRALIA, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_AUSTRIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_AZERBAIJAN, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_BAHRAIN, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_BELARUS, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_BELGIUM, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_BELIZE, APL1_ETSIC, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_BOLIVIA, APL1_ETSIC, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_BRAZIL, FCC3_WORLD, YES, NO, NO, YES, NO, YES, NO }, - {CTRY_BRUNEI_DARUSSALAM,APL1_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_BULGARIA, ETSI6_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_CANADA, FCC2_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_CHILE, APL6_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_CHINA, APL1_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_COLOMBIA, FCC1_FCCA, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_COSTA_RICA, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_CROATIA, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_CYPRUS, ETSI1_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_CZECH, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_DENMARK, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_DOMINICAN_REPUBLIC,FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_ECUADOR, NULL1_WORLD, NO, NO, NO, NO, NO, NO, NO }, - {CTRY_EGYPT, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_EL_SALVADOR, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_ESTONIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_FINLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_FRANCE, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_FRANCE2, ETSI3_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_GEORGIA, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_GERMANY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_GREECE, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_GUATEMALA, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_GZ901, GZ901_WORLD, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_HONDURAS, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_HONG_KONG, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_HUNGARY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_ICELAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_INDIA, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_INDONESIA, APL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_IRAN, APL1_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_IRELAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_ISRAEL, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_ITALY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_JAPAN, MKK1_MKKA, YES, NO, NO, YES, NO, YES, NO }, - {CTRY_JAPAN1, MKK1_MKKB, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN2, MKK1_FCCA, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN3, MKK2_MKKA, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN4, MKK1_MKKA1, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN5, MKK1_MKKA2, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN6, MKK1_MKKC, YES, NO, NO, NO, NO, NO, NO }, - - {CTRY_JAPAN7, MKK3_MKKB, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN8, MKK3_MKKA2, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN9, MKK3_MKKC, YES, NO, NO, NO, NO, NO, NO }, - - {CTRY_JAPAN10, MKK4_MKKB, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN11, MKK4_MKKA2, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN12, MKK4_MKKC, YES, NO, NO, NO, NO, NO, NO }, - - {CTRY_JAPAN13, MKK5_MKKB, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN14, MKK5_MKKA2, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN15, MKK5_MKKC, YES, NO, NO, NO, NO, NO, NO }, - - {CTRY_JAPAN16, MKK6_MKKB, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN17, MKK6_MKKA2, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN18, MKK6_MKKC, YES, NO, NO, NO, NO, NO, NO }, - - {CTRY_JAPAN19, MKK7_MKKB, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN20, MKK7_MKKA2, YES, NO, NO, YES, NO, YES, NO }, - {CTRY_JAPAN21, MKK7_MKKC, YES, NO, NO, NO, NO, NO, NO }, - - {CTRY_JAPAN22, MKK8_MKKB, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN23, MKK8_MKKA2, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_JAPAN24, MKK8_MKKC, YES, NO, NO, NO, NO, NO, NO }, - - {CTRY_JORDAN, APL4_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_KAZAKHSTAN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_KOREA_NORTH, APL2_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_KOREA_ROC, APL2_WORLD, YES, NO, NO, YES, NO, YES, NO }, - {CTRY_KOREA_ROC2, APL2_WORLD, YES, NO, NO, YES, NO, YES, NO }, - {CTRY_KOREA_ROC3, APL9_WORLD, YES, NO, NO, YES, NO, YES, NO }, - {CTRY_KUWAIT, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_LATVIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_LEBANON, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_LIECHTENSTEIN,ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_LITHUANIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_LUXEMBOURG, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_MACAU, FCC2_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_MACEDONIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_MALAYSIA, APL8_WORLD, YES, NO, NO, YES, NO, YES, NO }, - {CTRY_MALTA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_MEXICO, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_MONACO, ETSI4_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_MOROCCO, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_NETHERLANDS, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_NEW_ZEALAND, FCC2_ETSIC, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_NORWAY, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_OMAN, APL6_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_PAKISTAN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_PANAMA, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_PERU, APL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_PHILIPPINES, FCC3_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_POLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_PORTUGAL, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_PUERTO_RICO, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_QATAR, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_ROMANIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_RUSSIA, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_SAUDI_ARABIA,FCC2_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_SINGAPORE, APL6_WORLD, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_SLOVAKIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_SLOVENIA, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_SOUTH_AFRICA,FCC3_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_SPAIN, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_SR9, SR9_WORLD, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_SWEDEN, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_SWITZERLAND, ETSI1_WORLD, YES, NO, YES, YES,YES, YES,YES }, - {CTRY_SYRIA, NULL1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_TAIWAN, APL3_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_THAILAND, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_TRINIDAD_Y_TOBAGO,ETSI4_WORLD,YES, NO, YES, YES,YES, YES, NO }, - {CTRY_TUNISIA, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_TURKEY, ETSI3_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_UKRAINE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_UAE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_UNITED_KINGDOM, ETSI1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_UNITED_STATES, FCC1_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_UNITED_STATES_FCC49,FCC4_FCCA,YES, YES, YES, YES,YES, YES,YES }, - {CTRY_URUGUAY, FCC1_WORLD, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_UZBEKISTAN, FCC3_FCCA, YES, YES, YES, YES,YES, YES,YES }, - {CTRY_VENEZUELA, APL2_ETSIC, YES, NO, YES, YES,YES, YES, NO }, - {CTRY_VIET_NAM, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_XR9, XR9_WORLD, YES, NO, NO, NO, NO, NO, NO }, - {CTRY_YEMEN, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO }, - {CTRY_ZIMBABWE, NULL1_WORLD, YES, NO, YES, YES,YES, NO, NO } + {CTRY_DEBUG, NO_ENUMRD, YES, YES, YES,YES, YES,YES }, + {CTRY_DEFAULT, DEF_REGDMN, YES, YES, YES,YES, YES,YES }, + {CTRY_ALBANIA, NULL1_WORLD, NO, YES, YES, NO, NO, NO }, + {CTRY_ALGERIA, NULL1_WORLD, NO, YES, YES, NO, NO, NO }, + {CTRY_ARGENTINA, APL3_WORLD, NO, NO, NO, NO, NO, NO }, + {CTRY_ARMENIA, ETSI4_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_AUSTRALIA, FCC2_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_AUSTRIA, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_AZERBAIJAN, ETSI4_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_BAHRAIN, APL6_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_BELARUS, NULL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_BELGIUM, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_BELIZE, APL1_ETSIC, YES, YES, YES,YES, YES,YES }, + {CTRY_BOLIVIA, APL1_ETSIC, YES, YES, YES,YES, YES,YES }, + {CTRY_BRAZIL, FCC3_WORLD, NO, NO, YES, NO, YES, NO }, + {CTRY_BRUNEI_DARUSSALAM,APL1_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_BULGARIA, ETSI6_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_CANADA, FCC2_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_CHILE, APL6_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_CHINA, APL1_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_COLOMBIA, FCC1_FCCA, NO, YES, YES,YES, YES, NO }, + {CTRY_COSTA_RICA, NULL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_CROATIA, ETSI3_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_CYPRUS, ETSI1_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_CZECH, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_DENMARK, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_DOMINICAN_REPUBLIC,FCC1_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_ECUADOR, NULL1_WORLD, NO, NO, NO, NO, NO, NO }, + {CTRY_EGYPT, ETSI3_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_EL_SALVADOR, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_ESTONIA, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_FINLAND, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_FRANCE, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_FRANCE2, ETSI3_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_GEORGIA, ETSI4_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_GERMANY, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_GREECE, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_GUATEMALA, FCC1_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_GZ901, GZ901_WORLD, NO, NO, NO, NO, NO, NO }, + {CTRY_HONDURAS, NULL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_HONG_KONG, FCC2_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_HUNGARY, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_ICELAND, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_INDIA, APL6_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_INDONESIA, APL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_IRAN, APL1_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_IRELAND, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_ISRAEL, NULL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_ITALY, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_JAPAN, MKK1_MKKA, NO, NO, YES, NO, YES, NO }, + {CTRY_JAPAN1, MKK1_MKKB, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN2, MKK1_FCCA, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN3, MKK2_MKKA, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN4, MKK1_MKKA1, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN5, MKK1_MKKA2, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN6, MKK1_MKKC, NO, NO, NO, NO, NO, NO }, + + {CTRY_JAPAN7, MKK3_MKKB, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN8, MKK3_MKKA2, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN9, MKK3_MKKC, NO, NO, NO, NO, NO, NO }, + + {CTRY_JAPAN10, MKK4_MKKB, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN11, MKK4_MKKA2, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN12, MKK4_MKKC, NO, NO, NO, NO, NO, NO }, + + {CTRY_JAPAN13, MKK5_MKKB, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN14, MKK5_MKKA2, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN15, MKK5_MKKC, NO, NO, NO, NO, NO, NO }, + + {CTRY_JAPAN16, MKK6_MKKB, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN17, MKK6_MKKA2, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN18, MKK6_MKKC, NO, NO, NO, NO, NO, NO }, + + {CTRY_JAPAN19, MKK7_MKKB, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN20, MKK7_MKKA2, NO, NO, YES, NO, YES, NO }, + {CTRY_JAPAN21, MKK7_MKKC, NO, NO, NO, NO, NO, NO }, + + {CTRY_JAPAN22, MKK8_MKKB, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN23, MKK8_MKKA2, NO, NO, NO, NO, NO, NO }, + {CTRY_JAPAN24, MKK8_MKKC, NO, NO, NO, NO, NO, NO }, + + {CTRY_JORDAN, APL4_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_KAZAKHSTAN, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_KOREA_NORTH, APL2_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_KOREA_ROC, APL2_WORLD, NO, NO, YES, NO, YES, NO }, + {CTRY_KOREA_ROC2, APL2_WORLD, NO, NO, YES, NO, YES, NO }, + {CTRY_KOREA_ROC3, APL9_WORLD, NO, NO, YES, NO, YES, NO }, + {CTRY_KUWAIT, NULL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_LATVIA, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_LEBANON, NULL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_LIECHTENSTEIN,ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_LITHUANIA, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_LUXEMBOURG, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_MACAU, FCC2_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_MACEDONIA, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_MALAYSIA, APL8_WORLD, NO, NO, YES, NO, YES, NO }, + {CTRY_MALTA, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_MEXICO, FCC1_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_MONACO, ETSI4_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_MOROCCO, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_NETHERLANDS, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_NEW_ZEALAND, FCC2_ETSIC, NO, YES, YES,YES, YES,YES }, + {CTRY_NORWAY, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_OMAN, APL6_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_PAKISTAN, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_PANAMA, FCC1_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_PERU, APL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_PHILIPPINES, FCC3_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_POLAND, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_PORTUGAL, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_PUERTO_RICO, FCC1_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_QATAR, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_ROMANIA, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_RUSSIA, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_SAUDI_ARABIA,FCC2_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_SINGAPORE, APL6_WORLD, YES, YES, YES,YES, YES,YES }, + {CTRY_SLOVAKIA, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_SLOVENIA, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_SOUTH_AFRICA,FCC3_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_SPAIN, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_SR9, SR9_WORLD, NO, NO, NO, NO, NO, NO }, + {CTRY_SWEDEN, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_SWITZERLAND, ETSI1_WORLD, NO, YES, YES,YES, YES,YES }, + {CTRY_SYRIA, NULL1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_TAIWAN, APL3_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_THAILAND, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_TRINIDAD_Y_TOBAGO,ETSI4_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_TUNISIA, ETSI3_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_TURKEY, ETSI3_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_UKRAINE, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_UAE, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_UNITED_KINGDOM, ETSI1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_UNITED_STATES, FCC1_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_UNITED_STATES_FCC49,FCC4_FCCA,YES, YES, YES,YES, YES,YES }, + {CTRY_URUGUAY, FCC1_WORLD, NO, YES, YES,YES, YES, NO }, + {CTRY_UZBEKISTAN, FCC3_FCCA, YES, YES, YES,YES, YES,YES }, + {CTRY_VENEZUELA, APL2_ETSIC, NO, YES, YES,YES, YES, NO }, + {CTRY_VIET_NAM, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_XR9, XR9_WORLD, NO, NO, NO, NO, NO, NO }, + {CTRY_YEMEN, NULL1_WORLD, NO, YES, YES,YES, NO, NO }, + {CTRY_ZIMBABWE, NULL1_WORLD, NO, YES, YES,YES, NO, NO } }; /* Bit masks for DFS per regdomain */ @@ -2055,11 +2054,6 @@ ath_hal_getwmodesnreg(struct ath_hal *ah __func__, modesAvail, country->countryCode, country->regDmnEnum); /* Check country regulations for allowed modes */ - if (!country->allow11g && (modesAvail & HAL_MODE_11G_ALL)) { - HALDEBUG(ah, HAL_DEBUG_REGDOMAIN, - "%s: disallow all 11g\n", __func__); - modesAvail &= ~HAL_MODE_11G_ALL; - } if (isChanBitMaskZero(rd5GHz->chan11a) && (modesAvail & HAL_MODE_11A_ALL)) { HALDEBUG(ah, HAL_DEBUG_REGDOMAIN,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200901162350.n0GNoMdp021934>