X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/107bc81f4b4735a9d57cb9ac9e4e9d9b47e03c84..f3154a2f5101b1241306547c237c41ee80b4a955:/package/hostapd/files/hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 9d0fb6054..4a13c19ab 100644
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -77,7 +77,9 @@ hostapd_setup_vif() {
 	config_get channel "$device" channel
 	config_get hwmode "$device" hwmode
 	config_get wpa_group_rekey "$vif" wpa_group_rekey
-	config_get ieee80211d "$vif" ieee80211d 
+	config_get ieee80211d "$vif" ieee80211d
+	config_get_bool wds "$vif" wds 0
+	[ "$wds" -gt 0 -a "$driver" = "nl80211" ] && wds="wds_sta=1" || wds=""
 	case "$hwmode" in
 		bg) hwmode=g;;
 	esac
@@ -89,6 +91,9 @@ hostapd_setup_vif() {
 		[ -n "$hwmode_11n" ] && {
 			hwmode="$hwmode_11n"
 			config_get ht_capab "$device" ht_capab
+			[ -n "$ht_capab" -a -n "${ht_capab%%\[*}" ] && {
+				ht_capab=`echo "[$ht_capab]" | sed -e 's, ,][,g'`
+			}
 		}
 	}
 	cat > /var/run/hostapd-$ifname.conf <<EOF
@@ -106,7 +111,14 @@ ${hwmode_11n:+ieee80211n=1}
 ${ht_capab:+ht_capab=$ht_capab}
 ${wpa_group_rekey:+wpa_group_rekey=$wpa_group_rekey}
 ${ieee80211d:+ieee80211d=$ieee80211d}
+$wds
 $hostapd_cfg
+EOF
+	case "$driver" in
+		madwifi)
+		;;
+		*) 
+			cat >> /var/run/hostapd-$ifname.conf <<EOF
 wme_enabled=1
 wme_ac_bk_cwmin=4
 wme_ac_bk_cwmax=10
@@ -145,6 +157,8 @@ tx_queue_data0_cwmin=3
 tx_queue_data0_cwmax=7
 tx_queue_data0_burst=1.5
 EOF
+		;;
+	esac
 	hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
 }