firewall: add sanity checks to zone default rules (patch from #5459)

[openwrt.git] / package / hostap-driver / files / lib / wifi / hostap.sh

diff --git a/package/hostap-driver/files/lib/wifi/hostap.sh b/package/hostap-driver/files/lib/wifi/hostap.sh
index 1f43b2a..0c7a9d3 100755 (executable)
--- a/package/hostap-driver/files/lib/wifi/hostap.sh
+++ b/package/hostap-driver/files/lib/wifi/hostap.sh
@@ -54,9 +54,13 @@ enable_prism2() {
        local device="$1"
 
        config_get rxantenna "$device" rxantenna
        local device="$1"
 
        config_get rxantenna "$device" rxantenna

-       [ -n "$rxantenna" ] && iwpriv $device antsel_rx "$rxantenna"
-

        config_get txantenna "$device" txantenna
        config_get txantenna "$device" txantenna

+       config_get_bool diversity "$device" diversity
+       [ -n "$diversity" ] && {
+               rxantenna="1"
+               txantenna="1"
+       }
+       [ -n "$rxantenna" ] && iwpriv $device antsel_rx "$rxantenna"

        [ -n "$txantenna" ] && iwpriv $device antsel_tx "$txantenna"
 
        config_get channel "$device" channel
        [ -n "$txantenna" ] && iwpriv $device antsel_tx "$txantenna"
 
        config_get channel "$device" channel


@@ -72,7 +76,7 @@ enable_prism2() {
                config_get ssid "$vif" ssid
                config_get mode "$vif" mode
 
                config_get ssid "$vif" ssid
                config_get mode "$vif" mode
 

-               [ "$mode" = "wds" ] || iwconfig "$device" essid "$ssid"
+               [ "$mode" = "wds" ] || iwconfig "$device" essid -- "$ssid"

 
                case "$mode" in
                        sta)
 
                case "$mode" in
                        sta)