hostapd: fix driver setting for wpa_s in IBSS/WPA-NONE

This fix is needed to correctly set the driver to use with wpa_s in case of
IBSS/WPA-NONE. The current setting is not made correctly.

Signed-off-by: Antonio Quartulli <ordex@autistici.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32084 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 9c475a8..8caad77 100644 (file)
--- a/package/hostapd/files/wpa_supplicant.sh
+++ b/package/hostapd/files/wpa_supplicant.sh
@@ -6,9 +6,6 @@ wpa_supplicant_setup_vif() {
        local freq=""
        [ -n "$4" ] && freq="frequency=$4"
 
-       # wpa_supplicant should use wext for mac80211 cards
-       [ "$driver" = "mac80211" ] && driver='wext'
-
        # make sure we have the encryption type and the psk
        [ -n "$enc" ] || {
                config_get enc "$vif" encryption
@@ -60,7 +57,12 @@ wpa_supplicant_setup_vif() {
                ;;
                *psk*)
                        key_mgmt='WPA-PSK'
-                       [ "$mode" = "adhoc" -a "$driver" != "nl80211" ] && key_mgmt='WPA-NONE'
+                       # if you want to use PSK with a non-nl80211 driver you
+                       # have to use WPA-NONE and wext driver for wpa_s
+                       [ "$mode" = "adhoc" -a "$driver" != "nl80211" ] && {
+                               key_mgmt='WPA-NONE'
+                               driver='wext'
+                       }
                        config_get_bool usepassphrase "$vif" usepassphrase 1
                        if [ "$usepassphrase" = "1" ]; then
                                passphrase="psk=\"${key}\""