diff options
author | Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> | 2012-07-02 02:32:34 -0400 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2012-07-02 09:11:11 -0400 |
commit | 90cdc6df71c3716e660f7d99926d5f24b461c6cc (patch) | |
tree | 19900baedf4bc9a7483776a96ad898d1f004bb6d /net/wireless/reg.c | |
parent | 3a0c52a6d82cc41da965284412608c74aece34e4 (diff) |
wireless: regulatory for 60g
Add regulatory rule for the 60g band
Signed-off-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r-- | net/wireless/reg.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index baf5704740ee..b2b32229b607 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c | |||
@@ -129,7 +129,7 @@ static DECLARE_DELAYED_WORK(reg_timeout, reg_timeout_work); | |||
129 | 129 | ||
130 | /* We keep a static world regulatory domain in case of the absence of CRDA */ | 130 | /* We keep a static world regulatory domain in case of the absence of CRDA */ |
131 | static const struct ieee80211_regdomain world_regdom = { | 131 | static const struct ieee80211_regdomain world_regdom = { |
132 | .n_reg_rules = 5, | 132 | .n_reg_rules = 6, |
133 | .alpha2 = "00", | 133 | .alpha2 = "00", |
134 | .reg_rules = { | 134 | .reg_rules = { |
135 | /* IEEE 802.11b/g, channels 1..11 */ | 135 | /* IEEE 802.11b/g, channels 1..11 */ |
@@ -156,6 +156,9 @@ static const struct ieee80211_regdomain world_regdom = { | |||
156 | REG_RULE(5745-10, 5825+10, 40, 6, 20, | 156 | REG_RULE(5745-10, 5825+10, 40, 6, 20, |
157 | NL80211_RRF_PASSIVE_SCAN | | 157 | NL80211_RRF_PASSIVE_SCAN | |
158 | NL80211_RRF_NO_IBSS), | 158 | NL80211_RRF_NO_IBSS), |
159 | |||
160 | /* IEEE 802.11ad (60gHz), channels 1..3 */ | ||
161 | REG_RULE(56160+2160*1-1080, 56160+2160*3+1080, 2160, 0, 0, 0), | ||
159 | } | 162 | } |
160 | }; | 163 | }; |
161 | 164 | ||