From 82672cd06d5685f22e830f34f0ccb01e1e48e0a4 Mon Sep 17 00:00:00 2001
From: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Date: Mon, 2 Jul 2012 09:32:34 +0300
Subject: [PATCH] --- yaml --- r: 315203 b: refs/heads/master c:
 90cdc6df71c3716e660f7d99926d5f24b461c6cc h: refs/heads/master i:   315201:
 237ff309023eae74feedb8be69c842a9746d3bd1   315199:
 93800e707650df1e97c994787ab50a2fea85aaa4 v: v3

---
 [refs]                   | 2 +-
 trunk/net/wireless/reg.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2a92059b4f41..d36bf3039f54 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3a0c52a6d82cc41da965284412608c74aece34e4
+refs/heads/master: 90cdc6df71c3716e660f7d99926d5f24b461c6cc
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index baf5704740ee..b2b32229b607 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -129,7 +129,7 @@ static DECLARE_DELAYED_WORK(reg_timeout, reg_timeout_work);
 
 /* We keep a static world regulatory domain in case of the absence of CRDA */
 static const struct ieee80211_regdomain world_regdom = {
-	.n_reg_rules = 5,
+	.n_reg_rules = 6,
 	.alpha2 =  "00",
 	.reg_rules = {
 		/* IEEE 802.11b/g, channels 1..11 */
@@ -156,6 +156,9 @@ static const struct ieee80211_regdomain world_regdom = {
 		REG_RULE(5745-10, 5825+10, 40, 6, 20,
 			NL80211_RRF_PASSIVE_SCAN |
 			NL80211_RRF_NO_IBSS),
+
+		/* IEEE 802.11ad (60gHz), channels 1..3 */
+		REG_RULE(56160+2160*1-1080, 56160+2160*3+1080, 2160, 0, 0, 0),
 	}
 };