From fcb14a83318db1d3028c582f647ce67db76a976c Mon Sep 17 00:00:00 2001 From: Bruno Randolf Date: Tue, 25 Jan 2011 13:15:38 +0900 Subject: [PATCH] --- yaml --- r: 236915 b: refs/heads/master c: ead3dcff31111c3dc1205a383190614f045d94aa h: refs/heads/master i: 236913: 0ee8e003df007b32116393faca653ba4a865926f 236911: 8d3ac097535fe1120852e855ec3ab7b11bd08aef v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ath/ath5k/caps.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index cf51284e66b8..35a53eed2dc6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5719efdde1d0ae8670b96eb8748d1a0dc6a37be2 +refs/heads/master: ead3dcff31111c3dc1205a383190614f045d94aa diff --git a/trunk/drivers/net/wireless/ath/ath5k/caps.c b/trunk/drivers/net/wireless/ath/ath5k/caps.c index 39baee17d0da..f77e8a703c5c 100644 --- a/trunk/drivers/net/wireless/ath/ath5k/caps.c +++ b/trunk/drivers/net/wireless/ath/ath5k/caps.c @@ -57,9 +57,8 @@ 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. */ /* @@ -67,8 +66,10 @@ int ath5k_hw_set_capabilities(struct ath5k_hw *ah) */ 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 */