From 3268f47540a94b957973154cd050b9716706d49d Mon Sep 17 00:00:00 2001
From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
Date: Wed, 12 Nov 2008 14:21:56 -0800
Subject: [PATCH] --- yaml --- r: 122267 b: refs/heads/master c:
 5203cdb6ad430d3313444ddc6486da70af1a60db h: refs/heads/master i:   122265:
 eadf2829006f0ffa3d6aa510727805aea71f767d   122263:
 2b957d27f08e9561eb7e4d3de86c1ad2ad8a1db5 v: v3

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

diff --git a/[refs] b/[refs]
index a8ee8cff4b76..7ea7584287c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 91e9900418fb01229094fb83befa3591afcae1e7
+refs/heads/master: 5203cdb6ad430d3313444ddc6486da70af1a60db
diff --git a/trunk/net/wireless/reg.c b/trunk/net/wireless/reg.c
index 7a2ce270f4d3..e44f0052687c 100644
--- a/trunk/net/wireless/reg.c
+++ b/trunk/net/wireless/reg.c
@@ -698,34 +698,25 @@ int __regulatory_hint(struct wiphy *wiphy, enum reg_set_by set_by,
 	else if (r)
 		return r;
 
-	switch (set_by) {
-	case REGDOM_SET_BY_CORE:
-	case REGDOM_SET_BY_COUNTRY_IE:
-	case REGDOM_SET_BY_DRIVER:
-	case REGDOM_SET_BY_USER:
-		request = kzalloc(sizeof(struct regulatory_request),
-				  GFP_KERNEL);
-		if (!request)
-			return -ENOMEM;
-
-		request->alpha2[0] = alpha2[0];
-		request->alpha2[1] = alpha2[1];
-		request->initiator = set_by;
-		request->wiphy = wiphy;
-		request->intersect = intersect;
-
-		kfree(last_request);
-		last_request = request;
-		r = call_crda(alpha2);
+	request = kzalloc(sizeof(struct regulatory_request),
+			  GFP_KERNEL);
+	if (!request)
+		return -ENOMEM;
+
+	request->alpha2[0] = alpha2[0];
+	request->alpha2[1] = alpha2[1];
+	request->initiator = set_by;
+	request->wiphy = wiphy;
+	request->intersect = intersect;
+
+	kfree(last_request);
+	last_request = request;
+	r = call_crda(alpha2);
+
 #ifndef CONFIG_WIRELESS_OLD_REGULATORY
-		if (r)
-			printk(KERN_ERR "cfg80211: Failed calling CRDA\n");
+	if (r)
+		printk(KERN_ERR "cfg80211: Failed calling CRDA\n");
 #endif
-		break;
-	default:
-		r = -ENOTSUPP;
-		break;
-	}
 
 	return r;
 }