From: Sujith Manoharan <m.sujith@gmail.com>
Date: Wed, 11 Jan 2017 02:09:22 +0000 (+0530)
Subject: wpa_supplicant: Fix mesh encryption config
X-Git-Tag: v17.01.0-rc1~151
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=593240075f8d3074164ffce99ab67a88277f9fb3;p=openwrt%2Fstaging%2Fchunkeey.git

wpa_supplicant: Fix mesh encryption config

wpa_supplicant allows only SAE as the key management
type for mesh mode. The recent key_mgmt rework unconditionally
added WPA-PSK - this breaks interface bringup and wpa_s
throws this error message:

Line 10: key_mgmt for mesh network should be open or SAE
Line 10: failed to parse network block.
Failed to read or parse configuration '/var/run/wpa_supplicant-wlan0.conf

Fix this by making sure that only SAE is used for mesh.

Signed-off-by: Sujith Manoharan <m.sujith@gmail.com>
---

diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
index a7a6a64e7a..fb23e52e67 100644
--- a/package/network/services/hostapd/files/netifd.sh
+++ b/package/network/services/hostapd/files/netifd.sh
@@ -617,7 +617,10 @@ wpa_supplicant_add_network() {
 		psk)
 			local passphrase
 
-			hostapd_append_wpa_key_mgmt
+			if [ "$_w_mode" != "mesh" ]; then
+				hostapd_append_wpa_key_mgmt
+			fi
+
 			key_mgmt="$wpa_key_mgmt"
 
 			if [ ${#key} -eq 64 ]; then