Update libvirt to 2.1

[ipfire-2.x.git] / src / patches / linux-3.14.22-iwlwifi-noibss_only_on_radar_chan.patch

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
--- linux-3.14.22.org/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c	2014-10-15 08:42:04.000000000 +0200
+++ linux-3.14.22/drivers/net/wireless/iwlwifi/iwl-eeprom-parse.c	2014-10-24 17:33:57.165155190 +0200
@@ -613,14 +613,15 @@
 			/* 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_IR;
 
 			if (!(eeprom_ch->flags & EEPROM_CHANNEL_ACTIVE))
 				channel->flags |= IEEE80211_CHAN_NO_IR;
-
-			if (eeprom_ch->flags & EEPROM_CHANNEL_RADAR)
-				channel->flags |= IEEE80211_CHAN_RADAR;
+}
 
 			/* Initialize regulatory-based run-time data */
 			channel->max_power =