wl1271: Prevent ad-hoc and active scanning on 11a DFS frequencies
authorJuuso Oikarinen <juuso.oikarinen@nokia.com>
Wed, 10 Nov 2010 10:27:19 +0000 (11:27 +0100)
committerLuciano Coelho <luciano.coelho@nokia.com>
Mon, 22 Nov 2010 14:45:11 +0000 (16:45 +0200)
The wl1271 does not support radar detection. Hence, prevent ad-hoc and
active scanning on frequencies requiring DFS.

Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Tested-by: Tuomas Katila <ext-tuomas.2.katila@nokia.com>
Reviewed-by: Luciano Coelho <luciano.coelho@nokia.com>
Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
drivers/net/wireless/wl12xx/main.c

index c00523008be40c37158d712a29e87f40d771456b..07243282e50a2ee08c454a488261f57eadafdf9f 100644 (file)
@@ -335,6 +335,27 @@ out:
        return NOTIFY_OK;
 }
 
+static int wl1271_reg_notify(struct wiphy *wiphy,
+                            struct regulatory_request *request) {
+       struct ieee80211_supported_band *band;
+       struct ieee80211_channel *ch;
+       int i;
+
+       band = wiphy->bands[IEEE80211_BAND_5GHZ];
+       for (i = 0; i < band->n_channels; i++) {
+               ch = &band->channels[i];
+               if (ch->flags & IEEE80211_CHAN_DISABLED)
+                       continue;
+
+               if (ch->flags & IEEE80211_CHAN_RADAR)
+                       ch->flags |= IEEE80211_CHAN_NO_IBSS |
+                                    IEEE80211_CHAN_PASSIVE_SCAN;
+
+       }
+
+       return 0;
+}
+
 static void wl1271_conf_init(struct wl1271 *wl)
 {
 
@@ -2590,6 +2611,8 @@ int wl1271_init_ieee80211(struct wl1271 *wl)
        wl->hw->queues = 4;
        wl->hw->max_rates = 1;
 
+       wl->hw->wiphy->reg_notifier = wl1271_reg_notify;
+
        SET_IEEE80211_DEV(wl->hw, wl1271_wl_to_dev(wl));
 
        return 0;