This patch restores the ability to use WPA with WDS; the current script has
WPA2 hard-coded in. Closes tickets 2548 and 2463.
Signed-off-by: Conrad Hirano <[EMAIL PROTECTED]>
---
Index: package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds
===================================================================
--- package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds (revision 10441)
+++ package/broadcom-wl/files/etc/hotplug.d/net/20-broadcom_wds (working copy)
@@ -5,34 +5,45 @@
local remote="$(wlc ifname "$iface" wdsmac)"
[ -z "$remote" ] && return
-
+
config_cb() {
[ -z "$CONFIG_SECTION" ] && return
-
+
config_get type "$CONFIG_SECTION" TYPE
[ "$type" = "wifi-iface" ] || return
-
+
config_get network "$CONFIG_SECTION" network
[ -z "$network" ] && return
-
+
config_get addr "$CONFIG_SECTION" bssid
addr=$(echo "$addr" | tr 'A-F' 'a-f')
[ "$addr" = "$remote" ] && {
local cfg="$CONFIG_SECTION"
-
+
include /lib/network
scan_interfaces
setup_interface "$iface" "$network"
-
+
config_get encryption "$cfg" encryption
config_get key "$cfg" key
config_get ssid "$cfg" ssid
-
- [ "$encryption" != "none" ] && {
- sleep 1
- nas4not lan "$iface" up auto aes "$encryption"
"$key" "$ssid"
- }
+
+ 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"
+ ;;
+ *)
+ ;;
+ esac
}
}
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
