From 040ec360f90d43fbb9fa0fb9bc1f7f52b09eaf77 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 11 Apr 2015 22:23:31 +0200
Subject: [PATCH] hostapd: remove MADWIFI from initskript

---
 src/initscripts/init.d/hostapd | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/src/initscripts/init.d/hostapd b/src/initscripts/init.d/hostapd
index 1e7cec4809..209f969def 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
-- 
2.39.2