]>
Commit | Line | Data |
---|---|---|
5c8167f5 AF |
1 | 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 |
2 | --- linux-3.10.34.org/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c 2014-03-24 05:42:03.000000000 +0100 | |
3 | +++ linux-3.10.34/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c 2014-03-25 09:08:28.548634788 +0100 | |
4 | @@ -613,14 +613,16 @@ | |
5 | /* set no-HT40, will enable as appropriate later */ | |
6 | channel->flags = IEEE80211_CHAN_NO_HT40; | |
7 | ||
8 | + | |
9 | + if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR) { | |
10 | + channel->flags |= IEEE80211_CHAN_RADAR; | |
11 | + | |
12 | if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS)) | |
13 | channel->flags |= IEEE80211_CHAN_NO_IBSS; | |
14 | ||
15 | if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE)) | |
16 | channel->flags |= IEEE80211_CHAN_PASSIVE_SCAN; | |
17 | - | |
18 | - if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR) | |
19 | - channel->flags |= IEEE80211_CHAN_RADAR; | |
20 | +} | |
21 | ||
22 | /* Initialize regulatory-based run-time data */ | |
23 | channel->max_power = |