diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2015-04-20 15:00:13 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2015-04-20 15:00:13 +0000 |
| commit | e2e2fb168b33c24e61e01e7a2697c035a94ca7b9 (patch) | |
| tree | 92f2ff782e5874f0bc5eed6ea2521d9403a95177 | |
| parent | ce0eddc2fb8195565072ebd05184214c014f820e (diff) | |
| download | upstream-e2e2fb168b33c24e61e01e7a2697c035a94ca7b9.tar.gz upstream-e2e2fb168b33c24e61e01e7a2697c035a94ca7b9.tar.bz2 upstream-e2e2fb168b33c24e61e01e7a2697c035a94ca7b9.zip | |
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>
SVN-Revision: 45520
| -rw-r--r-- | package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index ec0966ea8d..d2641a49c4 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -595,16 +595,15 @@ mac80211_setup_vif() { [ -n "$mp_val" ] && iw dev "$ifname" set mesh_param "$var" "$mp_val" done - # authsae + # authsae or wpa_supplicant json_get_vars key if [ -n "$key" ]; then if [ -e "/lib/wifi/authsae.sh" ]; then . /lib/wifi/authsae.sh authsae_start_interface || failed=1 else - wireless_setup_vif_failed AUTHSAE_NOT_INSTALLED - json_select .. - return + wireless_vif_parse_encryption + mac80211_setup_supplicant || failed=1 fi fi ;; |