From: Denis Kenzior <denkenz@gmail.com>
To: iwd@lists.linux.dev
Cc: Denis Kenzior <denkenz@gmail.com>
Subject: [PATCH 2/7] p2p: Simplify handshake_state cleanup
Date: Thu, 30 Nov 2023 22:00:02 -0600 [thread overview]
Message-ID: <20231201040020.161143-2-denkenz@gmail.com> (raw)
In-Reply-To: <20231201040020.161143-1-denkenz@gmail.com>
---
src/p2p.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/p2p.c b/src/p2p.c
index 5d96e6825e1a..c823b2b134dd 100644
--- a/src/p2p.c
+++ b/src/p2p.c
@@ -1496,7 +1496,7 @@ static void p2p_handshake_event(struct handshake_state *hs,
static void p2p_try_connect_group(struct p2p_device *dev)
{
struct scan_bss *bss = dev->conn_wsc_bss;
- struct handshake_state *hs = NULL;
+ _auto_(handshake_state_free) struct handshake_state *hs = NULL;
struct iovec ie_iov[16];
int ie_num = 0;
int r;
@@ -1562,6 +1562,7 @@ static void p2p_try_connect_group(struct p2p_device *dev)
goto error;
}
+ l_steal_ptr(hs);
dev->conn_retry_count++;
done:
@@ -1570,9 +1571,6 @@ done:
error:
not_supported:
- if (hs)
- handshake_state_free(hs);
-
p2p_connect_failed(dev);
goto done;
}
--
2.43.0
next prev parent reply other threads:[~2023-12-01 4:01 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-01 4:00 [PATCH 1/7] handshake: Add cleanup function for handshake_state Denis Kenzior
2023-12-01 4:00 ` Denis Kenzior [this message]
2023-12-01 4:00 ` [PATCH 3/7] p2p: Simplify cleanup of ies Denis Kenzior
2023-12-01 4:00 ` [PATCH 4/7] netdev: iov_ie_append: Support iovecs with multiple IEs Denis Kenzior
2023-12-01 4:00 ` [PATCH 5/7] p2p: Use handshake to pass vendor ies Denis Kenzior
2023-12-01 4:00 ` [PATCH 6/7] wsc: " Denis Kenzior
2023-12-01 4:00 ` [PATCH 7/7] netdev: Remove vendor_ies from netdev_connect signature Denis Kenzior
2023-12-01 12:42 ` [PATCH 1/7] handshake: Add cleanup function for handshake_state James Prestwood
2023-12-01 15:08 ` Denis Kenzior
2023-12-01 15:22 ` James Prestwood
2023-12-01 15:32 ` James Prestwood
2023-12-01 16:06 ` James Prestwood
2023-12-01 16:32 ` Denis Kenzior
2023-12-01 16:47 ` James Prestwood
2023-12-01 16:30 ` Denis Kenzior
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231201040020.161143-2-denkenz@gmail.com \
--to=denkenz@gmail.com \
--cc=iwd@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox