diff --git a/wpa_supplicant/pasn_supplicant.c b/wpa_supplicant/pasn_supplicant.c
index 7bd8443fa..2c8c086eb 100644
--- a/wpa_supplicant/pasn_supplicant.c
+++ b/wpa_supplicant/pasn_supplicant.c
@@ -1127,19 +1127,13 @@ fail:
 }
 
 
-static void wpas_pasn_reset(struct wpa_supplicant *wpa_s)
+static void wpa_pasn_reset(struct wpas_pasn *pasn)
 {
-	struct wpas_pasn *pasn = &wpa_s->pasn;
-
 	wpa_printf(MSG_DEBUG, "PASN: Reset");
 
 	crypto_ecdh_deinit(pasn->ecdh);
 	pasn->ecdh = NULL;
 
-	wpas_pasn_cancel_auth_work(wpa_s);
-	wpa_s->pasn_auth_work = NULL;
-
-	eloop_cancel_timeout(wpas_pasn_auth_work_timeout, wpa_s, NULL);
 
 	pasn->akmp = 0;
 	pasn->cipher = 0;
@@ -1176,6 +1170,18 @@ static void wpas_pasn_reset(struct wpa_supplicant *wpa_s)
 }
 
 
+static void wpas_pasn_reset(struct wpa_supplicant *wpa_s)
+{
+	struct wpas_pasn *pasn = &wpa_s->pasn;
+
+	wpas_pasn_cancel_auth_work(wpa_s);
+	wpa_s->pasn_auth_work = NULL;
+	eloop_cancel_timeout(wpas_pasn_auth_work_timeout, wpa_s, NULL);
+
+	wpa_pasn_reset(pasn);
+}
+
+
 static int wpas_pasn_set_pmk(struct wpa_supplicant *wpa_s,
 			     struct wpa_ie_data *rsn_data,
 			     struct wpa_pasn_params_data *pasn_data,