DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

nl80211: Re-factor nl80211_remove_links() function

Browse source 
nl80211_remove_links() iterated over all active links in the given BSS
and removed all of them. However, at times it is required to remove only
one link and not all links.

Add a helper function nl80211_remove_link() which will remove just the
given link_id from the passed BSS. nl80211_remove_links() will use this
and will call this for each of the active links to be removed.

Signed-off-by: Aditya Kumar Singh <quic_adisi@quicinc.com>
This commit is contained in:
Aditya Kumar Singh 2024-03-06 12:08:58 +05:30 committed by Jouni Malinen
parent b810426eaa
commit b162886fd0
1 changed files with 63 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

106
src/drivers/driver_nl80211.c
View file

@ -9422,61 +9422,81 @@ fail:
} }
static void nl80211_remove_links(struct i802_bss *bss) static int nl80211_remove_link(struct i802_bss *bss, int link_id)
{ {
struct wpa_driver_nl80211_data *drv = bss->drv; struct wpa_driver_nl80211_data *drv = bss->drv;
struct i802_link *link;
struct nl_msg *msg; struct nl_msg *msg;
size_t i;
int ret; int ret;
u8 link_id, i;
for_each_link(bss->valid_links, link_id) { wpa_printf(MSG_DEBUG, "nl80211: Remove link (ifindex=%d link_id=%u)",
struct i802_link *link = &bss->links[link_id]; bss->ifindex, link_id);
wpa_printf(MSG_DEBUG, "nl80211: MLD: remove link_id=%u", if (!(bss->valid_links & BIT(link_id))) {
link_id); wpa_printf(MSG_DEBUG,
"nl80211: MLD: remove link: Link not found");
return -1;
}
wpa_driver_nl80211_del_beacon(bss, link_id); link = &bss->links[link_id];
/* First remove the link locally */ wpa_driver_nl80211_del_beacon(bss, link_id);
bss->valid_links &= ~BIT(link_id);
os_memset(link->addr, 0, ETH_ALEN);
/* Choose new deflink if we are removing that link */ /* First remove the link locally */
if (bss->flink == link) { bss->valid_links &= ~BIT(link_id);
for_each_link_default(bss->valid_links, i, 0) { os_memset(link->addr, 0, ETH_ALEN);
bss->flink = &bss->links[i];
break;
}
}
/* If this was the last link, reset default link */ /* Choose new deflink if we are removing that link */
if (!bss->valid_links) { if (bss->flink == link) {
/* TODO: Does keeping freq/bandwidth make sense? */ for_each_link_default(bss->valid_links, i, 0) {
if (bss->flink != link) bss->flink = &bss->links[i];
os_memcpy(bss->flink, link, sizeof(*link)); break;
os_memcpy(bss->flink->addr, bss->addr, ETH_ALEN);
}
/* Remove the link from the kernel */
msg = nl80211_drv_msg(drv, 0, NL80211_CMD_REMOVE_LINK);
if (!msg ||
nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, link_id)) {
nlmsg_free(msg);
wpa_printf(MSG_ERROR,
"nl80211: remove link (%d) failed",
link_id);
continue;
}
ret = send_and_recv_cmd(drv, msg);
if (ret) {
wpa_printf(MSG_ERROR,
"nl80211: remove link (%d) failed. ret=%d (%s)",
link_id, ret, strerror(-ret));
continue;
} }
} }
/* If this was the last link, reset default link */
if (!bss->valid_links) {
/* TODO: Does keeping freq/bandwidth make sense? */
if (bss->flink != link)
os_memcpy(bss->flink, link, sizeof(*link));
os_memcpy(bss->flink->addr, bss->addr, ETH_ALEN);
}
/* Remove the link from the kernel */
msg = nl80211_drv_msg(drv, 0, NL80211_CMD_REMOVE_LINK);
if (!msg ||
nla_put_u8(msg, NL80211_ATTR_MLO_LINK_ID, link_id)) {
nlmsg_free(msg);
wpa_printf(MSG_ERROR,
"nl80211: remove link (%d) failed", link_id);
return -1;
}
ret = send_and_recv_cmd(drv, msg);
if (ret)
wpa_printf(MSG_ERROR,
"nl80211: remove link (%d) failed. ret=%d (%s)",
link_id, ret, strerror(-ret));
return ret;
}
static void nl80211_remove_links(struct i802_bss *bss)
{
int ret;
u8 link_id;
for_each_link(bss->valid_links, link_id) {
ret = nl80211_remove_link(bss, link_id);
if (ret)
break;
}
if (bss->flink)
os_memcpy(bss->flink->addr, bss->addr, ETH_ALEN);
} }