compile fixes for kernel 2.6.34

[openwrt.git] / package / broadcom-wl / files / etc / hotplug.d / net / 20-broadcom_wds

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..f314a25 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,23 @@ 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 5
+                               case "$encryption" in
+                                       psk|PSK)
+                                               nas4not "$network" "$iface" up auto tkip psk "$key" "$ssid"
+                                               ;;
+                                       psk2|PSK2)
+                                               nas4not "$network" "$iface" up auto aes psk "$key" "$ssid"
+                                               ;;
+                                       psk+psk2|psk2+psk|PSK+PSK2|PSK2+PSK)
+                                               nas4not "$network" "$iface" up auto aes+tkip psk "$key" "$ssid"
+                                               ;;
+                                       *)
+                                               nas4not lan "$iface" up auto aes "$encryption" "$key" "$ssid"
+                                               ;;
+                                       esac
+                       }
                }
        }