commit fe31a9a8fff325bfddbf06fc3e9edaf480824bee
author Dmitry Shmidt <dimitrysh@google.com> Wed Nov 09 13:43:31 2016 -0800
committer Dmitry Shmidt <dimitrysh@google.com> Wed Nov 09 13:43:31 2016 -0800
tree c01b593cafd2be0791365995d50baf84c6ea1591
parent c15e6e519159228b25956b5005ccdc15043e5121

Revert "Cumulative patch from commit 4ec1fd8e42bad9390f14a58225b6e5f6fb691950"

This reverts commit 78a5dac804c22aa6e4ec8226a864d3b0d6ccddbb.

Test: None

wpa_supplicant/mesh_mpm.c

diff --git a/wpa_supplicant/mesh_mpm.c b/wpa_supplicant/mesh_mpm.c
index 6c3fa14..d14c7e3 100644
--- a/wpa_supplicant/mesh_mpm.c
+++ b/wpa_supplicant/mesh_mpm.c
@@ -1135,7 +1135,7 @@
 	 */
 	if (!sta && action_field == PLINK_OPEN &&
 	    (!(mconf->security & MESH_CONF_SEC_AMPE) ||
-	     wpa_auth_pmksa_get(hapd->wpa_auth, mgmt->sa, NULL)))
+	     wpa_auth_pmksa_get(hapd->wpa_auth, mgmt->sa)))
 		sta = mesh_mpm_add_peer(wpa_s, mgmt->sa, &elems);
 
 	if (!sta) {