[uml] add 2.6.34 support

[openwrt.git] / package / hostapd / files / wpa_supplicant.sh

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 8f7f503..a9f8ca1 100644 (file)
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -6,12 +6,26 @@ wpa_supplicant_setup_vif() {
        # wpa_supplicant should use wext for mac80211 cards
        [ "$driver" = "mac80211" ] && driver='wext'
 
        # wpa_supplicant should use wext for mac80211 cards
        [ "$driver" = "mac80211" ] && driver='wext'
 

-       # make sure we have the psk
+       # make sure we have the encryption type and the psk
+       [ -n "$enc" ] || {
+               config_get enc "$vif" encryption
+       }

        [ -n "$key" ] || {
                config_get key "$vif" key
        }
 
        [ -n "$key" ] || {
                config_get key "$vif" key
        }
 

+       local net_cfg bridge
+       config_get bridge "$vif" bridge
+       [ -z "$bridge" ] && {
+               net_cfg="$(find_net_config "$vif")"
+               [ -z "$net_cfg" ] || bridge="$(bridge_interface "$net_cfg")"
+               config_set "$vif" bridge "$bridge"
+       }
+

        case "$enc" in
        case "$enc" in

+               *none*)
+                       key_mgmt='NONE'
+               ;;

                *wep*)
                        key_mgmt='NONE'
                        config_get key "$vif" key
                *wep*)
                        key_mgmt='NONE'
                        config_get key "$vif" key