]> git.ipfire.org Git - ipfire-2.x.git/blob - src/patches/linux/linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
Merge remote-tracking branch 'origin/next' into kernel-4.14
[ipfire-2.x.git] / src / patches / linux / linux-4.9.8-iwlwifi-noibss_only_on_radar_chan.patch
1 diff -Naur linux-4.9.8.org/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c linux-4.9.8/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c
2 --- linux-4.9.8.org/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c 2017-02-04 09:47:29.000000000 +0100
3 +++ linux-4.9.8/drivers/net/wireless/intel/iwlwifi/iwl-eeprom-parse.c 2017-02-11 10:35:20.216560908 +0100
4 @@ -615,14 +615,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 =