---

yaml
---
r: 236915
b: refs/heads/master
c: ead3dcf
h: refs/heads/master
i:
  236913: 0ee8e00
  236911: 8d3ac09
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5719efdde1d0ae8670b96eb8748d1a0dc6a37be2
+refs/heads/master: ead3dcff31111c3dc1205a383190614f045d94aa

trunk/drivers/net/wireless/ath/ath5k/caps.c

@@ -57,18 +57,19 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah)
 		 * XXX current ieee80211 implementation because the IEEE
 		 * XXX channel mapping does not support negative channel
 		 * XXX numbers (2312MHz is channel -19). Of course, this
-		 * XXX doesn't matter because these channels are out of range
-		 * XXX but some regulation domains like MKK (Japan) will
-		 * XXX support frequencies somewhere around 4.8GHz.
+		 * XXX doesn't matter because these channels are out of the
+		 * XXX legal range.
 		 */
 
 		/*
 		 * Set radio capabilities
 		 */
 
 		if (AR5K_EEPROM_HDR_11A(ee_header)) {
-			/* 4920 */
-			caps->cap_range.range_5ghz_min = 5005;
+			if (ath_is_49ghz_allowed(caps->cap_eeprom.ee_regdomain))
+				caps->cap_range.range_5ghz_min = 4920;
+			else
+				caps->cap_range.range_5ghz_min = 5005;
 			caps->cap_range.range_5ghz_max = 6100;
 
 			/* Set supported modes */