Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

frame-xchg: add destroy function to start() APIs 

This makes things more consistent with other IWD APIs as well as
prepares for unifying frame-xchg and scanning.
This commit is contained in:
James Prestwood 2020-06-23 08:42:51 -07:00 committed by Denis Kenzior
parent f7c036a801
commit 05ad0120a8
3 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/frame-xchg.c
View File

@ -106,6 +106,7 @@ struct frame_xchg_data {
struct l_timeout *timeout; struct l_timeout *timeout;
struct l_queue *rx_watches; struct l_queue *rx_watches;
frame_xchg_cb_t cb; frame_xchg_cb_t cb;
frame_xchg_destroy_func_t destroy;
void *user_data; void *user_data;
uint32_t group_id; uint32_t group_id;
unsigned int retry_cnt; unsigned int retry_cnt;
@ -770,26 +771,25 @@ static void frame_xchg_reset(struct frame_xchg_data *fx)
frame_xchg_resp_cb, fx); frame_xchg_resp_cb, fx);
} }
static void frame_xchg_destroy(struct frame_xchg_data *fx, int err) static void frame_xchg_destroy(void *user_data)
{ {
if (fx->cb) struct frame_xchg_data *fx = user_data;
fx->cb(err, fx->user_data);
if (fx->destroy)
fx->destroy(fx->user_data);
frame_xchg_reset(fx); frame_xchg_reset(fx);
l_free(fx); l_free(fx);
} }
static void frame_xchg_cancel(void *user_data)
{
struct frame_xchg_data *fx = user_data;
frame_xchg_destroy(fx, -ECANCELED);
}
static void frame_xchg_done(struct frame_xchg_data *fx, int err) static void frame_xchg_done(struct frame_xchg_data *fx, int err)
{ {
l_queue_remove(frame_xchgs, fx); l_queue_remove(frame_xchgs, fx);
frame_xchg_destroy(fx, err);
if (fx->cb)
fx->cb(err, fx->user_data);
frame_xchg_destroy(fx);
} }
static void frame_xchg_timeout_destroy(void *user_data) static void frame_xchg_timeout_destroy(void *user_data)
@ -1073,20 +1073,23 @@ static bool frame_xchg_match(const void *a, const void *b)
void frame_xchg_start(uint64_t wdev_id, struct iovec *frame, uint32_t freq, void frame_xchg_start(uint64_t wdev_id, struct iovec *frame, uint32_t freq,
unsigned int retry_interval, unsigned int resp_timeout, unsigned int retry_interval, unsigned int resp_timeout,
unsigned int retries_on_ack, uint32_t group_id, unsigned int retries_on_ack, uint32_t group_id,
frame_xchg_cb_t cb, void *user_data, ...) frame_xchg_cb_t cb, void *user_data,
frame_xchg_destroy_func_t destroy, ...)
{ {
va_list args; va_list args;
va_start(args, user_data); va_start(args, destroy);
frame_xchg_startv(wdev_id, frame, freq, retry_interval, resp_timeout, frame_xchg_startv(wdev_id, frame, freq, retry_interval, resp_timeout,
retries_on_ack, group_id, cb, user_data, args); retries_on_ack, group_id, cb, user_data,
destroy, args);
va_end(args); va_end(args);
} }
void frame_xchg_startv(uint64_t wdev_id, struct iovec *frame, uint32_t freq, void frame_xchg_startv(uint64_t wdev_id, struct iovec *frame, uint32_t freq,
unsigned int retry_interval, unsigned int resp_timeout, unsigned int retry_interval, unsigned int resp_timeout,
unsigned int retries_on_ack, uint32_t group_id, unsigned int retries_on_ack, uint32_t group_id,
frame_xchg_cb_t cb, void *user_data, va_list resp_args) frame_xchg_cb_t cb, void *user_data,
frame_xchg_destroy_func_t destroy, va_list resp_args)
{ {
struct frame_xchg_data *fx; struct frame_xchg_data *fx;
size_t frame_len; size_t frame_len;
@ -1137,6 +1140,7 @@ void frame_xchg_startv(uint64_t wdev_id, struct iovec *frame, uint32_t freq,
fx->resp_timeout = resp_timeout; fx->resp_timeout = resp_timeout;
fx->retries_on_ack = retries_on_ack; fx->retries_on_ack = retries_on_ack;
fx->cb = cb; fx->cb = cb;
fx->destroy = destroy;
fx->user_data = user_data; fx->user_data = user_data;
fx->group_id = group_id; fx->group_id = group_id;
@ -1343,7 +1347,7 @@ static void frame_xchg_exit(void)
struct l_queue *xchgs = frame_xchgs; struct l_queue *xchgs = frame_xchgs;
frame_xchgs = NULL; frame_xchgs = NULL;
l_queue_destroy(xchgs, frame_xchg_cancel); l_queue_destroy(xchgs, frame_xchg_destroy);
watch_groups = NULL; watch_groups = NULL;
l_queue_destroy(groups, frame_watch_group_destroy); l_queue_destroy(groups, frame_watch_group_destroy);

6
src/frame-xchg.h
View File

@ -46,9 +46,11 @@ bool frame_watch_wdev_remove(uint64_t wdev_id);
void frame_xchg_start(uint64_t wdev_id, struct iovec *frame, uint32_t freq, void frame_xchg_start(uint64_t wdev_id, struct iovec *frame, uint32_t freq,
unsigned int retry_interval, unsigned int resp_timeout, unsigned int retry_interval, unsigned int resp_timeout,
unsigned int retries_on_ack, uint32_t group_id, unsigned int retries_on_ack, uint32_t group_id,
frame_xchg_cb_t cb, void *user_data, ...); frame_xchg_cb_t cb, void *user_data,
frame_xchg_destroy_func_t destroy, ...);
void frame_xchg_startv(uint64_t wdev_id, struct iovec *frame, uint32_t freq, void frame_xchg_startv(uint64_t wdev_id, struct iovec *frame, uint32_t freq,
unsigned int retry_interval, unsigned int resp_timeout, unsigned int retry_interval, unsigned int resp_timeout,
unsigned int retries_on_ack, uint32_t group_id, unsigned int retries_on_ack, uint32_t group_id,
frame_xchg_cb_t cb, void *user_data, va_list resp_args); frame_xchg_cb_t cb, void *user_data,
frame_xchg_destroy_func_t destroy, va_list resp_args);
void frame_xchg_stop(uint64_t wdev_id); void frame_xchg_stop(uint64_t wdev_id);

2
src/p2p.c
View File

@ -460,7 +460,7 @@ static void p2p_peer_frame_xchg(struct p2p_peer *peer, struct iovec *tx_body,
va_start(args, cb); va_start(args, cb);
frame_xchg_startv(dev->wdev_id, frame, freq, retry_interval, frame_xchg_startv(dev->wdev_id, frame, freq, retry_interval,
resp_timeout, retries_on_ack, group_id, resp_timeout, retries_on_ack, group_id,
cb, dev, args); cb, dev, NULL, args);
va_end(args); va_end(args);
l_free(frame); l_free(frame);