reorder nas command line parameters (required for bridge operation)

[openwrt.git] / package / broadcom-wl / files / lib / wifi / broadcom.sh

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 33a3ebb..6cac60c 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -69,6 +69,7 @@ setup_broadcom() {
        _c=0
        nas="$(which nas)"
        nas_cmd=
        _c=0
        nas="$(which nas)"
        nas_cmd=

+       if_up=

        for vif in ${adhoc_if:-$sta_if $ap_if}; do
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"
        for vif in ${adhoc_if:-$sta_if $ap_if}; do
                append vif_pre_up "vif $_c" "$N"
                append vif_post_up "vif $_c" "$N"


@@ -123,18 +124,19 @@ setup_broadcom() {
                append vif_post_up "ssid $ssid" "$N"
                append vif_post_up "enabled 1" "$N"
                
                append vif_post_up "ssid $ssid" "$N"
                append vif_post_up "enabled 1" "$N"
                

+               config_get ifname "$vif" ifname
+               append if_up "ifconfig $ifname up" ";$N"

                [ -z "$nasopts" ] || {
                [ -z "$nasopts" ] || {

-                       config_get ifname "$vif" ifname

                        config_get bridge "$vif" bridge # XXX: integrate with /etc/config/network later
                        eval "${vif}_ssid=\"\$ssid\""
                        mode="-A"
                        [ "$vif" = "$sta_if" ] && mode="-S"
                        config_get bridge "$vif" bridge # XXX: integrate with /etc/config/network later
                        eval "${vif}_ssid=\"\$ssid\""
                        mode="-A"
                        [ "$vif" = "$sta_if" ] && mode="-S"

-                       [ -z "$nas" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 -i $ifname${bridge:+ -l $bridge} $mode -m $auth -w $crypto -s \"\$${vif}_ssid\" -g 3600 $nasopts &"
+                       [ -z "$nas" ] || nas_cmd="${nas_cmd:+$nas_cmd$N}$nas -P /var/run/nas.$ifname.pid -H 34954 ${bridge:+ -l $bridge} -i $ifname $mode -m $auth -w $crypto -s \"\$${vif}_ssid\" -g 3600 $nasopts &"

                }
                _c=$(($_c + 1))
        done
        killall -KILL nas >&- 2>&-
                }
                _c=$(($_c + 1))
        done
        killall -KILL nas >&- 2>&-

-       cat <<EOF
+       wlc stdin <<EOF

 $ifdown
 
 mssid $mssid
 $ifdown
 
 mssid $mssid


@@ -156,6 +158,7 @@ up
 $vif_post_up
 EOF
        eval "$nas_cmd"
 $vif_post_up
 EOF
        eval "$nas_cmd"

+       eval "$if_up"

 }
 
 
 }