Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2025-02-18 00:30:47 +01:00
Code Releases Activity

frame-xchg: Re-add frame_xchg_stop

Browse Source 
In 98cf2bf3ece070bfe7ff45670b95d24b34bf3e13 frame_xchg_stop was removed
and its use in p2p.c was changed to frame_xchg_cancel with the slight
complication that the ID returned by frame_xchg_start had do be stored.
Re-add frame_xchg_stop, (renamed as frame_xchg_stop_wdev) to simplify
this bit in p2p.c.
This commit is contained in:
Andrew Zaborowski 2020-07-31 03:31:26 +02:00 committed by Denis Kenzior
parent 28d3eed32e
commit 8faa0c1f0d
3 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/frame-xchg.c
View File

@ -1188,6 +1188,24 @@ uint32_t frame_xchg_startv(uint64_t wdev_id, struct iovec *frame, uint32_t freq,
&fx->work, 0, &work_ops); &fx->work, 0, &work_ops);
} }
static bool frame_xchg_cancel_by_wdev(void *data, void *user_data)
{
struct frame_xchg_data *fx = data;
const uint64_t *wdev_id = user_data;
if (fx->wdev_id != *wdev_id)
return false;
wiphy_radio_work_done(wiphy_find_by_wdev(fx->wdev_id), fx->work.id);
return true;
}
void frame_xchg_stop_wdev(uint64_t wdev_id)
{
l_queue_foreach_remove(frame_xchgs, frame_xchg_cancel_by_wdev,
&wdev_id);
}
static bool frame_xchg_match_id(const void *a, const void *b) static bool frame_xchg_match_id(const void *a, const void *b)
{ {
const struct frame_xchg_data *fx = a; const struct frame_xchg_data *fx = a;

1
src/frame-xchg.h
View File

@ -53,4 +53,5 @@ uint32_t frame_xchg_startv(uint64_t wdev_id, struct iovec *frame, uint32_t freq,
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 resp_args); frame_xchg_destroy_func_t destroy, va_list resp_args);
void frame_xchg_stop_wdev(uint64_t wdev_id);
void frame_xchg_cancel(uint32_t id); void frame_xchg_cancel(uint32_t id);

17
src/p2p.c
View File

@ -68,7 +68,6 @@ struct p2p_device {
uint32_t start_stop_cmd_id; uint32_t start_stop_cmd_id;
l_dbus_property_complete_cb_t pending_complete; l_dbus_property_complete_cb_t pending_complete;
struct l_dbus_message *pending_message; struct l_dbus_message *pending_message;
uint32_t xchg_id;
uint8_t listen_country[3]; uint8_t listen_country[3];
uint8_t listen_oper_class; uint8_t listen_oper_class;
@ -471,11 +470,7 @@ static void p2p_connection_reset(struct p2p_device *dev)
netdev_watch_remove(dev->conn_netdev_watch_id); netdev_watch_remove(dev->conn_netdev_watch_id);
frame_watch_group_remove(dev->wdev_id, FRAME_GROUP_CONNECT); frame_watch_group_remove(dev->wdev_id, FRAME_GROUP_CONNECT);
frame_xchg_stop_wdev(dev->wdev_id);
if (dev->xchg_id) {
frame_xchg_cancel(dev->xchg_id);
dev->xchg_id = 0;
}
if (!dev->enabled || (dev->enabled && dev->start_stop_cmd_id)) { if (!dev->enabled || (dev->enabled && dev->start_stop_cmd_id)) {
/* /*
@ -557,7 +552,7 @@ static void p2p_peer_frame_xchg(struct p2p_peer *peer, struct iovec *tx_body,
va_start(args, cb); va_start(args, cb);
dev->xchg_id = frame_xchg_startv(dev->wdev_id, frame, freq, frame_xchg_startv(dev->wdev_id, frame, freq,
retry_interval, resp_timeout, retries_on_ack, retry_interval, resp_timeout, retries_on_ack,
group_id, cb, dev, NULL, args); group_id, cb, dev, NULL, args);
va_end(args); va_end(args);
@ -1313,17 +1308,11 @@ static void p2p_go_negotiation_resp_done(int error, void *user_data)
else else
l_error("No GO Negotiation Confirmation frame received"); l_error("No GO Negotiation Confirmation frame received");
dev->xchg_id = 0;
p2p_connect_failed(dev); p2p_connect_failed(dev);
} }
static void p2p_go_negotiation_resp_err_done(int error, void *user_data) static void p2p_go_negotiation_resp_err_done(int error, void *user_data)
{ {
struct p2p_device *dev = user_data;
dev->xchg_id = 0;
if (error) if (error)
l_error("Sending the GO Negotiation Response failed: %s (%i)", l_error("Sending the GO Negotiation Response failed: %s (%i)",
strerror(-error), -error); strerror(-error), -error);
@ -1573,8 +1562,6 @@ static bool p2p_go_negotiation_confirm_cb(const struct mmpdu_header *mpdu,
l_debug(""); l_debug("");
dev->xchg_id = 0;
if (body_len < 8) { if (body_len < 8) {
l_error("GO Negotiation Confirmation frame too short"); l_error("GO Negotiation Confirmation frame too short");
p2p_connect_failed(dev); p2p_connect_failed(dev);