---

yaml --- r: 225311 b: refs/heads/master c: 573c67c h: refs/heads/master i: 225309: 83d721c 225307: ab7bd8a 225303: 59568bb 225295: 7240b70 225279: 0c33c89 v: v3
git-mirror · Nov 26, 2010 · 506f478 · 506f478
1 parent 35c38f6
commit 506f478
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git 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
@@ -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;