really fix webif password access patch for busybox

[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 f5c1ccb..435c440 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -1,3 +1,15 @@
+bridge_interface() {
+       (
+               . /etc/functions.sh
+               include network
+               scan_interfaces
+               cfg="$(find_config "$1")"
+               [ -z "$cfg" ] && return 0
+               config_get iftype "$cfg" type
+               [ "$iftype" = bridge ] && config_get "$iftype" bridge
+       )
+}
+
 scan_broadcom() {
        local device="$1"
 
@@ -121,17 +133,18 @@ setup_broadcom() {
                append vif_post_up "eap_restrict $eap_r" "$N"
                
                config_get ssid "$vif" ssid
+               append vif_post_up "vlan_mode 0"
                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" ] || {
-                       config_get bridge "$vif" bridge # XXX: integrate with /etc/config/network later
+                       bridge="$(bridge_interface "$ifname")"
                        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