From 8c177634a9f9efb688f3df341c3915859f1fcacd Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Sat, 21 Feb 2009 00:20:37 -0500
Subject: [PATCH] --- yaml --- r: 134935 b: refs/heads/master c:
 68798a62634e58e01d6f1de509b253dcb40625bd h: refs/heads/master i:   134933:
 a356de921a40ef3915289db2348473bc0b890ff9   134931:
 33a749665a8c8ab1898efe10e4235ddcb73c6c1e   134927:
 048fc4f4009ef2b8ca682d88f69ac4759cd00d45 v: v3

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

diff --git a/[refs] b/[refs]
index cba4ba9420c9..3fd93131f026 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69b1572bd82046cc8f730e05c797062ca8c2b535
+refs/heads/master: 68798a62634e58e01d6f1de509b253dcb40625bd
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 3bd2ea2aeccb..85c2c31721ec 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -76,9 +76,8 @@ static const struct ieee80211_regdomain world_regdom = {
 	.n_reg_rules = 1,
 	.alpha2 =  "00",
 	.reg_rules = {
-		REG_RULE(2412-10, 2462+10, 40, 6, 20,
-			NL80211_RRF_PASSIVE_SCAN |
-			NL80211_RRF_NO_IBSS),
+		/* IEEE 802.11b/g, channels 1..11 */
+		REG_RULE(2412-10, 2462+10, 40, 6, 20, 0),
 	}
 };