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

rrm: Always create RRM state 

Right now, RRM is created when a new netdev is detected and its iftype
is of type station.  That means that any devices that start their life
as any other iftype cannot be changed to a station and have RRM function
properly.  Fix that by always creating the RRM state regardless of the
initial iftype.
This commit is contained in:
Denis Kenzior 2021-04-16 16:59:02 -05:00
parent 23249c85c7
commit 5e0069e146
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/rrm.c
View File

@ -770,14 +770,20 @@ static void rrm_state_destroy(void *data)
l_free(rrm);
}
static void rrm_new_state(struct netdev *netdev)
static void rrm_add_frame_watches(struct rrm_state *rrm)
{
static const uint16_t frame_type = 0x00d0;
static const uint8_t prefix[] = { 0x05, 0x00 };
l_debug("");
frame_watch_add(rrm->wdev_id, 0, frame_type, prefix, sizeof(prefix),
rrm_frame_watch_cb, rrm, NULL);
}
static struct rrm_state *rrm_new_state(struct netdev *netdev)
{
struct rrm_state *rrm;
uint16_t frame_type = 0x00d0;
uint8_t prefix[] = { 0x05, 0x00 };
if (netdev_get_iftype(netdev) != NETDEV_IFTYPE_STATION)
return;
rrm = l_new(struct rrm_state, 1);
@ -785,10 +791,9 @@ static void rrm_new_state(struct netdev *netdev)
rrm->ifindex = netdev_get_ifindex(netdev);
rrm->wdev_id = netdev_get_wdev_id(netdev);
frame_watch_add(rrm->wdev_id, 0, frame_type, prefix, sizeof(prefix),
rrm_frame_watch_cb, rrm, NULL);
l_queue_push_head(states, rrm);
return rrm;
}
static bool match_ifindex(const void *a, const void *b)
@ -807,8 +812,12 @@ static void rrm_netdev_watch(struct netdev *netdev,
switch (event) {
case NETDEV_WATCH_EVENT_NEW:
rrm_new_state(netdev);
return;
rrm = rrm_new_state(netdev);
if (netdev_get_iftype(netdev) == NETDEV_IFTYPE_STATION)
rrm_add_frame_watches(rrm);
break;
case NETDEV_WATCH_EVENT_DEL:
/*
* This event is triggered by the netdev being removed, which