Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-22 14:49:24 +01:00
Code Releases Activity

frame-xchg: create global group enum

Browse Source 
Only P2P utilizes groups for now but to avoid conflicts in group
numbers for other modules create a global list which can be added
to as needed.
This commit is contained in:
James Prestwood 2022-09-15 15:07:31 -07:00 committed by Denis Kenzior
parent 7f81ab9bbb
commit bced9dcf4b
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frame-xchg.h
View File

@ -37,6 +37,12 @@ struct frame_xchg_prefix {
size_t len; size_t len;
}; };
enum frame_xchg_group {
FRAME_GROUP_DEFAULT = 0,
FRAME_GROUP_P2P_LISTEN,
FRAME_GROUP_P2P_CONNECT,
};
bool frame_watch_add(uint64_t wdev_id, uint32_t group, uint16_t frame_type, bool frame_watch_add(uint64_t wdev_id, uint32_t group, uint16_t frame_type,
const uint8_t *prefix, size_t prefix_len, const uint8_t *prefix, size_t prefix_len,
frame_watch_cb_t handler, void *user_data, frame_watch_cb_t handler, void *user_data,

24
src/p2p.c
View File

@ -190,12 +190,6 @@ static const int channels_scan_2_4_other[] = { 2, 3, 4, 5, 7, 8, 9, 10 };
*/ */
#define P2P_GO_INTENT 2 #define P2P_GO_INTENT 2
enum {
FRAME_GROUP_DEFAULT = 0,
FRAME_GROUP_LISTEN,
FRAME_GROUP_CONNECT,
};
static bool p2p_device_match(const void *a, const void *b) static bool p2p_device_match(const void *a, const void *b)
{ {
const struct p2p_device *dev = a; const struct p2p_device *dev = a;
@ -718,7 +712,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_P2P_CONNECT);
frame_xchg_stop_wdev(dev->wdev_id); frame_xchg_stop_wdev(dev->wdev_id);
if (!dev->enabled || (dev->enabled && dev->start_stop_cmd_id)) { if (!dev->enabled || (dev->enabled && dev->start_stop_cmd_id)) {
@ -2527,13 +2521,13 @@ respond:
if (status == P2P_STATUS_SUCCESS) if (status == P2P_STATUS_SUCCESS)
p2p_peer_frame_xchg(peer, iov, dev->addr, 0, 600, 0, true, p2p_peer_frame_xchg(peer, iov, dev->addr, 0, 600, 0, true,
FRAME_GROUP_CONNECT, FRAME_GROUP_P2P_CONNECT,
p2p_go_negotiation_resp_done, p2p_go_negotiation_resp_done,
&p2p_frame_go_neg_confirm, &p2p_frame_go_neg_confirm,
p2p_go_negotiation_confirm_cb, NULL); p2p_go_negotiation_confirm_cb, NULL);
else else
p2p_peer_frame_xchg(peer, iov, dev->addr, 0, 0, 0, true, p2p_peer_frame_xchg(peer, iov, dev->addr, 0, 0, 0, true,
FRAME_GROUP_CONNECT, FRAME_GROUP_P2P_CONNECT,
p2p_go_negotiation_resp_err_done, NULL); p2p_go_negotiation_resp_err_done, NULL);
l_debug("GO Negotiation Response sent with status %i", status); l_debug("GO Negotiation Response sent with status %i", status);
@ -2804,7 +2798,7 @@ static bool p2p_go_negotiation_resp_cb(const struct mmpdu_header *mpdu,
iov[iov_len].iov_base = NULL; iov[iov_len].iov_base = NULL;
p2p_peer_frame_xchg(dev->conn_peer, iov, dev->conn_peer->device_addr, p2p_peer_frame_xchg(dev->conn_peer, iov, dev->conn_peer->device_addr,
0, 0, 0, false, FRAME_GROUP_CONNECT, 0, 0, 0, false, FRAME_GROUP_P2P_CONNECT,
p2p_go_negotiation_confirm_done, NULL); p2p_go_negotiation_confirm_done, NULL);
l_free(confirm_body); l_free(confirm_body);
@ -2893,7 +2887,7 @@ static void p2p_start_go_negotiation(struct p2p_device *dev)
p2p_peer_frame_xchg(dev->conn_peer, iov, dev->conn_peer->device_addr, p2p_peer_frame_xchg(dev->conn_peer, iov, dev->conn_peer->device_addr,
100, resp_timeout, 256, false, 100, resp_timeout, 256, false,
FRAME_GROUP_CONNECT, FRAME_GROUP_P2P_CONNECT,
p2p_go_negotiation_req_done, p2p_go_negotiation_req_done,
&p2p_frame_go_neg_resp, &p2p_frame_go_neg_resp,
p2p_go_negotiation_resp_cb, NULL); p2p_go_negotiation_resp_cb, NULL);
@ -3035,7 +3029,7 @@ static void p2p_start_provision_discovery(struct p2p_device *dev)
* sent to the P2P Device Address of the P2P Group Owner" * sent to the P2P Device Address of the P2P Group Owner"
*/ */
p2p_peer_frame_xchg(dev->conn_peer, iov, dev->conn_peer->device_addr, p2p_peer_frame_xchg(dev->conn_peer, iov, dev->conn_peer->device_addr,
200, 600, 8, false, FRAME_GROUP_CONNECT, 200, 600, 8, false, FRAME_GROUP_P2P_CONNECT,
p2p_provision_disc_req_done, p2p_provision_disc_req_done,
&p2p_frame_pd_resp, p2p_provision_disc_resp_cb, &p2p_frame_pd_resp, p2p_provision_disc_resp_cb,
NULL); NULL);
@ -4167,9 +4161,9 @@ static void p2p_device_discovery_start(struct p2p_device *dev)
dev->listen_channel = channels_social[l_getrandom_uint32() % dev->listen_channel = channels_social[l_getrandom_uint32() %
L_ARRAY_SIZE(channels_social)]; L_ARRAY_SIZE(channels_social)];
frame_watch_add(dev->wdev_id, FRAME_GROUP_LISTEN, 0x0040, frame_watch_add(dev->wdev_id, FRAME_GROUP_P2P_LISTEN, 0x0040,
(uint8_t *) "", 0, p2p_device_probe_cb, dev, NULL); (uint8_t *) "", 0, p2p_device_probe_cb, dev, NULL);
frame_watch_add(dev->wdev_id, FRAME_GROUP_LISTEN, 0x00d0, frame_watch_add(dev->wdev_id, FRAME_GROUP_P2P_LISTEN, 0x00d0,
p2p_frame_go_neg_req.data, p2p_frame_go_neg_req.len, p2p_frame_go_neg_req.data, p2p_frame_go_neg_req.len,
p2p_device_go_negotiation_req_cb, dev, NULL); p2p_device_go_negotiation_req_cb, dev, NULL);
@ -4187,7 +4181,7 @@ static void p2p_device_discovery_stop(struct p2p_device *dev)
l_timeout_remove(dev->scan_timeout); l_timeout_remove(dev->scan_timeout);
p2p_device_roc_cancel(dev); p2p_device_roc_cancel(dev);
frame_watch_group_remove(dev->wdev_id, FRAME_GROUP_LISTEN); frame_watch_group_remove(dev->wdev_id, FRAME_GROUP_P2P_LISTEN);
} }
static void p2p_device_enable_cb(struct l_genl_msg *msg, void *user_data) static void p2p_device_enable_cb(struct l_genl_msg *msg, void *user_data)