contrib/meshwizard: add madwifi iface options if needed

[project/luci.git] / contrib / package / meshwizard / files / usr / bin / meshwizard / helpers / setup_wifi.sh

diff --git a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
index c8d0587..41feb86 100755 (executable)
--- a/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
+++ b/contrib/package/meshwizard/files/usr/bin/meshwizard/helpers/setup_wifi.sh
@@ -28,7 +28,6 @@ uci set wireless.${net}=wifi-device
 set_defaults "wifi_device_" wireless.${net}
 
 channel="$(uci -q get meshwizard.netconfig.$net\_channel)"
-vap="$(uci -q get meshwizard.netconfig.$net\_vap)"
 
 if [ -z "$channel" -o "$channel" == "default" ]; then
        channel=$wifi_device_channel
@@ -60,12 +59,19 @@ uci set wireless.$net\_iface=wifi-iface
 # create new wifi-iface for $net from defaults
 set_defaults "wifi_iface_" wireless.$net\_iface
 
+# overwrite some settings for type atheros (madwifi)
+if [ "$type" = "atheros" ]; then
+       set_defaults "madwifi_wifi_iface_" wireless.${net}
+fi
+
 # overwrite defaults
 bssid="$($dir/helpers/gen_bssid.sh $channel $community)"
 
 ssid="$profile_ssid"
 if [ "$profile_ssid_scheme" == "addchannel" ]; then
        ssid="$ssid - ch$channel"
+elif [ "$profile_ssid_scheme" == "addchannelbefore" ]; then
+       ssid="ch$channel.$ssid"
 fi
 
 uci batch << EOF
@@ -77,26 +83,3 @@ EOF
 
 uci_commitverbose "Setup wifi interface for $netrenamed" wireless
 
-## VAP
-ip4addr="$(uci get meshwizard.netconfig.$net\_ip4addr)"
-
-# check if this hardware supports VAPs
-# the interface needs to be up before the check can happen
-
-/sbin/wifi
-
-supports_vap="0"
-$dir/helpers/supports_vap.sh $net $type && supports_vap=1
-
-if [ "$supports_vap" == "1" -a "$vap" == 1 ]; then
-       uci batch <<- EOF
-               set wireless.$net\_iface_dhcp="wifi-iface"
-               set wireless.$net\_iface_dhcp.device="$net"
-               set wireless.$net\_iface_dhcp.mode="ap"
-               set wireless.$net\_iface_dhcp.encryption="none"
-               set wireless.$net\_iface_dhcp.network="${netrenamed}dhcp"
-               set wireless.$net\_iface_dhcp.ssid="Freifunk-$ip4addr"
-       EOF
-       uci_commitverbose "Setup VAP interface for $netrenamed" wireless
-fi
-