From 506f478f50d912ffcef7f90e892db9218eeffa1d Mon Sep 17 00:00:00 2001
From: Luciano Coelho <luciano.coelho@nokia.com>
Date: Fri, 26 Nov 2010 13:44:59 +0200
Subject: [PATCH] --- yaml --- r: 225311 b: refs/heads/master c:
 573c67cf819d52d2e12adf75a9a8cfbd216190a3 h: refs/heads/master i:   225309:
 83d721c8cf37fe161d1cf923fa3accf026cfe185   225307:
 ab7bd8a6873c55d2d36c5ce16b81333c290a0a3b   225303:
 59568bb55918ee414308ca2b9d07d05fd8f20ef8   225295:
 7240b703b5c655fc1e6cd8cb55b25ffc531827f0   225279:
 0c33c8976083d945b4f0c17d93a26f800aa411fb v: v3

---
 [refs]                                   | 2 +-
 trunk/drivers/net/wireless/wl12xx/main.c | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9d5913299e5e..fc216fefeaf0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6735329934e9acc1941a991ed6f6ad4be3e082a5
+refs/heads/master: 573c67cf819d52d2e12adf75a9a8cfbd216190a3
diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c
index 35cfcf675795..97eb186b5a8a 100644
--- a/trunk/drivers/net/wireless/wl12xx/main.c
+++ b/trunk/drivers/net/wireless/wl12xx/main.c
@@ -336,7 +336,9 @@ static int wl1271_dev_notify(struct notifier_block *me, unsigned long what,
 }
 
 static int wl1271_reg_notify(struct wiphy *wiphy,
-			     struct regulatory_request *request) {
+			     struct regulatory_request *request)
+{
+	struct wl1271 *wl = wiphy_to_ieee80211_hw(wiphy)->priv;
 	struct ieee80211_supported_band *band;
 	struct ieee80211_channel *ch;
 	int i;
@@ -347,6 +349,11 @@ static int wl1271_reg_notify(struct wiphy *wiphy,
 		if (ch->flags & IEEE80211_CHAN_DISABLED)
 			continue;
 
+		if (!wl->enable_11a) {
+			ch->flags |= IEEE80211_CHAN_DISABLED;
+			continue;
+		}
+
 		if (ch->flags & IEEE80211_CHAN_RADAR)
 			ch->flags |= IEEE80211_CHAN_NO_IBSS |
 				     IEEE80211_CHAN_PASSIVE_SCAN;