1 files changed, 8 insertions, 1 deletions

diff --git a/drivers/net/wireless/wl12xx/main.c b/drivers/net/wireless/wl12xx/main.c
index 35cfcf675795..97eb186b5a8a 100644
--- a/drivers/net/wireless/wl12xx/main.c
+++ b/drivers/net/wireless/wl12xx/main.c
@@ -336,7 +336,9 @@ out:
 }
 
 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;