From 7ccd2bb35e68af7e6abc27ef69e160c4baf92baf Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Sun, 22 Mar 2020 11:04:28 +0100
Subject: [PATCH] core/wifi: always set owe_transition_mode output in
 nm_wifi_utils_parse_ies()

... and rename output variable.
---
 src/nm-core-utils.c | 7 ++++---
 src/nm-core-utils.h | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c
index 0d5d3e5c4..075d9cb0e 100644
--- a/src/nm-core-utils.c
+++ b/src/nm-core-utils.c
@@ -4355,13 +4355,14 @@ nm_wifi_utils_parse_ies (const guint8 *bytes,
                          gsize len,
                          guint32 *out_max_rate,
                          gboolean *out_metered,
-                         gboolean *owe_transition_mode)
+                         gboolean *out_owe_transition_mode)
 {
 	guint8 id, elem_len;
 	guint32 m;
 
 	NM_SET_OUT (out_max_rate, 0);
 	NM_SET_OUT (out_metered, FALSE);
+	NM_SET_OUT (out_owe_transition_mode, FALSE);
 
 	while (len) {
 		if (len < 2)
@@ -4396,13 +4397,13 @@ nm_wifi_utils_parse_ies (const guint8 *bytes,
 				    && bytes[3] == 0x11)           /* OUI type: Network cost */
 					*out_metered = (bytes[7] > 1); /* Cost level > 1 */
 			}
-			if (   owe_transition_mode
+			if (   out_owe_transition_mode
 			    && elem_len >= 10
 			    && bytes[0] == 0x50            /* OUI: WiFi Alliance */
 			    && bytes[1] == 0x6f
 			    && bytes[2] == 0x9a
 			    && bytes[3] == 0x1c)           /* OUI type: OWE Transition Mode */
-				*owe_transition_mode = TRUE;
+				*out_owe_transition_mode = TRUE;
 			break;
 		}
 
diff --git a/src/nm-core-utils.h b/src/nm-core-utils.h
index b7731b83d..050c2fb5e 100644
--- a/src/nm-core-utils.h
+++ b/src/nm-core-utils.h
@@ -477,7 +477,7 @@ void nm_wifi_utils_parse_ies (const guint8 *bytes,
                               gsize len,
                               guint32 *out_max_rate,
                               gboolean *out_metered,
-                              gboolean *owe_transition_mode);
+                              gboolean *out_owe_transition_mode);
 
 guint8 nm_wifi_utils_level_to_quality (int val);