]>
Commit | Line | Data |
---|---|---|
9d3616dc AF |
1 | diff -Naur linux-3.14.22.org/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c linux-3.14.22/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c |
2 | --- linux-3.14.22.org/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c 2014-10-15 08:42:04.000000000 +0200 | |
3 | +++ linux-3.14.22/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c 2014-10-24 17:33:57.165155190 +0200 | |
4 | @@ -613,14 +613,15 @@ | |
5 | /* set no-HT40, will enable as appropriate later */ | |
6 | channel->flags = IEEE80211_CHAN_NO_HT40; | |
7 | ||
8 | + if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR) { | |
9 | + channel->flags |= IEEE80211_CHAN_RADAR; | |
10 | + | |
11 | if (!(eeprom_ch->flags & EEPROM_CHANNEL_IBSS)) | |
12 | channel->flags |= IEEE80211_CHAN_NO_IR; | |
13 | ||
14 | if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE)) | |
15 | channel->flags |= IEEE80211_CHAN_NO_IR; | |
16 | - | |
17 | - if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR) | |
18 | - channel->flags |= IEEE80211_CHAN_RADAR; | |
19 | +} | |
20 | ||
21 | /* Initialize regulatory-based run-time data */ | |
22 | channel->max_power = |