mac80211: clean up init, remove some redundant checks, fix tx power init (#10113)

[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 3de5b04..1491c6d 100755 (executable)
--- a/package/hostap-driver/files/lib/wifi/hostap.sh
+++ b/package/hostap-driver/files/lib/wifi/hostap.sh
@@ -39,6 +39,9 @@ scan_prism2() {
        config_get vifs "$device" vifs
        local _c=0
        for vif in $vifs; do
        config_get vifs "$device" vifs
        local _c=0
        for vif in $vifs; do

+               config_get_bool disabled "$vif" disabled 0
+               [ $disabled = 0 ] || continue
+

                config_get mode "$vif" mode
                case "$mode" in
                        adhoc|sta|ap|monitor)
                config_get mode "$vif" mode
                case "$mode" in
                        adhoc|sta|ap|monitor)


@@ -112,7 +115,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 "$phy" essid -- "$ssid"
+               [ "$mode" = "wds" ] || iwconfig "$phy" essid ${ssid:+-- }"${ssid:-any}"

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


@@ -246,7 +249,6 @@ detect_prism2() {
                config_foreach check_prism2_device wifi-device
                [ "$found" -gt 0 ] && continue
                cat <<EOF
                config_foreach check_prism2_device wifi-device
                [ "$found" -gt 0 ] && continue
                cat <<EOF

-

 config wifi-device radio$devidx
        option type     prism2
        option channel  11
 config wifi-device radio$devidx
        option type     prism2
        option channel  11