From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 26 Mar 2014 22:35:18 +0000 (+0100)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=7add463e51039d0409545f7279d43a66eba1d532;hp=36d809efb637c618359f40c1ecd8d820fcb2c882

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
---

diff --git a/html/cgi-bin/entropy.cgi b/html/cgi-bin/entropy.cgi
old mode 100755
new mode 100644
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 5b2490da0..50806ac78 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -265,7 +265,7 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
 my $wiphy = `iw dev $wlanapsettings{'INTERFACE'} info | grep wiphy | cut -d" " -f2`;
 chomp $wiphy;
 
-@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS)" 2>/dev/null`;
+@channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS" | grep -v "passive scanning" 2>/dev/null`;
 # get available channels
 
 my @temp;
@@ -512,7 +512,7 @@ if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
 	 @status =  `wlanconfig $wlanapsettings{'INTERFACE'} list`;
 }
 if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
-	 @status =  `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump`;
+	 @status =  `iw dev $wlanapsettings{'INTERFACE'} info && iw dev $wlanapsettings{'INTERFACE'} station dump && echo ""`;
 }
 print <<END
 <br />
diff --git a/lfs/hostapd b/lfs/hostapd
index 36343de37..5560a4277 100644
--- a/lfs/hostapd
+++ b/lfs/hostapd
@@ -32,7 +32,7 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = hostapd
-PAK_VER    = 28
+PAK_VER    = 29
 
 DEPS       = ""
 
diff --git a/lfs/linux b/lfs/linux
index 9f82ab0d5..1f91c0b72 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -136,6 +136,7 @@ endif
 
 	# Wlan Patches
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-drivers-3.8.3-ath_ignore_eeprom_regdomain.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch
 
 	# mISDN Patches
 	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mISDN_hfc-s_add_id.patch
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index c0b11e6af..8f59a7f16 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -75,7 +75,10 @@ case "${1}" in
 			fi
 		fi
 
-		# First reset to World (00) and then set new country
+		# First set to any country then reset to World (00)
+		# and then set new country because the card is only
+		# reprogrammed if the region was changed.
+		/usr/sbin/iw reg set DE
 		/usr/sbin/iw reg set 00
 		/usr/sbin/iw reg set $COUNTRY
 
diff --git a/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch b/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch
new file mode 100644
index 000000000..cc76fe6ea
--- /dev/null
+++ b/src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch
@@ -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 =