[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 040ec360f90d43fbb9fa0fb9bc1f7f52b09eaf77

[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 040ec360f90d43fbb9fa0fb9bc1f7f52b09eaf77

[git]

[-- Attachment #1: Type: text/plain, Size: 6697 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  040ec360f90d43fbb9fa0fb9bc1f7f52b09eaf77 (commit)
       via  c17883fdcd250064ab1d2f3e922b619d77e282b7 (commit)
       via  05583186d6cabdab8801045c491ba3d606690fb4 (commit)
      from  acb759575e610e8a94f6b05ff19a5418aa7a91b7 (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 040ec360f90d43fbb9fa0fb9bc1f7f52b09eaf77
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Apr 11 22:23:31 2015 +0200

    hostapd: remove MADWIFI from initskript

commit c17883fdcd250064ab1d2f3e922b619d77e282b7
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Apr 11 22:18:26 2015 +0200

    wlansp.cgi: remove MADWIFI functions.

commit 05583186d6cabdab8801045c491ba3d606690fb4
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Sat Apr 11 22:09:18 2015 +0200

    wlanap.cgi: hide "no IR" channels

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

Summary of changes:
 html/cgi-bin/wlanap.cgi        | 31 +++----------------------------
 src/initscripts/init.d/hostapd | 32 +++-----------------------------
 2 files changed, 6 insertions(+), 57 deletions(-)

Difference in files:
diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi
index ec9022d..844c395 100644
--- a/html/cgi-bin/wlanap.cgi
+++ b/html/cgi-bin/wlanap.cgi
@@ -71,7 +71,7 @@ $wlanapsettings{'HW_MODE'} = 'g';
 $wlanapsettings{'PWD'} = 'IPFire-2.x';
 $wlanapsettings{'SYSLOGLEVEL'} = '0';
 $wlanapsettings{'DEBUG'} = '4';
-$wlanapsettings{'DRIVER'} = 'MADWIFI';
+$wlanapsettings{'DRIVER'} = 'NL80211';
 $wlanapsettings{'HTCAPS'} = '';
 
 &General::readhash("/var/ipfire/wlanap/settings", \%wlanapsettings);
@@ -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" | grep -v "passive scanning" 2>/dev/null`;
+(a)channellist_cmd = `iw phy phy$wiphy info | grep " MHz \\\[" | grep -v "(disabled)" | grep -v "no IBSS" | grep -v "no IR" | grep -v "passive scanning" 2>/dev/null`;
 # get available channels
 
 my @temp;
@@ -306,15 +306,6 @@ if ( $wlanapsettings{'DRIVER'} eq 'NL80211' ){
 }
 # get available power
 
-my @temp;
-foreach (@txpower_cmd){
-$_ =~ /(\s)(\d+)(\s)dBm(\s)(.*)(\W)(\d+)(.*)/;
-$txpower = $7;chomp $txpower;
-if ( $txpower =~ /\d+/ ){push(@temp,$txpower."mW");}
-}
-my @txpower = @temp;
-push(@txpower,"auto");
-
 $selected{'SYSLOGLEVEL'}{$wlanapsettings{'SYSLOGLEVEL'}} = "selected='selected'";
 $selected{'DEBUG'}{$wlanapsettings{'DEBUG'}} = "selected='selected'";
 
@@ -437,20 +428,7 @@ END
 ;
 print <<END
 <tr><td width='25%' class='base'>HT Caps:&nbsp;</td><td class='base' colspan='3'><input type='text' name='HTCAPS' size='30' value='$wlanapsettings{'HTCAPS'}' /></td></tr>
-<tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'>
-END
-;
-
-if ( $wlanapsettings{'DRIVER'} eq 'MADWIFI' ){
-	print "<select name='TXPOWER'>";
-	foreach $txpower (@txpower){
-		print "<option $selected{'TXPOWER'}{$txpower}>$txpower</option>&nbsp;dBm";
-	}
-	print "	</select></td></tr>";
-} else {
-	print "<input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>"
-}
-print <<END
+<tr><td width='25%' class='base'>Tx Power:&nbsp;</td><td class='base' colspan='3'><input type='text' name='TXPOWER' size='10' value='$wlanapsettings{'TXPOWER'}' /></td></tr>
 <tr><td width='25%' class='base'>Loglevel (hostapd):&nbsp;</td><td class='base' width='25%'>
 	<select name='SYSLOGLEVEL'>
 		<option value='0' $selected{'SYSLOGLEVEL'}{'0'}>0 ($Lang::tr{'wlanap verbose'})</option>
@@ -508,9 +486,6 @@ print <<END
 END
 ;
 my @status;
-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 && echo ""`;
 }
diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 1e7cec4..209f969 100644
--- a/src/initscripts/init.d/hostapd
+++ b/src/initscripts/init.d/hostapd
@@ -2,7 +2,7 @@
 . /etc/sysconfig/rc
 . ${rc_functions}
 
-CHANNEL="05"
+CHANNEL="6"
 COUNTRY="00"
 TXPOWER="auto"
 INTERFACE="blue0"
@@ -38,9 +38,6 @@ case "${1}" in
 		if [ -e "/sys/class/net/$INTERFACE/phy80211" ]; then
 			DRIVER="NL80211"
 			driver="nl80211"
-		elif [ -e "/sys/class/net/$INTERFACE/madwifi_name_type" ]; then
-			DRIVER="MADWIFI"
-			driver="madwifi"
 		elif [ "$(/bin/grep hostap /sys/class/net/$INTERFACE/uevent)" != "" ]; then
 			DRIVER="HOSTAP"
 			driver="hostap"
@@ -60,14 +57,7 @@ case "${1}" in
 		chmod 644 /var/ipfire/wlanap/settings.tmp
 		mv /var/ipfire/wlanap/settings.tmp /var/ipfire/wlanap/settings
 
-		if [ "$DRIVER" == "MADWIFI" ]; then
-			if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
-				boot_mesg "Setting MADWIFI wlan $INTERFACE to Master mode... "
-				# Set Atheros Cards to master mode
-				/usr/bin/wlanconfig $INTERFACE destroy > /dev/null
-				/usr/bin/wlanconfig $INTERFACE create wlandev wifi0 wlanmode ap > /dev/null
-			fi
-		elif [ "$DRIVER" == "HOSTAP" ]; then
+		if [ "$DRIVER" == "HOSTAP" ]; then
 			if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
 				boot_mesg "Setting HOSTAP wlan $INTERFACE to Master mode... "
 				# Set Prism Cards to master mode
@@ -87,23 +77,7 @@ case "${1}" in
 
 		/usr/bin/hostapd -P /var/run/hostapd /etc/hostapd.conf >/dev/null 2>&1 &
 
-		sleep 2
-
-		if [ $DRIVER == "MADWIFI" ]; then
-			iwpriv $INTERFACE maccmd 3
-			if [ $MACMODE != 0 ]; then
-				FILE="/var/ipfire/wlanap/macfile"
-				exec < $FILE
-				while read LINE
-				do
-					iwpriv $INTERFACE addmac $LINE
-				done
-
-				iwpriv $INTERFACE maccmd $MACMODE
-			fi
-		fi
-
-		sleep 2
+		sleep 3
 
 		if [ "$(/usr/sbin/iwconfig $INTERFACE | /bin/grep "Mode:Master")" == "" ]; then
 			killproc /usr/bin/hostapd > /dev/null 2>&1


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