[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 57c209d558e0b410d5f42493d328d2c06cef20ac

[git@ipfire.org]

[-- Attachment #1: Type: text/plain, Size: 3996 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".

The branch, next has been updated
       via  57c209d558e0b410d5f42493d328d2c06cef20ac (commit)
       via  5c8167f5766250bdc3b57e6242e487fb467f895f (commit)
      from  f763ff3224dec67963bd47ef176085d7dd310fc0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 57c209d558e0b410d5f42493d328d2c06cef20ac
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Mar 25 13:03:56 2014 +0100

    wlanap.cgi: fix detection of not useable channels.

commit 5c8167f5766250bdc3b57e6242e487fb467f895f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Tue Mar 25 12:59:37 2014 +0100

    iwlwifi: use noibss flags only on radar detection channels.

-----------------------------------------------------------------------

Summary of changes:
 html/cgi-bin/wlanap.cgi                            |  2 +-
 lfs/linux                                          |  1 +
 ...3.10.34-iwlwifi-noibss_only_on_radar_chan.patch | 23 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/patches/linux-3.10.34-iwlwifi-noibss_only_on_radar_chan.patch

Difference in files:
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index 5b2490d..16b3fea 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;
 
-(a)channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS)" 2>/dev/null`;
+(a)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;
diff --git a/lfs/linux b/lfs/linux
index 9f82ab0..1f91c0b 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/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 0000000..cc76fe6
--- /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 =


hooks/post-receive
--
IPFire 2.x development tree