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

AP MLD: Optimize struct mld_link_info size

Browse source 
Use smaller variables when possible and reorder the variables to avoid
unnecessary padding. This drops struct mld_link_info size from 64 to 48
bytes and removes 240 bytes from struct sta_info.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2024-01-21 22:24:08 +02:00
parent 93eab9f0fa
commit aa1aa289cd
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ap/beacon.c
View file

@ -1028,7 +1028,7 @@ static void hostapd_fill_probe_resp_ml_params(struct hostapd_data *hapd,
os_memcpy(link_info->local_addr, link->own_addr, ETH_ALEN); os_memcpy(link_info->local_addr, link->own_addr, ETH_ALEN);
wpa_printf(MSG_DEBUG, wpa_printf(MSG_DEBUG,
"MLD: ML probe response includes link sta info for %d: %zu bytes (estimate %zu)", "MLD: ML probe response includes link sta info for %d: %u bytes (estimate %zu)",
mld_link_id, link_info->resp_sta_profile_len, mld_link_id, link_info->resp_sta_profile_len,
buflen); buflen);
} }

4
src/ap/ieee802_11_eht.c
View file

@ -1255,7 +1255,7 @@ u16 hostapd_process_ml_assoc_req(struct hostapd_data *hapd,
goto out; goto out;
} }
info->links[hapd->mld_link_id].valid = true; info->links[hapd->mld_link_id].valid = 1;
/* Parse the link info field */ /* Parse the link info field */
ml_len -= sizeof(*ml) + common_info_len; ml_len -= sizeof(*ml) + common_info_len;
@ -1382,7 +1382,7 @@ u16 hostapd_process_ml_assoc_req(struct hostapd_data *hapd,
ml_len -= sub_elem_len; ml_len -= sub_elem_len;
wpa_printf(MSG_DEBUG, "MLD: link ctrl=0x%x, " MACSTR wpa_printf(MSG_DEBUG, "MLD: link ctrl=0x%x, " MACSTR
", nstr bitmap len=%lu", ", nstr bitmap len=%u",
control, MAC2STR(link_info->peer_addr), control, MAC2STR(link_info->peer_addr),
link_info->nstr_bitmap_len); link_info->nstr_bitmap_len);

6
src/ap/sta_info.h
View file

@ -82,17 +82,17 @@ struct mld_info {
} common_info; } common_info;
struct mld_link_info { struct mld_link_info {
u8 valid; u8 valid:1;
u8 nstr_bitmap_len:2;
u8 local_addr[ETH_ALEN]; u8 local_addr[ETH_ALEN];
u8 peer_addr[ETH_ALEN]; u8 peer_addr[ETH_ALEN];
size_t nstr_bitmap_len;
u8 nstr_bitmap[2]; u8 nstr_bitmap[2];
u16 capability; u16 capability;
u16 status; u16 status;
size_t resp_sta_profile_len; u16 resp_sta_profile_len;
u8 *resp_sta_profile; u8 *resp_sta_profile;
const u8 *rsne, *rsnxe; const u8 *rsne, *rsnxe;