qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-16 20:23:09 +02:00
Code

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

Browse Source 
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
This commit is contained in:
nbd 2012-06-06 15:25:52 +00:00
parent 1f7ad48431
commit dc7944ead9
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/hostapd/files/wpa_supplicant.sh
View File

@ -6,9 +6,6 @@ wpa_supplicant_setup_vif() {
local freq="" local freq=""
[ -n "$4" ] && freq="frequency=$4" [ -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 # make sure we have the encryption type and the psk
[ -n "$enc" ] || { [ -n "$enc" ] || {
config_get enc "$vif" encryption config_get enc "$vif" encryption
@ -60,7 +57,12 @@ wpa_supplicant_setup_vif() {
;; ;;
*psk*) *psk*)
key_mgmt='WPA-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 config_get_bool usepassphrase "$vif" usepassphrase 1
if [ "$usepassphrase" = "1" ]; then if [ "$usepassphrase" = "1" ]; then
passphrase="psk=\"${key}\"" passphrase="psk=\"${key}\""