Fix hostapd with open access point and per-device configuration, thanks sn9

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12375 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 660a90c..147736b 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -62,15 +62,19 @@ hostapd_setup_vif() {
                        append hostapd_cfg "wpa_gmk_rekey=640" "$N"
                ;;
                *)
                        append hostapd_cfg "wpa_gmk_rekey=640" "$N"
                ;;
                *)

-                       return 0;
+                       wpa=0

                ;;
        esac
        config_get ifname "$vif" ifname
        config_get bridge "$vif" bridge
        config_get ssid "$vif" ssid
                ;;
        esac
        config_get ifname "$vif" ifname
        config_get bridge "$vif" bridge
        config_get ssid "$vif" ssid

+       config_get device "$vif" device
+       config_get channel "$device" channel

        cat > /var/run/hostapd-$ifname.conf <<EOF
 driver=$driver
 interface=$ifname
        cat > /var/run/hostapd-$ifname.conf <<EOF
 driver=$driver
 interface=$ifname

+hw_mode=g
+channel=$channel

 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0
 ${bridge:+bridge=$bridge}
 ssid=$ssid
 debug=0