Attachment #101165 for bug #140567

View | Details | Raw Unified | Return to bug 140567
Collapse All | Expand All





	WOR9_WORLD	= 0x69,		/* World9 (WO9 SKU) */	
	WORA_WORLD	= 0x6A,		/* WorldA (WOA SKU) */	
	WORB_WORLD	= 0x6B,		/* WorldB (WOB SKU) */

	MKK3_MKKB	= 0x80,		/* Japan UNI-1 even + MKKB */
	MKK3_MKKA2	= 0x81,		/* Japan UNI-1 even + MKKA2 */

	{EU1_WORLD,	EU1_WORLD,	EU1_WORLD,	NO_REQ, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
	{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 },
};

/* 

				      WG1_2467_2467),
	 .chan11g_turbo		= BM1(T3_2437_2437)},

	{.regDmnEnum		= WORB_WORLD,
	 .conformanceTestLimit	= NO_CTL,
	 .dfsMask		= DFS_FCC3 | DFS_ETSI,
	 .pscan			= PSCAN_WWR,
	 .flags			= DISALLOW_ADHOC_11A,
	 .chan11a		= BM3(W1_5260_5320,
				      W1_5180_5240,
				      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,
	}

Return to bug 140567

Lines 170-175 Link Here

(-)sys/dev/ath/ath_hal/ah_regdomain.c (+26 lines)
170		170
171	WOR9_WORLD = 0x69, /* World9 (WO9 SKU) */	171	WOR9_WORLD = 0x69, /* World9 (WO9 SKU) */
172	WORA_WORLD = 0x6A, /* WorldA (WOA SKU) */	172	WORA_WORLD = 0x6A, /* WorldA (WOA SKU) */
		173	WORB_WORLD = 0x6B, /* WorldB (WOB SKU) */
173		174
174	MKK3_MKKB = 0x80, /* Japan UNI-1 even + MKKB */	175	MKK3_MKKB = 0x80, /* Japan UNI-1 even + MKKB */
175	MKK3_MKKA2 = 0x81, /* Japan UNI-1 even + MKKA2 */	176	MKK3_MKKA2 = 0x81, /* Japan UNI-1 even + MKKA2 */
Lines 432-437 Link Here
432	{EU1_WORLD, EU1_WORLD, EU1_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },	433	{EU1_WORLD, EU1_WORLD, EU1_WORLD, NO_REQ, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
433	{WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, DISALLOW_ADHOC_11A \| DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },	434	{WOR9_WORLD, WOR9_WORLD, WOR9_WORLD, DISALLOW_ADHOC_11A \| DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
434	{WORA_WORLD, WORA_WORLD, WORA_WORLD, DISALLOW_ADHOC_11A \| DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },	435	{WORA_WORLD, WORA_WORLD, WORA_WORLD, DISALLOW_ADHOC_11A \| DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
		436	{WORB_WORLD, WORB_WORLD, WORB_WORLD, DISALLOW_ADHOC_11A \| DISALLOW_ADHOC_11A_TURB, NO_REQ, PSCAN_DEFER, CTRY_DEFAULT },
435	};	437	};
436		438
437	/*	439	/*
Lines 1681-1686 Link Here
1681	WG1_2467_2467),	1683	WG1_2467_2467),
1682	.chan11g_turbo = BM1(T3_2437_2437)},	1684	.chan11g_turbo = BM1(T3_2437_2437)},
1683		1685
		1686	{.regDmnEnum = WORB_WORLD,
		1687	.conformanceTestLimit = NO_CTL,
		1688	.dfsMask = DFS_FCC3 \| DFS_ETSI,
		1689	.pscan = PSCAN_WWR,
		1690	.flags = DISALLOW_ADHOC_11A,
		1691	.chan11a = BM3(W1_5260_5320,
		1692	W1_5180_5240,
		1693	W1_5500_5700),
		1694	.chan11b = BM7(W1_2412_2412,
		1695	W1_2437_2442,
		1696	W1_2462_2462,
		1697	W1_2472_2472,
		1698	W1_2417_2432,
		1699	W1_2447_2457,
		1700	W1_2467_2467),
		1701	.chan11g = BM7(WG1_2412_2412,
		1702	WG1_2437_2442,
		1703	WG1_2462_2462,
		1704	WG1_2472_2472,
		1705	WG1_2417_2432,
		1706	WG1_2447_2457,
		1707	WG1_2467_2467),
		1708	.chan11g_turbo = BM1(T3_2437_2437)},
		1709
1684	{.regDmnEnum = NULL1,	1710	{.regDmnEnum = NULL1,
1685	.conformanceTestLimit = NO_CTL,	1711	.conformanceTestLimit = NO_CTL,
1686	}	1712	}