summaryrefslogtreecommitdiff
path: root/package/hostapd
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-06 15:25:52 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-06-06 15:25:52 +0000
commitdc7944ead9062027c219a809bbbc0d553034798a (patch)
treedbfce95bb3702916609a0c9d3f3bb7a4d3d964a7 /package/hostapd
parent1f7ad48431c1d69aa8f0abe8781aaa7a652dc824 (diff)
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
Diffstat (limited to 'package/hostapd')
-rw-r--r--package/hostapd/files/wpa_supplicant.sh10
1 files changed, 6 insertions, 4 deletions
diff --git a/package/hostapd/files/wpa_supplicant.sh b/package/hostapd/files/wpa_supplicant.sh
index 9c475a8fb1..8caad77c20 100644
--- 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}\""