Re: [PATCH 04/10] dpp: put no station device print behind else if

Re: [PATCH 04/10] dpp: put no station device print behind else if

[Denis Kenzior]

[-- Attachment #1: Type: text/plain, Size: 437 bytes --]

Hi James,

On 1/11/22 18:55, James Prestwood wrote:
> The previous (incorrect) else was removed since it ended up
> printing in most cases since the if clause returned. This should
> have been an else if conditional from the start and only print if the
> station device was not found.
> ---
>   src/dpp.c | 5 ++---
>   1 file changed, 2 insertions(+), 3 deletions(-)
> 

Patches 4 and 5 applied, thanks.

Regards,
-Denis

[PATCH 04/10] dpp: put no station device print behind else if

[James Prestwood]

[-- Attachment #1: Type: text/plain, Size: 951 bytes --]

The previous (incorrect) else was removed since it ended up
printing in most cases since the if clause returned. This should
have been an else if conditional from the start and only print if the
station device was not found.
---
 src/dpp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/dpp.c b/src/dpp.c
index c10ec978..5e07a61a 100644
--- a/src/dpp.c
+++ b/src/dpp.c
@@ -1717,9 +1717,8 @@ static struct l_dbus_message *dpp_dbus_start_enrollee(struct l_dbus *dbus,
 	if (station && station_get_connected_network(station)) {
 		l_warn("cannot be enrollee while connected, please disconnect");
 		return dbus_error_busy(message);
-	}
-
-	l_debug("No station device, continuing anyways...");
+	} else if (!station)
+		l_debug("No station device, continuing anyways...");
 
 	dpp->uri = dpp_generate_uri(dpp->pub_asn1, dpp->pub_asn1_len, 2,
 					netdev_get_address(dpp->netdev), &freq,
-- 
2.31.1