hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mac80211: fallback to wpa_supplicant to setup encrypted mesh 

instead of failing when authsae is not installed, also try using
wpa_supplicant as the newly added -mesh variants support mesh mode
and SAE encryption.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@45520 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2015-04-20 15:00:13 +00:00
parent 4ffcccc4d3
commit 1b96b5271c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
View File

@ -595,16 +595,15 @@ mac80211_setup_vif() {
[ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val" [ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val"
done done
# authsae # authsae or wpa_supplicant
json_get_vars key json_get_vars key
if [ -n "$key" ]; then if [ -n "$key" ]; then
if [ -e "/lib/wifi/authsae.sh" ]; then if [ -e "/lib/wifi/authsae.sh" ]; then
. /lib/wifi/authsae.sh . /lib/wifi/authsae.sh
authsae_start_interface || failed=1 authsae_start_interface || failed=1
else else
wireless_setup_vif_failed AUTHSAE_NOT_INSTALLED wireless_vif_parse_encryption
json_select .. mac80211_setup_supplicant || failed=1
return
fi fi
fi fi
;; ;;