more wpa+wds patches

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7888 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index c08fd69..c384b3e 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -91,7 +91,6 @@ prepare_interface() {
        case "$iftype" in
                bridge)
                        [ -x /usr/sbin/brctl ] && {
-                               ifconfig "$iface" up 2>/dev/null >/dev/null
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        # Bridge existed already. No further processing necesary
@@ -104,6 +103,7 @@ prepare_interface() {
                                        # result in another setup_interface() call, so we simply stop processing
                                        # the current event at this point.
                                }
+                               ifconfig "$iface" up 2>/dev/null >/dev/null
                                return 1
                        }
                ;;

diff --git a/package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds b/package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds
index 0f28eed..788d69c 100644 (file)
--- a/package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds
+++ b/package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds
@@ -16,6 +16,7 @@ setup_broadcom_wds() {
                [ -z "$network" ] && return
                
                config_get addr "$CONFIG_SECTION" bssid
+               addr=$(echo "$addr" | tr 'A-F' 'a-f')
                [ "$addr" = "$remote" ] && {
                        local cfg="$CONFIG_SECTION"
                        
@@ -28,8 +29,11 @@ setup_broadcom_wds() {
                        config_get key "$cfg" key
                        config_get ssid "$cfg" ssid
                
-                       [ "$encryption" == "psk" ] && \
-                       nas4not lan "$iface" up auto aes "$encryption" "$key" "$ssid" 
+                       [ "$encryption" != "none" ] && {
+                               sleep 1
+                               nas4not lan "$iface" up auto aes "$encryption" "$key" "$ssid" 
+                       }
+                       
                }
        }
 

diff --git a/package/broadcom-wl/files/lib/wifi/broadcom.sh b/package/broadcom-wl/files/lib/wifi/broadcom.sh
index 8b02125..abfbfb9 100644 (file)
--- a/package/broadcom-wl/files/lib/wifi/broadcom.sh
+++ b/package/broadcom-wl/files/lib/wifi/broadcom.sh
@@ -191,7 +191,7 @@ enable_broadcom() {
                append vif_post_up "enabled 1" "$N"
                
                config_get ifname "$vif" ifname
-               append if_up "ifconfig $ifname up" ";$N"
+               #append if_up "ifconfig $ifname up" ";$N"
                local net_cfg bridge
                net_cfg="$(find_net_config "$vif")"
                [ -z "$net_cfg" ] || {