iwlwifi: use noibss flags only on radar detection channels.

This commit is contained in:
Arne Fitzenreiter
2014-03-25 12:59:37 +01:00
parent f763ff3224
commit 5c8167f576
2 changed files with 24 additions and 0 deletions

View File

@@ -0,0 +1,23 @@
diff -Naur linux-3.10.34.org/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c linux-3.10.34/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c
--- linux-3.10.34.org/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c 2014-03-24 05:42:03.000000000 +0100
+++ linux-3.10.34/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c 2014-03-25 09:08:28.548634788 +0100
@@ -613,14 +613,16 @@
/* set no-HT40, will enable as appropriate later */
channel->flags = IEEE80211_CHAN_NO_HT40;
+
+ if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR) {
+ channel->flags |= IEEE80211_CHAN_RADAR;
+
if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS))
channel->flags |= IEEE80211_CHAN_NO_IBSS;
if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE))
channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN;
-
- if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR)
- channel->flags |= IEEE80211_CHAN_RADAR;
+}
/* Initialize regulatory-based run-time data */
channel->max_power =