Revert r22094 and r22095

[openwrt.git] / package / hostapd / files / hostapd.sh

diff --git a/package/hostapd/files/hostapd.sh b/package/hostapd/files/hostapd.sh
index 9dc1836..fdb047b 100644 (file)
--- a/package/hostapd/files/hostapd.sh
+++ b/package/hostapd/files/hostapd.sh
@@ -5,6 +5,14 @@ hostapd_set_bss_options() {
 
        config_get enc "$vif" encryption
        config_get wpa_group_rekey "$vif" wpa_group_rekey
 
        config_get enc "$vif" encryption
        config_get wpa_group_rekey "$vif" wpa_group_rekey

+       config_get_bool ap_isolate "$vif" isolate 0
+
+       config_get device "$vif" device
+       config_get hwmode "$device" hwmode
+
+       if [ "$ap_isolate" -gt 0 ]; then
+               append "$var" "ap_isolate=$ap_isolate" "$N"
+       fi

 
        # Examples:
        # psk-mixed/tkip        => WPA1+2 PSK, TKIP
 
        # Examples:
        # psk-mixed/tkip        => WPA1+2 PSK, TKIP


@@ -33,11 +41,16 @@ hostapd_set_bss_options() {
 
        # explicit override for crypto setting
        case "$enc" in
 
        # explicit override for crypto setting
        case "$enc" in

-               *tkip+aes|*tkip+ccmp) crypto="CCMP TKIP";;
+               *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";;

                *aes|*ccmp) crypto="CCMP";;
                *tkip) crypto="TKIP";;
        esac
 
                *aes|*ccmp) crypto="CCMP";;
                *tkip) crypto="TKIP";;
        esac
 

+       # enforce CCMP for 11ng and 11na
+       case "$hwmode" in
+               *ng|*na) crypto="CCMP";;
+       esac
+

        # use crypto/auth settings for building the hostapd config
        case "$enc" in
                *psk*)
        # use crypto/auth settings for building the hostapd config
        case "$enc" in
                *psk*)