summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoradrian <adrian@FreeBSD.org>2013-03-24 04:42:56 +0000
committeradrian <adrian@FreeBSD.org>2013-03-24 04:42:56 +0000
commit8ce3236c14a8165ab3ad39cd54569a42282a7e3d (patch)
treeec04a2c761828a1b469a1daa69ef20871395124b
parente3aae3fa016208a3eaccfeef863d2317b60ca2f0 (diff)
downloadFreeBSD-src-8ce3236c14a8165ab3ad39cd54569a42282a7e3d.zip
FreeBSD-src-8ce3236c14a8165ab3ad39cd54569a42282a7e3d.tar.gz
Add new regulatory domain.
Obtained from: Qualcomm Atheros
-rw-r--r--sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h25
-rw-r--r--sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h1
2 files changed, 26 insertions, 0 deletions
diff --git a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h
index b8b8b2b..04a6ccd 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h
+++ b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_domains.h
@@ -741,6 +741,31 @@ static REG_DOMAIN regDomains[] = {
WG1_2467_2467),
.chan11g_turbo = BM1(T3_2437_2437)},
+ {.regDmnEnum = WORC_WORLD,
+ .conformanceTestLimit = NO_CTL,
+ .dfsMask = DFS_FCC3 | DFS_ETSI,
+ .pscan = PSCAN_WWR,
+ .flags = ADHOC_PER_11D,
+ .chan11a = BM4(W1_5260_5320,
+ W1_5180_5240,
+ W1_5745_5825,
+ W1_5500_5700),
+ .chan11b = BM7(W1_2412_2412,
+ W1_2437_2442,
+ W1_2462_2462,
+ W1_2472_2472,
+ W1_2417_2432,
+ W1_2447_2457,
+ W1_2467_2467),
+ .chan11g = BM7(WG1_2412_2412,
+ WG1_2437_2442,
+ WG1_2462_2462,
+ WG1_2472_2472,
+ WG1_2417_2432,
+ WG1_2447_2457,
+ WG1_2467_2467),
+ .chan11g_turbo = BM1(T3_2437_2437)},
+
{.regDmnEnum = NULL1,
.conformanceTestLimit = NO_CTL,
}
diff --git a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h
index b1b8edd..f77be22 100644
--- a/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h
+++ b/sys/dev/ath/ath_hal/ah_regdomain/ah_rd_regmap.h
@@ -129,6 +129,7 @@ static REG_DMN_PAIR_MAPPING regDomainPairs[] = {
{WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
{WORA_WORLD, WORA_WORLD, WORA_WORLD, DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
{WORB_WORLD, WORB_WORLD, WORB_WORLD, DISALLOW_ADHOC_11A | DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
+ {WORC_WORLD, WORC_WORLD, WORC_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
};
#endif
OpenPOWER on IntegriCloud